表决结果UI修改

孙向锦
1 parent 3bef6993
Showing 5 changed files with 72 additions and 38 deletions
C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionFragment.java
C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultMultiVoteFragment.java
C5/app/src/main/res/layout/fragment_election.xml
C5/app/src/main/res/layout/fragment_result_multi_vote.xml
C5/app/src/main/res/layout/list_multi_vote_result_item.xml
@@ -370,7 +370,7 @@ public class ElectionFragment extends BaseFragment {
 		//tvInfo.setText("");
 		if(voteInfo!=null){
 			if(voteInfo!=null){
-				tvTitle.setText(bill.title + String.format("(候选人%s人,应选%s人)",houxuan,voteInfo.select) );
+				tvTitle.setText(bill.title);
 			}
 			showVote();
 			checkVoted();
@@ -95,14 +95,14 @@ public class ResultMultiVoteFragment extends SuperBaseFragment {
 		if (yindao == 0xff || yindao == 0xffff) {
 			tvYindao.setVisibility(View.GONE);
 		} else {
-			tvYindao.setText(getString(R.string.yindao) + getString(R.string.maohao) + yindao);
+			tvYindao.setText("" + + yindao);
 			tvYindao.setVisibility(View.VISIBLE);
 		}
 		if (shidao == 0xff || shidao == 0xffff) {
 			tvShidao.setVisibility(View.GONE);
 		} else {
-			tvShidao.setText(getString(R.string.shidao) + getString(R.string.maohao) + shidao);
+			tvShidao.setText("" + shidao);
 			tvShidao.setVisibility(View.VISIBLE);
 		}
@@ -160,8 +160,6 @@
         android:layout_below="@id/election_pannal_OX"
         android:layout_marginTop="@dimen/content_margin"
         android:layout_marginBottom="2dp"
-        android:layout_marginLeft="@dimen/content_margin"
-        android:layout_marginRight="@dimen/content_margin"
         android:divider="@color/votebakground"
         android:dividerHeight="2dp" >
     </ListView>
@@ -2,8 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#ff004586"
-    android:paddingRight="50dp">
+    android:background="#ff004586">
     <LinearLayout
         android:id="@+id/multi_vote_result_top_panal"
@@ -39,8 +38,7 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/multi_vote_result_top_panal"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
+        android:paddingRight="80dp"
         android:layout_marginTop="10dp"
         android:orientation="horizontal">
@@ -61,8 +59,9 @@
             android:layout_centerVertical="true"
             android:layout_weight="1"
             android:gravity="center"
-            android:textColor="@color/white"
-            android:textSize="@dimen/big_text_p6"
+            android:textColor="@color/yellow"
+            android:text="表决项"
+            android:textSize="@dimen/big_text_p4"
             android:textStyle="bold" />
         <TextView
@@ -73,7 +72,7 @@
             android:layout_marginLeft="15dp"
             android:gravity="center"
             android:text="@string/agree"
-            android:textColor="@color/white"
+            android:textColor="@color/yellow"
             android:textSize="@dimen/big_text_p4"
             android:textStyle="bold" />
@@ -84,7 +83,7 @@
             android:layout_marginLeft="15dp"
             android:gravity="center"
             android:text="@string/oppose"
-            android:textColor="@color/white"
+            android:textColor="@color/yellow"
             android:textSize="@dimen/big_text_p4"
             android:textStyle="bold" />
@@ -95,7 +94,7 @@
             android:layout_marginLeft="15dp"
             android:gravity="center"
             android:text="@string/abstant"
-            android:textColor="@color/white"
+            android:textColor="@color/yellow"
             android:textSize="@dimen/big_text_p4"
             android:textStyle="bold" />
@@ -106,7 +105,7 @@
             android:layout_marginLeft="15dp"
             android:gravity="center"
             android:text="@string/unvote"
-            android:textColor="@color/white"
+            android:textColor="@color/yellow"
             android:textSize="@dimen/big_text_p4"
             android:textStyle="bold" />
@@ -118,37 +117,73 @@
             android:layout_marginLeft="15dp"
             android:gravity="center"
             android:text="@string/result"
-            android:textColor="@color/white"
+            android:textColor="@color/yellow"
             android:textSize="@dimen/big_text_p4"
             android:textStyle="bold" />
     </LinearLayout>
-    <LinearLayout
+    <RelativeLayout
         android:id="@+id/bottom_linear"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="20dp"
-        android:orientation="horizontal">
+        android:layout_marginBottom="20dp">
-        <TextView
-            android:id="@+id/multi_vote_result_yindao"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="800dp"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="3dp"
-            android:layout_marginRight="150dp"
-            android:textColor="@color/white"
-            android:textSize="@dimen/big_text_p3" />
+            android:layout_centerHorizontal="true"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:text="@string/yindao1"
+                android:textColor="@color/yellow"
+                android:textSize="@dimen/big_text_p3"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/multi_vote_result_yindao"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="60dp"
+                android:layout_weight="1"
+                android:gravity="left"
+                android:text="150"
+                android:textColor="@color/white"
+                android:textSize="@dimen/big_text_p3" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="60dp"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:text="@string/shidao1"
+                android:textColor="@color/yellow"
+                android:textSize="@dimen/big_text_p3"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/multi_vote_result_shidao"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:layout_weight="1"
+                android:gravity="left"
+                android:text="150"
+                android:textColor="@color/white"
+                android:textSize="@dimen/big_text_p3" />
+
+        </LinearLayout>
+    </RelativeLayout>
+
-        <TextView
-            android:id="@+id/multi_vote_result_shidao"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="150dp"
-            android:textColor="@color/white"
-            android:textSize="@dimen/big_text_p3" />
-    </LinearLayout>
     <ListView
         android:id="@+id/multi_vote_result_listview"
@@ -157,8 +192,6 @@
         android:layout_below="@id/multi_vote_result_title_panel"
         android:layout_above="@id/bottom_linear"
         android:layout_marginBottom="10dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
         android:divider="@color/material_grey_600"
         android:dividerHeight="2dp"></ListView>
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:paddingRight="80dp">
     <LinearLayout
         android:layout_width="fill_parent"
@@ -29,6 +30,8 @@
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="10dp"
             android:layout_weight="1"
+            android:lines="1"
+            android:ellipsize="end"
             android:gravity="center"
             android:textColor="@color/white"
             android:textSize="@dimen/big_text_p5" />