选举结果UI修改

孙向锦
1 parent 1c5059dd
Showing 13 changed files with 157 additions and 128 deletions
C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java
C5/app/src/main/java/com/sunvote/xpadapp/fragments/MeetingWelcomeFragment.java
C5/app/src/main/java/com/sunvote/xpadapp/fragments/NoFileFragment.java
C5/app/src/main/java/com/sunvote/xpadapp/fragments/OnLineFragment.java
C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultElectionFragment.java
C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultVoteFragment.java
C5/app/src/main/java/com/sunvote/xpadapp/fragments/SinginResultFragment.java
C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java
C5/app/src/main/java/com/sunvote/xpadapp/fragments/UserResultVoteFragment.java
C5/app/src/main/res/layout/fragment_multi_title.xml
C5/app/src/main/res/layout/fragment_result_election.xml
C5/app/src/main/res/layout/list_result_election_item.xml
C5/app/src/main/res/values/color.xml
@@ -10,6 +10,7 @@ import android.content.BroadcastReceiver;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -546,6 +547,7 @@ public class MainActivity extends BaseActivity implements ComListener {
     }
     private void hideResultFragment() {
+        setBackgroundColor(Color.parseColor("#720600"));
         if (resultFragment == null) {
             return;
         }
 package com.sunvote.xpadapp.fragments;
 import com.sunvote.util.LogUtil;
+import com.sunvote.xpadapp.MainActivity;
 import com.sunvote.xpadapp.R;
 import com.sunvote.xpadapp.base.SuperBaseFragment;
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -24,7 +26,7 @@ public class MeetingWelcomeFragment extends SuperBaseFragment {
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		LogUtil.d("MeetingWelcome", "onCreateView");
 		View view = inflater.inflate(R.layout.fragment_welcome, container, false);
-
+		((MainActivity)getActivity()).setBackgroundColor(Color.parseColor("#720600"));
 		tv = (TextView) view.findViewById(R.id.welcome_title);
@@ -73,6 +75,7 @@ public class MeetingWelcomeFragment extends SuperBaseFragment {
 	@Override
 	public void onResume() {
 		super.onResume();
+		((MainActivity)getActivity()).setBackgroundColor(Color.parseColor("#720600"));
 		isAttach = true;
 	}
 package com.sunvote.xpadapp.fragments;
 import com.sunvote.util.LogUtil;
+import com.sunvote.xpadapp.MainActivity;
 import com.sunvote.xpadapp.R;
 import android.app.Activity;
@@ -29,7 +30,7 @@ public class NoFileFragment extends Fragment {
 		View view = inflater.inflate(R.layout.fragment_no_file, container, false);
 		tv = (TextView) view.findViewById(R.id.fragment_no_file_title);
-
+		((MainActivity)getActivity()).setBackgroundColor(Color.parseColor("#450603"));
 		// String sname = mMainActivity.meetingInfo.meetingTitle;
 		tv.setText(String.format( getString(R.string.no_file_tips),meetingId));
@@ -8,6 +8,7 @@ import com.sunvote.xpadapp.base.BaseFragment;
 import android.app.Fragment;
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -31,6 +32,7 @@ public class OnLineFragment extends Fragment {
 		View adminView = (View)view.findViewById(R.id.fragment_online_btn_admin);
 		tvtitle.setText(getString(R.string.sunvote_system));
+		((MainActivity)getActivity()).setBackgroundColor(Color.parseColor("#720600"));
 		adminView.setOnClickListener(new OnClickListener() {
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
 import android.content.Context;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
@@ -72,6 +73,7 @@ public class ResultElectionFragment extends BaseFragment {
 				;
 			}
 		});
+		((MainActivity)getActivity()).setBackgroundColor(Color.parseColor("#042160"));
 		initData();
 		initView();
 		ImageButton btnBack = (ImageButton) view.findViewById(R.id.fragment_result_election_btn_back);
@@ -118,21 +120,21 @@ public class ResultElectionFragment extends BaseFragment {
 		TextView tvOppose= (TextView) view.findViewById(R.id.fragment_result_election_oppose_num);
 		TextView tvAbstant= (TextView) view.findViewById(R.id.fragment_result_election_abstant_num);
 		TextView tvIndexName= (TextView) view.findViewById(R.id.fragment_result_election_num);
-		TextView tv_to_be= (TextView) view.findViewById(R.id.tv_to_be);
-		TextView tv_to= (TextView) view.findViewById(R.id.tv_to);
+		TextView tv_to_be= (TextView) view.findViewById(R.id.yingdaoresult);
+		TextView tv_to= (TextView) view.findViewById(R.id.shidaoresult);
 		if(goToBe!=0xff && goToBe!=0xffff){
 			tv_to_be.setVisibility(View.VISIBLE);
-			tv_to_be.setText(getString(R.string.yindao)+goToBe);
+			tv_to_be.setText("" + goToBe);
 		}else{
-			tv_to_be.setVisibility(View.INVISIBLE);
+			tv_to_be.setVisibility(View.GONE);
 		}
 		if(goTo!=0xff && goTo!=0xffff){
 			tv_to.setVisibility(View.VISIBLE);
-			tv_to.setText(getString(R.string.shidao)+goTo);
+			tv_to.setText("" + goTo);
 		}else{
-			tv_to.setVisibility(View.INVISIBLE);
+			tv_to.setVisibility(View.GONE);
 		}
 		if(indexNameModel==0){
@@ -152,15 +154,15 @@ public class ResultElectionFragment extends BaseFragment {
 		}else if(resultSelectModel==1){
 			tvAgree.setVisibility(View.VISIBLE);
 			tvOppose.setVisibility(View.VISIBLE);
-			tvAbstant.setVisibility(View.INVISIBLE);
+			tvAbstant.setVisibility(View.GONE);
 		}else if(resultSelectModel==2){
 			tvAgree.setVisibility(View.VISIBLE);
-			tvOppose.setVisibility(View.INVISIBLE);
+			tvOppose.setVisibility(View.GONE);
 			tvAbstant.setVisibility(View.VISIBLE);
 		}else if(resultSelectModel==3){
 			tvAgree.setVisibility(View.VISIBLE);
-			tvOppose.setVisibility(View.INVISIBLE);
-			tvAbstant.setVisibility(View.INVISIBLE);
+			tvOppose.setVisibility(View.GONE);
+			tvAbstant.setVisibility(View.GONE);
 		}
 		listview = (ListView) view.findViewById(R.id.fragment_result_election_list);
 	}
@@ -394,15 +396,15 @@ public class ResultElectionFragment extends BaseFragment {
 			}else if(resultSelectModel==1){
 				holder.tvAgree.setVisibility(View.VISIBLE);
 				holder.tvOppose.setVisibility(View.VISIBLE);
-				holder.tvAbstant.setVisibility(View.INVISIBLE);
+				holder.tvAbstant.setVisibility(View.GONE);
 			}else if(resultSelectModel==2){
 				holder.tvAgree.setVisibility(View.VISIBLE);
-				holder.tvOppose.setVisibility(View.INVISIBLE);
+				holder.tvOppose.setVisibility(View.GONE);
 				holder.tvAbstant.setVisibility(View.VISIBLE);
 			}else if(resultSelectModel==3){
 				holder.tvAgree.setVisibility(View.VISIBLE);
-				holder.tvOppose.setVisibility(View.INVISIBLE);
-				holder.tvAbstant.setVisibility(View.INVISIBLE);
+				holder.tvOppose.setVisibility(View.GONE);
+				holder.tvAbstant.setVisibility(View.GONE);
 			}
 			ResultItem it = aryList.get(position);
 			holder.tvNum.setText(String.valueOf(it.nameIndex));
@@ -11,6 +11,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import com.sunvote.util.LogUtil;
+import com.sunvote.xpadapp.MainActivity;
 import com.sunvote.xpadapp.R;
 import com.sunvote.xpadapp.base.BaseFragment;
 import com.sunvote.xpadcomm.XPadApiInterface;
@@ -85,7 +86,7 @@ public class ResultVoteFragment extends BaseFragment {
         shidaoresult = root.findViewById(R.id.shidaoresult);
         fragmentResultMemo = root.findViewById(R.id.fragment_result_memo);
         fragmentMemo = root.findViewById(R.id.fragment_memo);
-
+        ((MainActivity)getActivity()).setBackgroundColor(Color.parseColor("#042160"));
         tResult = root.findViewById(R.id.t_result);
         dResult = root.findViewById(R.id.d_result);
         pResult = root.findViewById(R.id.p_result);
 package com.sunvote.xpadapp.fragments;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import com.sunvote.xpadapp.MainActivity;
 import com.sunvote.xpadapp.R;
 import com.sunvote.xpadapp.base.BaseFragment;
 import com.sunvote.xpadcomm.XPadApiInterface.VoteInfo;
+import org.apache.tools.ant.Main;
+
 public class SinginResultFragment extends BaseFragment {
     private VoteInfo.ResultInfo resultInfo;
@@ -27,6 +31,7 @@ public class SinginResultFragment extends BaseFragment {
         shidaoresult.setText("" + resultInfo.num3);
         yingdaoresult.setText("" + resultInfo.num2);
         weidaoresult.setText("" + resultInfo.num1);
+        ((MainActivity)getActivity()).setBackgroundColor(Color.parseColor("#042160"));
         if ((resultInfo.bits & 0xF) == 0xF) {
             result.setText("");
         } else if ((resultInfo.bits & 0xF) == 0) {
@@ -3,6 +3,7 @@ package com.sunvote.xpadapp.fragments;
 import android.annotation.TargetApi;
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
+import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -126,6 +127,7 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
 		votetype = view.findViewById(R.id.votetype);
 		initOptions();
 		mact = (MainActivity) getActivity();
+		mact.setBackgroundColor(Color.parseColor("#450603"));
 		view.setOnClickListener(new OnClickListener() {
 			@Override
@@ -130,6 +130,9 @@ public class UserResultVoteFragment extends BaseFragment {
     }
     private void setView(int pos, int digiters, int bitNum, int type) {
+        tResult.removeAllViews();
+        dResult.removeAllViews();
+        pResult.removeAllViews();
         LinearLayout.LayoutParams lp=new LinearLayout.LayoutParams(0,LinearLayout.LayoutParams.WRAP_CONTENT,1.0f);
         for(int i = 1; i <= options.length ; i++) {
             if (options.length >= i) {
@@ -161,7 +164,11 @@ public class UserResultVoteFragment extends BaseFragment {
         if (notVote != 0xff) {
             tResult.addView(createView(getString(R.string.weian), Color.YELLOW), lp);
             dResult.addView(createView("" + notVote, Color.WHITE), lp);
-            pResult.addView(createView("0%", Color.WHITE), lp);
+            if ((fenmu > 0 && fenmu != 0xff)) {
+                pResult.addView(createView("0%", Color.WHITE), lp);
+            }else{
+                pResult.setVisibility(View.GONE);
+            }
         }
     }
     public static String formatDoubleToString(double value, Integer digits, boolean remove) {
@@ -8,7 +8,7 @@
         android:id="@+id/line_panel"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/red"
+        android:background="#AC1007"
         android:orientation="horizontal"
         android:paddingBottom="20dp"
         android:paddingLeft="20dp"
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#ff004586"
-    android:orientation="vertical"
-    android:paddingRight="50dp">
+    android:orientation="vertical">
     <RelativeLayout
+        android:id="@+id/title_linear"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/content_margin">
+        android:layout_marginTop="10dp">
         <ImageButton
             android:id="@+id/fragment_result_election_btn_back"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/content_margin"
-            android:visibility="invisible"
-            android:background="@drawable/back_white_selector" />
+            android:background="@drawable/back_white_selector"
+            android:visibility="invisible" />
         <TextView
             android:id="@+id/fragment_result_election_bill_title"
@@ -26,11 +26,11 @@
             android:layout_centerHorizontal="true"
             android:layout_marginLeft="@dimen/content_margin"
             android:layout_marginRight="@dimen/content_margin"
+            android:ellipsize="end"
             android:gravity="center"
+            android:lines="1"
             android:text="@string/vote_election"
             android:textColor="@color/white"
-            android:lines="1"
-            android:ellipsize="end"
             android:textSize="@dimen/big_text_p3"
             android:textStyle="bold" />
     </RelativeLayout>
@@ -39,138 +39,153 @@
         android:id="@+id/fragment_result_election_title"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:layout_below="@id/title_linear"
         android:layout_centerHorizontal="true"
         android:layout_marginLeft="@dimen/content_margin"
         android:layout_marginRight="@dimen/content_margin"
-        android:layout_marginTop="@dimen/content_margin"
+        android:layout_marginTop="10dp"
         android:gravity="center"
+        android:lines="1"
         android:text="@string/vote_result"
         android:textColor="@color/white"
         android:textSize="@dimen/big_text_p3" />
     <LinearLayout
+        android:id="@+id/data_title_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/content_margin"
-        android:layout_marginRight="@dimen/content_margin"
-        android:orientation="horizontal">
+        android:layout_below="@id/fragment_result_election_title"
+        android:layout_marginTop="20dp"
+        android:orientation="horizontal"
+        android:paddingRight="80dp">
         <TextView
             android:id="@+id/fragment_result_election_num"
-            android:layout_width="match_parent"
+            android:layout_width="140dp"
             android:layout_height="match_parent"
-            android:layout_centerVertical="true"
-            android:layout_weight="1"
+            android:gravity="center"
             android:paddingLeft="@dimen/content_margin"
             android:text="@string/name_index"
-            android:textColor="@color/white"
+            android:textColor="@color/yellow"
             android:textSize="@dimen/big_text_p4"
             android:textStyle="bold" />
         <TextView
             android:id="@+id/fragment_result_election_name"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_centerVertical="true"
             android:layout_weight="1"
             android:text="@string/name_xpad"
-            android:textColor="@color/white"
+            android:textColor="@color/yellow"
             android:textSize="@dimen/big_text_p4"
             android:textStyle="bold" />
         <TextView
             android:id="@+id/fragment_result_election_agree_num"
-            android:layout_width="match_parent"
+            android:layout_width="140dp"
             android:layout_height="match_parent"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:layout_weight="1"
+            android:gravity="center"
             android:text="@string/agree_num"
-            android:textColor="@color/white"
+            android:textColor="@color/yellow"
             android:textSize="@dimen/big_text_p4"
             android:textStyle="bold" />
         <TextView
             android:id="@+id/fragment_result_election_oppose_num"
-            android:layout_width="match_parent"
+            android:layout_width="140dp"
             android:layout_height="match_parent"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:layout_weight="1"
+            android:gravity="center"
             android:text="@string/oppose_num"
-            android:textColor="@color/white"
+            android:textColor="@color/yellow"
             android:textSize="@dimen/big_text_p4"
             android:textStyle="bold" />
         <TextView
             android:id="@+id/fragment_result_election_abstant_num"
-            android:layout_width="match_parent"
+            android:layout_width="140dp"
             android:layout_height="match_parent"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:layout_weight="1"
+            android:gravity="center"
             android:text="@string/abstant_num"
-            android:textColor="@color/white"
+            android:textColor="@color/yellow"
             android:textSize="@dimen/big_text_p4"
             android:textStyle="bold" />
         <TextView
             android:id="@+id/fragment_result_election_result"
-            android:layout_width="match_parent"
+            android:layout_width="140dp"
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="20px"
-            android:layout_weight="1"
+            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
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:id="@+id/bottom_linear"
+        android:layout_width="800dp"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="20dp"
+        android:orientation="horizontal">
-        <ListView
-            android:id="@+id/fragment_result_election_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginBottom="@dimen/content_margin"
-            android:layout_marginLeft="@dimen/content_margin"
-            android:layout_marginRight="@dimen/content_margin"
-            android:layout_marginTop="@dimen/content_margin"
-            android:layout_weight="0.1"
-            android:divider="@color/votebakground"
-            android:dividerHeight="1dp"/>
+        <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/yingdaoresult"
+            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/shidaoresult"
+            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
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="@dimen/linear_heigh"
-            android:layout_marginRight="@dimen/linear_heigh"
-            android:orientation="horizontal"
-            android:layout_weight="0.3">
-            <TextView
-                android:id="@+id/tv_to_be"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="left"
-                android:text="@string/yindao"
-                android:textColor="@color/white"
-                android:textSize="@dimen/big_text_p3" />
-
-            <TextView
-                android:id="@+id/tv_to"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="right"
-                android:text="@string/shidao"
-                android:textColor="@color/white"
-                android:textSize="@dimen/big_text_p3" />
-        </LinearLayout>
     </LinearLayout>
-</LinearLayout>
 \ No newline at end of file
+
+    <ListView
+        android:id="@+id/fragment_result_election_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/bottom_linear"
+        android:layout_below="@id/data_title_layout"
+        android:layout_marginBottom="@dimen/content_margin"
+        android:divider="@color/votebakground"
+        android:dividerHeight="1dp" />
+
+</RelativeLayout>
 \ No newline at end of file
@@ -2,81 +2,68 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginBottom="@dimen/content_margin"
     android:layout_marginTop="@dimen/content_margin"
-    android:layout_marginBottom="@dimen/content_margin">
-
+    android:paddingRight="80dp">
     <TextView
         android:id="@+id/item_result_election_num"
-        android:layout_width="match_parent"
+        android:layout_width="140dp"
         android:layout_height="match_parent"
         android:layout_centerVertical="true"
+        android:gravity="center"
+        android:paddingLeft="@dimen/content_margin"
         android:text="@string/name_index"
         android:textColor="@color/white"
         android:textSize="@dimen/big_text_p4"
-        android:paddingLeft="@dimen/content_margin"
-        android:layout_weight="1"
         android:textStyle="bold" />
     <TextView
         android:id="@+id/item_result_election_name"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="match_parent"
-        android:layout_centerVertical="true"
+        android:layout_weight="1"
         android:text="@string/name_xpad"
         android:textColor="@color/white"
         android:textSize="@dimen/big_text_p4"
-        android:layout_weight="1"
         android:textStyle="bold" />
     <TextView
         android:id="@+id/item_result_election_agree"
-        android:layout_width="match_parent"
+        android:layout_width="140dp"
         android:layout_height="match_parent"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
+        android:gravity="center"
         android:text="@string/agree_num"
         android:textColor="@color/white"
-        android:layout_weight="1"
         android:textSize="@dimen/big_text_p4"
-        android:gravity="center"
         android:textStyle="bold" />
     <TextView
         android:id="@+id/item_result_election_oppose_num"
-        android:layout_width="match_parent"
+        android:layout_width="140dp"
         android:layout_height="match_parent"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
+        android:gravity="center"
         android:text="@string/oppose_num"
         android:textColor="@color/white"
-        android:layout_weight="1"
-        android:gravity="center"
         android:textSize="@dimen/big_text_p4"
         android:textStyle="bold" />
     <TextView
         android:id="@+id/item_result_election_abstant_num"
-        android:layout_width="match_parent"
+        android:layout_width="140dp"
         android:layout_height="match_parent"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        android:layout_weight="1"
+        android:gravity="center"
         android:text="@string/abstant_num"
         android:textColor="@color/white"
         android:textSize="@dimen/big_text_p4"
-        android:gravity="center"
         android:textStyle="bold" />
     <TextView
         android:id="@+id/item_result_election_result"
-        android:layout_width="match_parent"
+        android:layout_width="140dp"
         android:layout_height="match_parent"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
+        android:gravity="center"
         android:text="@string/result"
-        android:layout_weight="1"
-        android:paddingLeft="@dimen/content_margin"
         android:textColor="@color/white"
         android:textSize="@dimen/big_text_p4"
         android:textStyle="bold" />
@@ -160,6 +160,8 @@
     <color name="mediumblue">#0000CD</color> <!--中兰色 -->
     <color name="darkblue">#00008B</color> <!--暗蓝色 -->
     <color name="navy">#000080</color> <!--海军色 -->
-    <color name="black">#000000</color> <!--黑色 --> 
+    <color name="black">#000000</color> <!--黑色 -->
+
+    <color name="titile_background_1">#450603</color>
 </resources>
 \ No newline at end of file