下载文件UI更新

孙向锦
1 parent 3e1796db
Showing 11 changed files with 115 additions and 57 deletions
C5/app/src/main/java/com/sunvote/xpadapp/fragments/DownloadFragment.java
C5/app/src/main/java/com/sunvote/xpadapp/fragments/SinginResultFragment.java
C5/app/src/main/res/drawable/back.xml
C5/app/src/main/res/drawable/download_connect.xml
C5/app/src/main/res/drawable/download_fail.xml
C5/app/src/main/res/drawable/page_frist.xml
C5/app/src/main/res/layout/fragment_admin.xml
C5/app/src/main/res/layout/fragment_multi_content_detail.xml
C5/app/src/main/res/layout/fragment_multi_title.xml
C5/app/src/main/res/layout/fragment_signin_result_vote.xml
C5/app/src/main/res/layout/list_multi_title_item.xml
@@ -119,6 +119,7 @@ public class DownloadFragment extends BaseFragment implements FileReciverInterfa
 			case msgConnectError:
 				stopDownload();
 				if(isUiActive) {
+					download_img.setImageResource(R.drawable.download_fail);
 					tv.setText(getString(R.string.connect_server_fail));
 				}
 				break;
@@ -156,16 +157,19 @@ public class DownloadFragment extends BaseFragment implements FileReciverInterfa
 				case msgDownloadDataError:
 					if(isUiActive) {
 						if(++downloadRetryCount >= 3){//重试 n 次
+							download_img.setImageResource(R.drawable.download_fail);
 							tv.setText(getString(R.string.download_fail));
 							break;
 						}
 						stopDownload();
+						download_img.setImageResource(R.drawable.download_connect);
 						tv.setText(getString(R.string.download_retry));
 						getMeetingFilesFromServer();
 					}
 					break;
 				case msgOnUnzipError:
 					Log.d(TAG, "handleMessage: msgOnUnzipError");
+					download_img.setImageResource(R.drawable.download_fail);
 					tv.setText(getString(R.string.unzip_error));
 					Toast.makeText(mMainActivity,getString(R.string.unzip_error),Toast.LENGTH_LONG).show();
 					isFinishDownload = true;
@@ -198,6 +202,7 @@ public class DownloadFragment extends BaseFragment implements FileReciverInterfa
 	private void connectServer() {
 		if(isUiActive) {
+			download_img.setImageResource(R.drawable.download_connect);
 			tv.setText(getString(R.string.connect_server_ing));
 		}
 		LogUtil.d(TAG, getString(R.string.connect_server_ing));
@@ -23,9 +23,17 @@ public class SinginResultFragment extends BaseFragment {
         TextView shidaoresult = view.findViewById(R.id.shidaoresult);
         TextView yingdaoresult = view.findViewById(R.id.yingdaoresult);
         TextView weidaoresult = view.findViewById(R.id.weidaoresult);
+        TextView result = view.findViewById(R.id.result);
         shidaoresult.setText("" + resultInfo.num3);
         yingdaoresult.setText("" + resultInfo.num2);
         weidaoresult.setText("" + resultInfo.num1);
+        if ((resultInfo.bits & 0xF) == 0xF) {
+            result.setText("");
+        } else if ((resultInfo.bits & 0xF) == 0) {
+            result.setText(R.string.bufuherenshu);
+        } else {
+            result.setText(R.string.fuherenshu);
+        }
         return view;
     }
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="226.6"
+    android:viewportHeight="226.6"
+    android:width="226.6dp"
+    android:height="226.6dp">
+    <path
+        android:pathData="M113.3 0C50.7 0 0 50.7 0 113.3s50.7 113.3 113.3 113.3s113.3 -50.7 113.3 -113.3C226.5 50.8 175.8 0.1 113.3 0L113.3 0zM113.3 212.4c-54.8 0 -99.1 -44.4 -99.1 -99.1s44.4 -99.1 99.1 -99.1s99.1 44.4 99.1 99.1c0 0 0 0 0 0C212.4 168 168 212.4 113.3 212.4L113.3 212.4zM169.9 106.2H73.7l30.4 -30.4c2.9 -2.6 3.1 -7.1 0.5 -10c-2.6 -2.9 -7.1 -3.1 -10 -0.5c-0.2 0.2 -0.3 0.3 -0.5 0.5l-42.5 42.5c-2.8 2.8 -2.8 7.2 0 10l42.5 42.5c2.6 2.9 7.1 3.1 10 0.5c2.9 -2.6 3.1 -7.1 0.5 -10c-0.2 -0.2 -0.3 -0.3 -0.5 -0.5l-30.4 -30.4h96.2c3.9 0 7.1 -3.2 7.1 -7.1C177 109.4 173.9 106.2 169.9 106.2L169.9 106.2z"
+        android:fillColor="#999999" />
+</vector>
 \ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="360"
+    android:viewportHeight="120"
+    android:width="360dp"
+    android:height="120dp">
+    <path
+        android:pathData="M553.4 252.4h-92.5c-16.5 0 -31.8 -8.8 -40.1 -23.1c-8.3 -14.3 -8.3 -31.9 0 -46.3c8.3 -14.3 23.5 -23.1 40.1 -23.1h46.3v-416.3h-647.6v416.3h46.3c25.5 0 46.3 20.7 46.3 46.3c0 25.5 -20.7 46.3 -46.3 46.3h-92.5c-25.6 0 -46.3 -20.7 -46.3 -46.3v-508.9c0 -25.5 20.7 -46.3 46.3 -46.3h740.1c25.6 0 46.3 20.7 46.3 46.3v508.9C599.7 231.7 579 252.4 553.4 252.4L553.4 252.4zM648.5 439.4H370.9v-92.5h277.6c0 0 46.3 0 46.3 46.3C694.7 439.4 648.5 439.4 648.5 439.4L648.5 439.4zM-288.7 439.4h277.6v-92.5h-277.6c0 0 -46.3 0 -46.3 46.3C-335 439.4 -288.7 439.4 -288.7 439.4L-288.7 439.4zM-288.7 439.4"
+        android:fillColor="#F6FF00" />
+    <path
+        android:pathData="M-125.5 159.8H478.9V252.3H-125.5V159.8Z"
+        android:fillColor="#F6FF00" />
+    <path
+        android:pathData="M223 218.4V316h-92.5v-97.6H223zM304.5 316v154.2H48.9V316H304.5zM304.5 316"
+        android:fillColor="#F6FF00" />
+</vector>
 \ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="293.3"
+    android:viewportHeight="292.9"
+    android:width="293.3dp"
+    android:height="292.9dp">
+    <path
+        android:pathData="M150 168.8l-57.1 58.1c-2.8 2.9 -6.7 4.5 -10.7 4.5c-4 0 -7.9 -1.6 -10.7 -4.5c-5.9 -6 -5.9 -15.7 0 -21.8l57.1 -58.1L71.5 88.9c-5.9 -6 -5.9 -15.8 0 -21.8c5.9 -6 15.5 -6 21.4 0l57.1 58.1l57.1 -58.1c5.9 -6 15.5 -6 21.4 0c5.9 6 5.9 15.8 0 21.8L171.4 147l57.1 58.1c5.9 6 5.9 15.8 0 21.8c-5.9 6 -15.5 6 -21.4 0L150 168.8L150 168.8zM279.3 132.6c7.7 0 13.9 6.2 13.9 13.9c0 80.7 -65.8 146.4 -146.6 146.4C65.8 292.9 0 227.2 0 146.4C0 65.7 65.8 0 146.6 0c32.1 0 62.5 10.1 88 29.3c3 2.2 4.9 5.5 5.4 9.1c0.5 3.6 -0.4 7.4 -2.7 10.3c-2.6 3.5 -6.8 5.5 -11.1 5.5c-3 0 -5.9 -1 -8.4 -2.8c-20.7 -15.5 -45.3 -23.7 -71.3 -23.7C81.1 27.8 27.8 81 27.8 146.4c0 65.4 53.3 118.7 118.8 118.7c65.5 0 118.8 -53.2 118.8 -118.7C265.4 138.8 271.7 132.6 279.3 132.6L279.3 132.6zM279.3 132.6"
+        android:fillColor="#F6FF00" />
+</vector>
 \ No newline at end of file
 <vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-	android:viewportWidth="96.4"
+	android:viewportWidth="104.2"
 	android:viewportHeight="103.4"
-	android:width="96.4dp"
+	android:width="104.2dp"
 	android:height="103.4dp">
 	<group>
 		<clip-path
-			android:pathData="M0 0H96.4V103.4H0V0Z" />
+			android:pathData="M0.5 3.5H103.9V99.9H0.5V3.5Z" />
 		<path
-			android:pathData="M12.3 101.1l53 -40c6.8 -5.1 6.8 -13.5 0 -18.6l-53 -40C5.6 -2.6 0 1 0 10.5v82.7C0 102.7 5.6 106.2 12.3 101.1L12.3 101.1zM89.8 0.2c3.6 0 6.4 2.9 6.5 6.5V97c0 3.6 -2.9 6.4 -6.5 6.5c-3.6 0 -6.4 -2.9 -6.5 -6.5V6.7C83.4 3.1 86.3 0.2 89.8 0.2L89.8 0.2zM89.8 0.2"
+			android:pathData="M2.8 15.8l40 53c5.1 6.8 13.5 6.8 18.6 0l40 -53c5.1 -6.7 1.5 -12.3 -8 -12.3H10.7C1.2 3.5 -2.3 9.1 2.8 15.8L2.8 15.8zM103.7 93.3c0 3.6 -2.9 6.4 -6.5 6.5H6.9c-3.6 0 -6.4 -2.9 -6.5 -6.5c0 -3.6 2.9 -6.4 6.5 -6.5h90.3C100.8 86.9 103.7 89.8 103.7 93.3L103.7 93.3z"
 			android:fillColor="#000000"
 			android:fillAlpha="0.8" />
 	</group>
@@ -77,11 +77,11 @@
     <ImageButton
         android:id="@+id/admin_btnback"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
         android:layout_marginLeft="20dp"
         android:layout_marginTop="20dp"
-        android:background="@drawable/back_selector" />
+        android:background="@drawable/back" />
@@ -2,45 +2,51 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/votebakground" >
+    android:background="@color/votebakground">
     <!--标题-->
     <LinearLayout
         android:id="@+id/title_linear"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/content_margin"
-        android:layout_marginLeft="@dimen/content_margin"
-        android:layout_marginRight="@dimen/content_margin"
-        android:orientation="horizontal">
+        android:background="#AC1007"
+        android:orientation="horizontal"
+        android:paddingBottom="20dp"
+        android:paddingLeft="20dp"
+        android:paddingTop="20dp"
+        android:paddingRight="80dp">
         <ImageButton
             android:id="@+id/content_detail_btnback"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
             android:background="@drawable/back_selector" />
         <TextView
             android:id="@+id/content_detail_title"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
             android:layout_marginLeft="10dp"
+            android:layout_weight="1"
             android:ellipsize="end"
             android:gravity="left"
             android:lines="1"
             android:text="title"
-            android:textSize="@dimen/big_text_p3"
-            android:textColor="@color/black"
-            android:textStyle="bold"
-            android:layout_weight="1"/>
+            android:textColor="@color/white"
+            android:textSize="@dimen/big_text_p4"
+            android:textStyle="bold" />
         <Button
             android:id="@+id/btn_look_pdf"
             android:layout_width="@dimen/button_width"
             android:layout_height="@dimen/button_heigh"
+            android:layout_gravity="center_vertical"
+            android:layout_marginRight="20dp"
             android:background="@drawable/signin_selector"
             android:text="查看批注"
-            android:textColor="@color/white"
+            android:textColor="@color/yellow"
             android:textSize="@dimen/big_text_p4"
             android:textStyle="bold" />
@@ -52,7 +58,7 @@
         android:layout_height="@dimen/linear_heigh"
         android:layout_alignParentBottom="true"
         android:alpha="0.9"
-        android:background="@drawable/black_alpha" >
+        android:background="@drawable/black_alpha">
         <Button
             android:id="@+id/content_detail_btnB"
@@ -93,28 +99,6 @@
             android:textSize="@dimen/big_text_p4"
             android:textStyle="bold" />
     </RelativeLayout>
-    <!--投票状态-->
-    <RelativeLayout
-        android:id="@+id/content_detail_pannal_tips"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/linear_heigh"
-        android:layout_alignParentBottom="true"
-        android:alpha="0.9"
-        android:background="@drawable/black_alpha"
-        android:visibility="invisible">
-
-        <TextView
-            android:id="@+id/content_detail_tv_tips"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:text="@string/submiting"
-            android:textColor="@color/white"
-            android:textSize="@dimen/big_text_p4"
-            android:textStyle="bold"
-            />
-    </RelativeLayout>
     <!--修改选项-->
     <RelativeLayout
         android:id="@+id/content_detail_pannal_modify"
@@ -142,8 +126,8 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/linear_heigh"
         android:layout_alignParentBottom="true"
-        android:gravity="center_horizontal"
         android:background="@drawable/black_alpha"
+        android:gravity="center_horizontal"
         android:visibility="gone">
     </RelativeLayout>
@@ -159,15 +143,35 @@
         android:layout_marginRight="@dimen/content_margin"
         android:layout_marginTop="@dimen/content_margin"
         android:background="@color/white"
-        android:fillViewport="false" >
+        android:fillViewport="false">
+
         <com.github.barteksc.pdfviewer.PDFView
             android:id="@+id/content_detail_pdfview"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_marginLeft="86dp"
             android:layout_marginRight="86dp"
-            android:background="@color/white"
-            />
+            android:background="@color/white" />
+        <!--投票状态-->
+        <RelativeLayout
+            android:id="@+id/content_detail_pannal_tips"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/linear_heigh"
+            android:layout_alignParentBottom="true"
+            android:background="@color/yellow"
+            android:visibility="invisible">
+
+            <TextView
+                android:id="@+id/content_detail_tv_tips"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true"
+                android:text="@string/submiting"
+                android:textColor="@color/red"
+                android:textSize="@dimen/big_text_p4"
+                android:textStyle="bold" />
+        </RelativeLayout>
     </RelativeLayout>
     <!--投票结果，居中显示-->
     <TextView
@@ -178,8 +182,8 @@
         android:layout_centerInParent="true"
         android:layout_marginTop="@dimen/content_margin"
         android:alpha="0.9"
-        android:rotation="-20"
         android:gravity="center"
+        android:rotation="-20"
         android:textColor="#ddff9933"
         android:textSize="@dimen/big_text_p2"
         android:textStyle="bold"
@@ -190,20 +194,19 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:background="#ff000000"
-        android:visibility="gone"
-        >
+        android:visibility="gone">
         <TextView
             android:id="@+id/content_detail_confirm_textview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
-            android:layout_marginTop="@dimen/button_to_content"
-            android:text="@string/cant_modify_confirm"
-            android:textColor="@color/white"
             android:layout_marginLeft="@dimen/content_margin"
             android:layout_marginRight="@dimen/content_margin"
+            android:layout_marginTop="@dimen/button_to_content"
             android:gravity="center"
+            android:text="@string/cant_modify_confirm"
+            android:textColor="@color/white"
             android:textSize="@dimen/big_text_p4" />
         <Button
@@ -66,7 +66,6 @@
         android:id="@+id/multivote_pannal_bottom"
         android:layout_width="match_parent"
         android:layout_height="80dp"
-        android:paddingTop="20dp"
         android:layout_alignParentBottom="true"
         android:alpha="0.9"
         android:background="@drawable/gray_alpha">
@@ -9,7 +9,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="120dp"
+        android:layout_marginTop="100dp"
         android:text="@string/signin_result"
         android:textColor="@color/yellow"
         android:textSize="@dimen/big_text_p2"
@@ -104,6 +104,16 @@
     </RelativeLayout>
+    <TextView
+        android:id="@+id/result"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_alignParentBottom="true"
+        android:textSize="@dimen/big_text_p4"
+        android:textColor="@color/yellow"
+        android:layout_marginBottom="40dp"/>
+
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
@@ -15,17 +15,17 @@
         <TextView
             android:id="@+id/list_multivote_item_num"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
             android:layout_marginLeft="15dp"
             android:layout_marginTop="5dp"
             android:layout_marginBottom="5dp"
             android:background="@drawable/bh_cicle"
             android:gravity="center"
             android:lines="1"
-            android:text="1"
+            android:text="88"
             android:textColor="@color/white"
-            android:textSize="@dimen/big_text_p4" />
+            android:textSize="@dimen/big_text_p5" />
         <TextView
             android:id="@+id/list_multivote_item_content"
@@ -39,7 +39,7 @@
             android:paddingBottom="10dp"
             android:text="@string/content"
             android:textColor="@color/black"
-            android:textSize="@dimen/big_text_p4" />
+            android:textSize="@dimen/big_text_p5" />
     </LinearLayout>
     <LinearLayout