From ba547d80cdbc282a18d402a878da1bcd9708e799 Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Sun, 24 Feb 2019 16:55:36 +0800
Subject: [PATCH] 会议不存在UI更新

---
 C5/app/src/main/res/drawable/download_complete.xml      | 12 ++++++++++++
 C5/app/src/main/res/drawable/downloading.xml            |  9 +++++++++
 C5/app/src/main/res/drawable/file_not_exsit.xml         |  9 +++++++++
 C5/app/src/main/res/layout/fragment_custom_election.xml | 54 +++++++++++++++++++++++++++++++++---------------------
 C5/app/src/main/res/layout/fragment_download.xml        |  6 +++++-
 C5/app/src/main/res/layout/fragment_election.xml        |  3 +--
 C5/app/src/main/res/layout/fragment_no_file.xml         | 20 ++++++++++++++++++--
 7 files changed, 87 insertions(+), 26 deletions(-)
 create mode 100644 C5/app/src/main/res/drawable/download_complete.xml
 create mode 100644 C5/app/src/main/res/drawable/downloading.xml
 create mode 100644 C5/app/src/main/res/drawable/file_not_exsit.xml

diff --git a/C5/app/src/main/res/drawable/download_complete.xml b/C5/app/src/main/res/drawable/download_complete.xml
new file mode 100644
index 0000000..2ff785c
--- /dev/null
+++ b/C5/app/src/main/res/drawable/download_complete.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="254.9"
+    android:viewportHeight="254.9"
+    android:width="254.9dp"
+    android:height="254.9dp">
+    <path
+        android:pathData="M127.4 0C57.3 0 0 57.3 0 127.4s57.3 127.4 127.4 127.4c70.1 0 127.4 -57.3 127.4 -127.4S197.5 0 127.4 0L127.4 0zM127.4 229.4c-56.1 0 -101.9 -45.9 -101.9 -101.9c0 -56.1 45.9 -101.9 101.9 -101.9c56.1 0 101.9 45.9 101.9 101.9S183.5 229.4 127.4 229.4L127.4 229.4zM127.4 229.4"
+        android:fillColor="#F6FF00" />
+    <path
+        android:pathData="M126.9 164.8c-2.1 2.1 -4.9 3.2 -7.7 3.2c-2.8 0 -5.6 -1.1 -7.7 -3.2l-36.2 -36.2c-2.2 -2.2 -3.2 -5.2 -3.1 -8.1c0.1 -2.6 1.1 -5.2 3.1 -7.2c2 -2 4.6 -3 7.2 -3.1c2.9 -0.1 5.9 0.9 8.1 3.1l28.5 28.5l50.2 -50.2c2.2 -2.2 5.2 -3.2 8.1 -3.1c2.6 0.1 5.2 1.1 7.2 3.1c2 2 3 4.6 3.1 7.2c0.1 2.9 -0.9 5.9 -3.1 8.1L126.9 164.8zM126.9 164.8"
+        android:fillColor="#F6FF00" />
+</vector>
\ No newline at end of file
diff --git a/C5/app/src/main/res/drawable/downloading.xml b/C5/app/src/main/res/drawable/downloading.xml
new file mode 100644
index 0000000..8a11cac
--- /dev/null
+++ b/C5/app/src/main/res/drawable/downloading.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="255.1"
+    android:viewportHeight="260.1"
+    android:width="255.1dp"
+    android:height="260.1dp">
+    <path
+        android:pathData="M77.3 227.1c4.2 0.6 7.5 4.2 7.5 9c0 5.2 -4.4 9.4 -9.4 9.4H23.2c-12.3 0 -23.2 -10.7 -23.2 -23V23.2C0 10.9 10.8 0 23.2 0h185.4c12.3 0 23.2 10.8 23.2 23.2v41.6c-0.2 5 -4.6 9 -9.4 9c-4.8 0 -8.5 -3.4 -9.2 -7.7V29.5c0 -6.5 -5 -11.3 -11.5 -11.3H29C23 18.2 18 23 18 29.5v186.6c0 6.1 5 11.1 11.1 11.1L77.3 227.1L77.3 227.1zM172 94.9c45.8 0 83.2 36.8 83.2 82.5c0 45.8 -37.4 82.7 -83.2 82.7c-46.2 0 -83.2 -37 -83.2 -82.7C88.8 131.6 125.8 94.9 172 94.9L172 94.9zM172 245.5c37.6 0 68.5 -30.5 68.5 -68.1c0 -37.4 -30.9 -67.9 -68.5 -67.9c-37.8 0 -68.8 30.5 -68.8 67.9C103.2 215 134.1 245.5 172 245.5L172 245.5zM90.5 90.3c3.1 0 5.7 2.3 5.7 5.4s-2.5 5.7 -5.7 5.7H41.1c-3.1 0 -5.7 -2.5 -5.7 -5.7s2.5 -5.4 5.7 -5.4H90.5zM157.9 72.9c0 3.1 -2.5 5.7 -5.7 5.7H41.1c-3.1 0 -5.7 -2.5 -5.7 -5.7s2.5 -5.8 5.7 -5.8h111.2C155.4 67.1 157.9 69.8 157.9 72.9L157.9 72.9zM196.2 50.3c0 3.1 -2.5 5.4 -5.7 5.4H41.1c-3.1 0 -5.7 -2.3 -5.7 -5.4c0 -3.1 2.5 -5.7 5.7 -5.7h149.4C193.6 44.7 196.2 47.2 196.2 50.3L196.2 50.3zM177.7 222.7c-2.5 3.1 -6.9 3.1 -9.4 0l-24 -27.6c-1.5 -1.7 -2.1 -4 -1.9 -6.7c0.2 -2.5 2.3 -4.4 4.8 -4.4h15.5v-25.7c0 -3.1 2.1 -5.2 5.2 -5.2h10c3.1 0 5.2 2.1 5.2 5.2V184h15.7c2.3 0 4.4 1.9 5 4.4c0.2 2.5 -0.6 4.8 -2.3 6.7L177.7 222.7zM168 142.9c-3.1 0 -5.2 -2.1 -5.2 -5.2c0 -2.7 2.1 -5.2 5.2 -5.2h10c3.1 0 5.2 2.5 5.2 5.2c0 3.1 -2.1 5.2 -5.2 5.2H168zM168 142.9"
+        android:fillColor="#E7E739" />
+</vector>
\ No newline at end of file
diff --git a/C5/app/src/main/res/drawable/file_not_exsit.xml b/C5/app/src/main/res/drawable/file_not_exsit.xml
new file mode 100644
index 0000000..2dd4f39
--- /dev/null
+++ b/C5/app/src/main/res/drawable/file_not_exsit.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="255.1"
+    android:viewportHeight="255.1"
+    android:width="255.1dp"
+    android:height="255.1dp">
+    <path
+        android:pathData="M139.8 149.8c-0.8 9.1 -6.6 13.3 -12.3 13.3c-4.2 0 0 0 0 0c-5.4 -1 -9.6 -3.3 -11.5 -12.5l-7.4 -85.8c0 -8.6 10.5 -16.3 19.4 -16.3c8.9 0 18.5 8 18.5 16.6L139.8 149.8zM127.6 174.3c-8.9 0 -16.1 7.2 -16.1 16.1c0 8.9 7.2 16.1 16.1 16.1c8.9 0 16.1 -7.2 16.1 -16.1C143.7 181.6 136.5 174.3 127.6 174.3L127.6 174.3zM255.1 127.6c0 70.5 -57.1 127.6 -127.6 127.6C57.1 255.1 0 198 0 127.6C0 57.1 57.1 0 127.5 0C198 0 255.1 57.1 255.1 127.6L255.1 127.6zM231.5 127.6c0 -57.4 -46.5 -103.9 -103.9 -103.9S23.6 70.2 23.6 127.6c0 57.4 46.5 103.9 103.9 103.9S231.5 185 231.5 127.6L231.5 127.6zM231.5 127.6"
+        android:fillColor="#E7E739" />
+</vector>
\ No newline at end of file
diff --git a/C5/app/src/main/res/layout/fragment_custom_election.xml b/C5/app/src/main/res/layout/fragment_custom_election.xml
index 8cadd54..81d36eb 100644
--- a/C5/app/src/main/res/layout/fragment_custom_election.xml
+++ b/C5/app/src/main/res/layout/fragment_custom_election.xml
@@ -5,27 +5,39 @@
     android:layout_height="match_parent"
     android:background="@color/votebakground" >
 
-    <TextView
-        android:id="@+id/election_title"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:id="@+id/line_panel"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="20dp"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:lines="1"
-        android:text="@string/sunvote_no_paper"
-        android:textSize="@dimen/big_text_p4" />
+        android:background="@color/red"
+        android:orientation="horizontal"
+        android:paddingBottom="20dp"
+        android:paddingLeft="20dp"
+        android:paddingRight="80dp"
+        android:paddingTop="20dp">
+
+        <TextView
+            android:id="@+id/election_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:ellipsize="end"
+            android:lines="1"
+            android:text="票决民生实事项目"
+            android:textColor="@color/white"
+            android:textSize="@dimen/big_text_p4" />
+
+        <TextView
+            android:id="@+id/title_info"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=""
+            android:layout_marginRight="20dp"
+            android:textSize="@dimen/big_text_p5" />
+
+    </LinearLayout>
+
 
-    <TextView
-        android:id="@+id/title_info"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="20dp"
-        android:text=""
-        android:layout_below="@+id/election_title"
-        android:textSize="@dimen/big_text_p4" />
 
 
 
@@ -37,7 +49,7 @@
         android:layout_height="40dp"
         android:layout_marginLeft="20dp"
         android:layout_marginRight="20dp"
-        android:layout_below="@+id/title_info" >
+        android:layout_below="@+id/line_panel" >
         <TextView
             android:id="@+id/tv_num"
             android:layout_width="80dp"
@@ -128,7 +140,7 @@
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:layout_marginRight="20dp"
-            android:background="@drawable/signin_selector"
+            android:background="@drawable/oppos_selector"
             android:text="@string/confirm_submit"
             android:textColor="@color/white"
             android:textSize="@dimen/big_text_p4"
diff --git a/C5/app/src/main/res/layout/fragment_download.xml b/C5/app/src/main/res/layout/fragment_download.xml
index dbddb99..e61c08f 100644
--- a/C5/app/src/main/res/layout/fragment_download.xml
+++ b/C5/app/src/main/res/layout/fragment_download.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-     android:background="@color/bluebackground"
+     android:background="@drawable/bgpic_3"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
+
+     <ImageView
+         android:layout_width="wrap_content"
+         android:layout_height="wrap_content" />
     
      <TextView 
          android:id="@+id/download_title"
diff --git a/C5/app/src/main/res/layout/fragment_election.xml b/C5/app/src/main/res/layout/fragment_election.xml
index b1b1d0a..026ef76 100644
--- a/C5/app/src/main/res/layout/fragment_election.xml
+++ b/C5/app/src/main/res/layout/fragment_election.xml
@@ -37,7 +37,6 @@
 
     </LinearLayout>
 
-
     <RelativeLayout
         android:id="@+id/election_pannal_OX"
         android:layout_width="match_parent"
@@ -150,7 +149,7 @@
             android:layout_weight="1"
             android:layout_marginLeft="40dp"
             android:gravity="left|center_vertical"
-            android:text="获选人"
+            android:text="侯选人"
             android:textColor="@color/red"
             android:textSize="@dimen/big_text_p6" />
 
diff --git a/C5/app/src/main/res/layout/fragment_no_file.xml b/C5/app/src/main/res/layout/fragment_no_file.xml
index e8cfd38..3b44165 100644
--- a/C5/app/src/main/res/layout/fragment_no_file.xml
+++ b/C5/app/src/main/res/layout/fragment_no_file.xml
@@ -2,14 +2,29 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bluebackground"
+    android:background="@drawable/bgpic_3"
     android:orientation="vertical">
 
+    <View
+        android:id="@+id/middle"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_centerVertical="true"/>
+
+    <ImageView
+        android:layout_width="200dp"
+        android:layout_height="200dp"
+        android:layout_centerHorizontal="true"
+        android:layout_above="@id/middle"
+        android:src="@drawable/file_not_exsit"/>
+
 
     <RelativeLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true">
+        android:layout_below="@id/middle"
+        android:layout_marginTop="30dp"
+        android:layout_centerHorizontal="true">
 
         <TextView
             android:id="@+id/fragment_no_file_title"
@@ -18,6 +33,7 @@
             android:layout_centerHorizontal="true"
             android:textColor="#ff1111"
             android:textStyle="bold"
+            android:text="会议1的资料不存在！"
             android:textSize="@dimen/big_text_p1" />
 
         <TextView
--
libgit2 0.21.4