孙向锦 / VoteC5

Commit ba547d80cdbc282a18d402a878da1bcd9708e799

Authored by 孙向锦
1 parent c83dd29b

会议不存在UI更新

Inline Side-by-side
Showing 7 changed files with 87 additions and 26 deletions
C5/app/src/main/res/drawable/download_complete.xml 0 → 100644
  View file @ba547d8
  1 +<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
  2 + android:viewportWidth="254.9"
  3 + android:viewportHeight="254.9"
  4 + android:width="254.9dp"
  5 + android:height="254.9dp">
  6 + <path
  7 + 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"
  8 + android:fillColor="#F6FF00" />
  9 + <path
  10 + 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"
  11 + android:fillColor="#F6FF00" />
  12 +</vector>
0 13 \ No newline at end of file
... ...
C5/app/src/main/res/drawable/downloading.xml 0 → 100644
  View file @ba547d8
  1 +<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
  2 + android:viewportWidth="255.1"
  3 + android:viewportHeight="260.1"
  4 + android:width="255.1dp"
  5 + android:height="260.1dp">
  6 + <path
  7 + 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"
  8 + android:fillColor="#E7E739" />
  9 +</vector>
0 10 \ No newline at end of file
... ...
C5/app/src/main/res/drawable/file_not_exsit.xml 0 → 100644
  View file @ba547d8
  1 +<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
  2 + android:viewportWidth="255.1"
  3 + android:viewportHeight="255.1"
  4 + android:width="255.1dp"
  5 + android:height="255.1dp">
  6 + <path
  7 + 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"
  8 + android:fillColor="#E7E739" />
  9 +</vector>
0 10 \ No newline at end of file
... ...
C5/app/src/main/res/layout/fragment_custom_election.xml
  View file @ba547d8
... ... @@ -5,27 +5,39 @@
5 5 android:layout_height="match_parent"
6 6 android:background="@color/votebakground" >
7 7  
8   - <TextView
9   - android:id="@+id/election_title"
10   - android:layout_width="wrap_content"
  8 + <LinearLayout
  9 + android:id="@+id/line_panel"
  10 + android:layout_width="match_parent"
11 11 android:layout_height="wrap_content"
12   - android:layout_centerHorizontal="true"
13   - android:layout_marginTop="20dp"
14   - android:ellipsize="end"
15   - android:gravity="center"
16   - android:lines="1"
17   - android:text="@string/sunvote_no_paper"
18   - android:textSize="@dimen/big_text_p4" />
  12 + android:background="@color/red"
  13 + android:orientation="horizontal"
  14 + android:paddingBottom="20dp"
  15 + android:paddingLeft="20dp"
  16 + android:paddingRight="80dp"
  17 + android:paddingTop="20dp">
  18 +
  19 + <TextView
  20 + android:id="@+id/election_title"
  21 + android:layout_width="match_parent"
  22 + android:layout_height="wrap_content"
  23 + android:layout_weight="1"
  24 + android:ellipsize="end"
  25 + android:lines="1"
  26 + android:text="票决民生实事项目"
  27 + android:textColor="@color/white"
  28 + android:textSize="@dimen/big_text_p4" />
  29 +
  30 + <TextView
  31 + android:id="@+id/title_info"
  32 + android:layout_width="wrap_content"
  33 + android:layout_height="wrap_content"
  34 + android:text=""
  35 + android:layout_marginRight="20dp"
  36 + android:textSize="@dimen/big_text_p5" />
  37 +
  38 + </LinearLayout>
  39 +
19 40  
20   - <TextView
21   - android:id="@+id/title_info"
22   - android:layout_width="wrap_content"
23   - android:layout_height="wrap_content"
24   - android:layout_centerVertical="true"
25   - android:layout_marginLeft="20dp"
26   - android:text=""
27   - android:layout_below="@+id/election_title"
28   - android:textSize="@dimen/big_text_p4" />
29 41  
30 42  
31 43  
... ... @@ -37,7 +49,7 @@
37 49 android:layout_height="40dp"
38 50 android:layout_marginLeft="20dp"
39 51 android:layout_marginRight="20dp"
40   - android:layout_below="@+id/title_info" >
  52 + android:layout_below="@+id/line_panel" >
41 53 <TextView
42 54 android:id="@+id/tv_num"
43 55 android:layout_width="80dp"
... ... @@ -128,7 +140,7 @@
128 140 android:layout_alignParentRight="true"
129 141 android:layout_centerVertical="true"
130 142 android:layout_marginRight="20dp"
131   - android:background="@drawable/signin_selector"
  143 + android:background="@drawable/oppos_selector"
132 144 android:text="@string/confirm_submit"
133 145 android:textColor="@color/white"
134 146 android:textSize="@dimen/big_text_p4"
... ...
C5/app/src/main/res/layout/fragment_download.xml
  View file @ba547d8
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3   - android:background="@color/bluebackground"
  3 + android:background="@drawable/bgpic_3"
4 4 android:layout_width="match_parent"
5 5 android:layout_height="match_parent" >
  6 +
  7 + <ImageView
  8 + android:layout_width="wrap_content"
  9 + android:layout_height="wrap_content" />
6 10  
7 11 <TextView
8 12 android:id="@+id/download_title"
... ...
C5/app/src/main/res/layout/fragment_election.xml
  View file @ba547d8
... ... @@ -37,7 +37,6 @@
37 37  
38 38 </LinearLayout>
39 39  
40   -
41 40 <RelativeLayout
42 41 android:id="@+id/election_pannal_OX"
43 42 android:layout_width="match_parent"
... ... @@ -150,7 +149,7 @@
150 149 android:layout_weight="1"
151 150 android:layout_marginLeft="40dp"
152 151 android:gravity="left|center_vertical"
153   - android:text="获选人"
  152 + android:text="侯选人"
154 153 android:textColor="@color/red"
155 154 android:textSize="@dimen/big_text_p6" />
156 155  
... ...
C5/app/src/main/res/layout/fragment_no_file.xml
  View file @ba547d8
... ... @@ -2,14 +2,29 @@
2 2 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 3 android:layout_width="match_parent"
4 4 android:layout_height="match_parent"
5   - android:background="@color/bluebackground"
  5 + android:background="@drawable/bgpic_3"
6 6 android:orientation="vertical">
7 7  
  8 + <View
  9 + android:id="@+id/middle"
  10 + android:layout_width="match_parent"
  11 + android:layout_height="0dp"
  12 + android:layout_centerVertical="true"/>
  13 +
  14 + <ImageView
  15 + android:layout_width="200dp"
  16 + android:layout_height="200dp"
  17 + android:layout_centerHorizontal="true"
  18 + android:layout_above="@id/middle"
  19 + android:src="@drawable/file_not_exsit"/>
  20 +
8 21  
9 22 <RelativeLayout
10 23 android:layout_width="wrap_content"
11 24 android:layout_height="wrap_content"
12   - android:layout_centerInParent="true">
  25 + android:layout_below="@id/middle"
  26 + android:layout_marginTop="30dp"
  27 + android:layout_centerHorizontal="true">
13 28  
14 29 <TextView
15 30 android:id="@+id/fragment_no_file_title"
... ... @@ -18,6 +33,7 @@
18 33 android:layout_centerHorizontal="true"
19 34 android:textColor="#ff1111"
20 35 android:textStyle="bold"
  36 + android:text="会议1的资料不存在！"
21 37 android:textSize="@dimen/big_text_p1" />
22 38  
23 39 <TextView
... ...