commit

孙向锦
1 parent dd9a0f58
Showing 19 changed files with 270 additions and 237 deletions
C5/app/build.gradle
C5/app/src/main/AndroidManifest.xml
C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java
C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionCustomFragment.java
C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionFragment.java
C5/app/src/main/java/com/sunvote/xpadapp/fragments/MultiContentDetailFragment.java
C5/app/src/main/java/com/sunvote/xpadapp/fragments/PDFContextShowFragment.java
C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultElectionCustomFragment.java
C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultVoteFragment.java
C5/app/src/main/java/com/sunvote/xpadapp/fragments/SigninFragment.java
C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java
C5/app/src/main/res/drawable/download_complete.xml
C5/app/src/main/res/layout/dialog_service.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_singlevote.xml
C5/app/src/main/res/layout/list_multi_title_item.xml
C5/app/src/main/res/layout/list_result_election_custom_item.xml
C5/app/src/main/res/values/strings.xml
@@ -88,7 +88,6 @@ dependencies {
     })
     implementation 'com.android.support:appcompat-v7:26.+'
     compile files('libs/ant.jar')
-    compile project(':udpmodule')
     compile(name: 'ycanfilereadfunc-release', ext: 'aar')
     compile(name: 'ycanreaderfileshow-release', ext: 'aar')
     compile(name: 'ycan-release', ext: 'aar')
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.sunvote.xpadapp"
     android:versionCode="70"
-    android:versionName="1.3.0.3"> <!-- android:sharedUserId="android.studentUID.system" -->
+    android:versionName="1.3.0.7"> <!-- android:sharedUserId="android.studentUID.system" -->
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"></uses-permission>
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"></uses-permission>
@@ -1458,6 +1458,7 @@ public class MainActivity extends BaseActivity implements ComListener {
     private void doVote(VoteInfo voteInfo) {
         LogUtil.i(TAG,"doVote:" + voteInfo);
+        hideBottomUIMenu();
         mVoteInfo=voteInfo;
         if (voteInfo.mode == XPadApi.VoteType_KeypadTest) {
             setKeypadTestFragment();
@@ -376,11 +376,11 @@ public class ElectionCustomFragment extends BaseFragment {
 			return super.isEnabled(position);
 		}
-		private ViewHolder holder;
 		@Override
 		public View getView(final int position, View convertView, ViewGroup parent) {
 			MultiTitleItem it = aryContent.get(position);
+			final ViewHolder holder;
 			if (convertView == null) {
 				convertView = mInflater.inflate(R.layout.list_custom_election_item, null);
 				holder = new ViewHolder();
@@ -417,6 +417,12 @@ public class ElectionCustomFragment extends BaseFragment {
 				holder.btnAbstain.setEnabled(true);
 			}
+			if(it.result == 1){
+				holder.btnO.setChecked(true);
+			}else {
+				holder.btnO.setChecked(false);
+			}
+
 			holder.btnO.setOnClickListener(new OnClickListener() {
 				@Override
 				public void onClick(View v) {
@@ -425,6 +431,7 @@ public class ElectionCustomFragment extends BaseFragment {
 						voteWithValue(position,0);
 					}else{
 						if(agreeVotedCount >= voteInfo.limitFavor){
+							holder.btnO.setChecked(false);
 							ToastAlertDialog.makeText(mMainActivity, "已投"+agreeVotedCount+getString(R.string.fix)+",不可多选").show();
 							checkVoted();
 							return;
@@ -464,6 +464,7 @@ public class ElectionFragment extends BaseFragment {
 		tvResult.setVisibility(View.GONE);
 		resultLayout.setVisibility(View.VISIBLE);
 		this.listview.setEnabled(false);
+		hideVote();
 		new Thread(new Runnable() {
 			public void run() {
 				mMainActivity.presenter.submitVote(XPadApi.AnsType_SelectOther,"0");
@@ -586,6 +587,7 @@ public class ElectionFragment extends BaseFragment {
 		showResult();
 		showModifyOrDisable();
 		saveVoteInfo();
+		hideVote();
 	}
 	private void showModifyOrDisable(){
@@ -161,207 +161,208 @@ public class MultiContentDetailFragment extends BaseFragment {
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		Log.d(TAG, "onCreateView");
 		View view = inflater.inflate(R.layout.fragment_multi_content_detail, container, false);
-		contentDetailLayout =view.findViewById(R.id.content_detail_pannal_vote1);
-		initOptions();
-		view.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				;//
-			}
-		});
-		mact = (MainActivity) getActivity();
-		tvTitle = (TextView) view.findViewById(R.id.content_detail_title);
-		if(bill!=null){
-			if (bill.title != null) {
-				tvTitle.setText(bill.title);
-			}
-		}
-		final View pdfViews =  view.findViewById(R.id.content_detail_scview);
-		pdfViews.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				;
-			}
-		});
-		pdfView =  view.findViewById(R.id.content_detail_pdfview);
-		filename = DATABASE_PATH + "/sunvote/" + mact.meetingId + "/" + bill.billFile;
-		panelVotes = (RelativeLayout) view.findViewById(R.id.content_detail_pannal_vote);
-		panelModify = (RelativeLayout) view.findViewById(R.id.content_detail_pannal_modify);
-		tvTips = (TextView) view.findViewById(R.id.content_detail_tv_tips);
-		ivReuslt = (TextView) view.findViewById(R.id.content_detail_tv_result);
-		ivReuslt.setVisibility(View.INVISIBLE);
-		new Handler().postDelayed(new Runnable(){
-			public void run() {
-				//execute the task
-				openPdfFile();
-			}
-		}, pdfDelayLoadTime);
-		panelVotes.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				;
-			}
-		});
-		panelModify.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				;
-			}
-		});
-		ivReuslt.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				;
-			}
-		});
-
-		btnLookPdf= (Button) view.findViewById(R.id.btn_look_pdf);
-		btnLookPdf.setOnClickListener(new OnClickListener() {
-
-			@Override
-			public void onClick(View v) {
-				isClose= false;
-				mact.isLoadPDF = false;
-				pdfPageNum=pdfView.getCurrentPage()+1;
-				//pdfPageNum=pdfView.getCurrentItem()+1;
-				FragmentManager fm = getFragmentManager();
-				FragmentTransaction tx = fm.beginTransaction();
-				PDFContextShowFragment pdfShow = new PDFContextShowFragment();
-				mact.pdfFragment = pdfShow;
-				pdfShow.setInfo(filename, bill.billFile,pdfPageNum + "","0",false);
-				tx.add(R.id.frame_content, pdfShow, "pdfShow");
-				if(uType==1){
-					tx.addToBackStack(null);
-				}else {
-					mact.multiContentFragment = null;
-					fm.popBackStack();
+		try {
+			Log.d(TAG, "onCreateView");
+			contentDetailLayout = view.findViewById(R.id.content_detail_pannal_vote1);
+			initOptions();
+			view.setOnClickListener(new OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					;//
+				}
+			});
+			mact = (MainActivity) getActivity();
+			tvTitle = (TextView) view.findViewById(R.id.content_detail_title);
+			if (bill != null) {
+				if (bill.title != null) {
+					tvTitle.setText(bill.title);
 				}
-				tx.commitAllowingStateLoss();
 			}
-		});
+			final View pdfViews = view.findViewById(R.id.content_detail_scview);
+			pdfViews.setOnClickListener(new OnClickListener() {
+				@Override
+				public void onClick(View view) {
+					;
+				}
+			});
+			pdfView = view.findViewById(R.id.content_detail_pdfview);
+			filename = DATABASE_PATH + "/sunvote/" + mact.meetingId + "/" + bill.billFile;
+			panelVotes = (RelativeLayout) view.findViewById(R.id.content_detail_pannal_vote);
+			panelModify = (RelativeLayout) view.findViewById(R.id.content_detail_pannal_modify);
+			tvTips = (TextView) view.findViewById(R.id.content_detail_tv_tips);
+			ivReuslt = (TextView) view.findViewById(R.id.content_detail_tv_result);
+			ivReuslt.setVisibility(View.INVISIBLE);
+			new Handler().postDelayed(new Runnable() {
+				public void run() {
+					//execute the task
+					openPdfFile();
+				}
+			}, pdfDelayLoadTime);
+			panelVotes.setOnClickListener(new OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					;
+				}
+			});
+			panelModify.setOnClickListener(new OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					;
+				}
+			});
+			ivReuslt.setOnClickListener(new OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					;
+				}
+			});
-		btnA = (Button) view.findViewById(R.id.content_detail_btnA);
-		btnA.setOnClickListener(new OnClickListener() {
+			btnLookPdf = (Button) view.findViewById(R.id.btn_look_pdf);
+			btnLookPdf.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				if (voteInfo.mode2_modify == 1) {
-					doVoteWithIndex(1);
-				} else {
-					showConfirmWithValue(1);
+				@Override
+				public void onClick(View v) {
+					isClose = false;
+					mact.isLoadPDF = false;
+					pdfPageNum = pdfView.getCurrentPage() + 1;
+					//pdfPageNum=pdfView.getCurrentItem()+1;
+					FragmentManager fm = getFragmentManager();
+					FragmentTransaction tx = fm.beginTransaction();
+					PDFContextShowFragment pdfShow = new PDFContextShowFragment();
+					mact.pdfFragment = pdfShow;
+					pdfShow.setInfo(filename, bill.billFile, pdfPageNum + "", "0", false);
+					tx.add(R.id.frame_content, pdfShow, "pdfShow");
+					if (uType == 1) {
+						tx.addToBackStack(null);
+					} else {
+						mact.multiContentFragment = null;
+						fm.popBackStack();
+					}
+					tx.commitAllowingStateLoss();
 				}
-			}
-		});
+			});
-		btnB = (Button) view.findViewById(R.id.content_detail_btnB);
-		btnB.setOnClickListener(new OnClickListener() {
+			btnA = (Button) view.findViewById(R.id.content_detail_btnA);
+			btnA.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				if (voteInfo.mode2_modify == 1) {
-					doVoteWithIndex(2);
-				} else {
-					showConfirmWithValue(2);
+				@Override
+				public void onClick(View v) {
+					if (voteInfo.mode2_modify == 1) {
+						doVoteWithIndex(1);
+					} else {
+						showConfirmWithValue(1);
+					}
 				}
-			}
-		});
+			});
-		btnC = (Button) view.findViewById(R.id.content_detail_btnC);
-		btnC.setOnClickListener(new OnClickListener() {
+			btnB = (Button) view.findViewById(R.id.content_detail_btnB);
+			btnB.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				if (options.length == 2) {
+				@Override
+				public void onClick(View v) {
 					if (voteInfo.mode2_modify == 1) {
 						doVoteWithIndex(2);
 					} else {
 						showConfirmWithValue(2);
 					}
-				} else {
-					if (voteInfo.mode2_modify == 1) {
-						doVoteWithIndex(3);
+				}
+			});
+
+			btnC = (Button) view.findViewById(R.id.content_detail_btnC);
+			btnC.setOnClickListener(new OnClickListener() {
+
+				@Override
+				public void onClick(View v) {
+					if (options.length == 2) {
+						if (voteInfo.mode2_modify == 1) {
+							doVoteWithIndex(2);
+						} else {
+							showConfirmWithValue(2);
+						}
 					} else {
-						showConfirmWithValue(3);
+						if (voteInfo.mode2_modify == 1) {
+							doVoteWithIndex(3);
+						} else {
+							showConfirmWithValue(3);
+						}
 					}
 				}
-			}
-		});
-
-		ImageButton btnBack = (ImageButton) view.findViewById(R.id.content_detail_btnback);
-		btnBack.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				goBack();
-			}
-		});
+			});
-		if (!showBackBtn) {
-			btnBack.setVisibility(View.INVISIBLE);
-		}else{
-			btnBack.setVisibility(View.VISIBLE);
-		}
+			ImageButton btnBack = (ImageButton) view.findViewById(R.id.content_detail_btnback);
+			btnBack.setOnClickListener(new OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					goBack();
+				}
+			});
-		Button btnModify = (Button) view.findViewById(R.id.content_detail_btn_modify);
-		btnModify.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				panelModify.setVisibility(View.GONE);
-				showVote();
-				ivReuslt.setVisibility(View.VISIBLE);
+			if (!showBackBtn) {
+				btnBack.setVisibility(View.INVISIBLE);
+			} else {
+				btnBack.setVisibility(View.VISIBLE);
 			}
-		});
+			Button btnModify = (Button) view.findViewById(R.id.content_detail_btn_modify);
+			btnModify.setOnClickListener(new OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					panelModify.setVisibility(View.GONE);
+					showVote();
+					ivReuslt.setVisibility(View.VISIBLE);
+				}
+			});
-		tvConfirmText = (TextView) view.findViewById(R.id.content_detail_confirm_textview);
-		confirmLayout = (RelativeLayout) view.findViewById(R.id.content_detail_confirm_panel);
-		Button btnConfirmOK = (Button) view.findViewById(R.id.content_detail_btn_confirm_ok);
-		btnConfirmOK.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				hideConfirm();
-				doVoteWithIndex(voteValue);
-			}
-		});
-
-		Button btnConfirmCancel = (Button) view.findViewById(R.id.content_detail_btn_confirm_cancel);
-		btnConfirmCancel.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				hideConfirm();
-			}
-		});
+			tvConfirmText = (TextView) view.findViewById(R.id.content_detail_confirm_textview);
+			confirmLayout = (RelativeLayout) view.findViewById(R.id.content_detail_confirm_panel);
+			Button btnConfirmOK = (Button) view.findViewById(R.id.content_detail_btn_confirm_ok);
+			btnConfirmOK.setOnClickListener(new OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					hideConfirm();
+					doVoteWithIndex(voteValue);
+				}
+			});
-		if (voteInfo != null) {
-			if(voteInfo.mode4==customVote){
-				contentDetailLayout.setVisibility(View.VISIBLE);
-				panelVotes.setVisibility(View.GONE);
-				if(options!=null){
-					setButton(options);
+			Button btnConfirmCancel = (Button) view.findViewById(R.id.content_detail_btn_confirm_cancel);
+			btnConfirmCancel.setOnClickListener(new OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					hideConfirm();
 				}
-			}else{
-				contentDetailLayout.setVisibility(View.INVISIBLE);
-				if (options.length == 2) {
-					btnA.setText(options[0]);
-					btnB.setVisibility(View.INVISIBLE);
-					btnC.setText(options[1]);
-				} else if (options.length == 3) {
-					btnA.setText(options[0]);
-					btnB.setText(options[1]);
-					btnC.setText(options[2]);
+			});
+
+			if (voteInfo != null) {
+				if (voteInfo.mode4 == customVote) {
+					contentDetailLayout.setVisibility(View.VISIBLE);
+					panelVotes.setVisibility(View.GONE);
+					if (options != null) {
+						setButton(options);
+					}
+				} else {
+					contentDetailLayout.setVisibility(View.INVISIBLE);
+					if (options.length == 2) {
+						btnA.setText(options[0]);
+						btnB.setVisibility(View.INVISIBLE);
+						btnC.setText(options[1]);
+					} else if (options.length == 3) {
+						btnA.setText(options[0]);
+						btnB.setText(options[1]);
+						btnC.setText(options[2]);
+					}
+					setBtnModle(1, false);
+					showVote();
 				}
-				setBtnModle(1,false);
-				showVote();
+				showResult();
+				checkIsVoted();
+				panelVotes.setVisibility(View.VISIBLE);
+			} else {
+				panelVotes.setVisibility(View.GONE);
+				hideVote();
 			}
-			showResult();
-			checkIsVoted();
-			panelVotes.setVisibility(View.VISIBLE);
-		} else {
-			panelVotes.setVisibility(View.GONE);
-			hideVote();
-		}
+		}catch (Exception ex){}
 		return view;
 	}
@@ -136,8 +136,8 @@ public class PDFContextShowFragment extends BaseFragment {
     public void openFile() {
         File fpath = new File(filepath);
         if (!fpath.exists()) {
-            Toast.makeText(getActivity(),
-                    "文件不存在", Toast.LENGTH_LONG).show();
+//            Toast.makeText(getActivity(),
+//                    "文件不存在", Toast.LENGTH_LONG).show();
             return;
         }
         Intent intent = new Intent();
@@ -105,6 +105,12 @@ public class ResultElectionCustomFragment extends BaseFragment {
 		return view;
 	}
+	@Override
+	public void onResume() {
+		super.onResume();
+		((MainActivity)getActivity()).setBackgroundColor(Color.parseColor("#042148"));
+	}
+
 	private void initData() {
 		int bitNum = data[2] & 0xf;
@@ -269,7 +269,10 @@ public class ResultVoteFragment extends BaseFragment {
             }
             if(voteInfo.resultInfo.num3 != 0xffff){
                 double opt4 = voteInfo.resultInfo.num3 * 1.0 / fenmu * 100;
-                String strOpt4 = formatDoubleToString(opt4, xiaoShuWei, false);
+                String strOpt4 = "" ;
+                if(fenmu > 0 && fenmu != 0xffff){
+                    strOpt4 = formatDoubleToString(opt4, xiaoShuWei, false);
+                }
                 dataTitleLayout4.setVisibility(View.VISIBLE);
                 ((TextView)(dataTitleLayout4.findViewById(R.id.data_title_layout4_text1))).setText(getString(R.string.weian));
                 String text = "" + voteInfo.resultInfo.num3 ;
@@ -82,24 +82,30 @@ public class SigninFragment extends BaseFragment {
 		 }
 	}
-	
-	
 	@Override
 	public void onVoteSubmitSuccess() {
-		tv.setText(getString(R.string.signined));
-		btnSignin.setEnabled(false);
-		btnSignin.setTextColor(Color.parseColor("#c75d3a"));
-	//	bgView.setBackgroundColor(0xFF009966);
-		SharedPreferencesUtil.saveData(getActivity(),"signin",""+voteInfo.dataPos);
-		((MainActivity)getActivity()).myHandler.sendEmptyMessageDelayed(MainActivity.MSG_DELAY_TO_VIEW,2000);
+		try {
+			tv.setText(getString(R.string.signined));
+			btnSignin.setEnabled(false);
+			btnSignin.setTextColor(Color.parseColor("#c75d3a"));
+			//	bgView.setBackgroundColor(0xFF009966);
+			SharedPreferencesUtil.saveData(getActivity(), "signin", "" + voteInfo.dataPos);
+			((MainActivity) getActivity()).myHandler.sendEmptyMessageDelayed(MainActivity.MSG_DELAY_TO_VIEW, 2000);
+		}catch (Exception ex){
+			LogUtil.e(TAG,ex);
+		}
 	}
 	@Override
 	public void onVoteSubmitError() {
-		super.onVoteSubmitError();
-		tv.setText(getString(R.string.please_signin));
-		 btnSignin.setEnabled(true);
-		btnSignin.setTextColor(Color.RED);
+		try {
+			super.onVoteSubmitError();
+			tv.setText(getString(R.string.please_signin));
+			btnSignin.setEnabled(true);
+			btnSignin.setTextColor(Color.RED);
+		}catch (Exception ex){
+
+		}
 	}
 }
@@ -237,7 +237,7 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
 			public void onClick(View v) {
 				btnModify.setVisibility(View.INVISIBLE);
 				showVote();
-				ivReuslt.setVisibility(View.VISIBLE);
+//				ivReuslt.setVisibility(View.VISIBLE);
 			}
 		});
@@ -312,7 +312,7 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
 			btn[i].setOnClickListener(btnClick);
 			//TextViewUtils.adjustTvTextSize(btn[i],(width-50)/btnNum,data[i].toString());
-			RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams((width-180)/btnNum, 100);
+			RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams((width-180)/btnNum, 130);
 			//设置按钮的宽度和高度
 			if (i%btnNum == 0) {
 				j++;
@@ -441,33 +441,36 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
 	}
 	private void doVoteWithIndex(int index) {
-
+		disableVote();
 		if (bill != null) {
 			singlevoteTvTipsLayout.setVisibility(View.VISIBLE);
+			tvTips.setBackgroundResource(0);
 			tvTips.setText(getString(R.string.submiting));
 			bill.voteResult = index;
 		}
 		voteValue = index;
 		mMainActivity.presenter.submitVote(XPadApi.AnsType_Single, String.valueOf(index));
-		disableVote();
-		showResult();
+
+//		showResult();
 	}
 	private void showResult() {
+		ivReuslt.setVisibility(View.INVISIBLE);
+		singlevoteTvTipsLayout.setVisibility(View.GONE);
 		if (bill.voteResult > 0) {
-			ivReuslt.setVisibility(View.INVISIBLE);
-			singlevoteTvTipsLayout.setVisibility(View.GONE);
 			new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
 				@Override
 				public void run() {
+
 					if (voteInfo.mode3_secret == 0 && options != null) {//
 						if(voteValue -1 >= 0 && voteValue - 1 < options.length) {
 							ivReuslt.setText(options[voteValue - 1]);
 							ivReuslt.setBackgroundResource(R.drawable.voted_empty);
 							tvTitle.setTextColor(Color.parseColor("#B5B5B5"));
                             ivReuslt.setVisibility(View.VISIBLE);
+							singlevoteTvTipsLayout.setVisibility(View.VISIBLE);
                         }
                     } else {
                         tvTips.setBackgroundResource(R.drawable.voted);
@@ -475,6 +478,7 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
                         tvTips.setText("");
 //                        ivReuslt.setText("");
 //                        ivReuslt.setBackgroundResource(R.drawable.voted);
+						singlevoteTvTipsLayout.setVisibility(View.VISIBLE);
                         tvTitle.setTextColor(Color.parseColor("#B5B5B5"));
                     }
 				}
@@ -598,6 +602,7 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
 		showModifyOrDisable();
 		if(voteValue > 0){
 			saveVoteInfo();
+			showResult();
 		}
 	}
@@ -5,8 +5,8 @@
     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" />
+        android:fillColor="@color/white" />
     <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" />
+        android:fillColor="@color/white" />
 </vector>
 \ No newline at end of file
@@ -11,33 +11,7 @@
         android:text="呼叫服务"
         android:textStyle="bold"
         android:textSize="18sp"/>
-    <LinearLayout
-        android:id="@+id/button_line"
-        android:layout_width="530dp"
-        android:layout_height="40dp"
-        android:layout_alignParentBottom="true"
-        android:orientation="horizontal">
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-        <Button
-            android:id="@+id/cancel"
-            android:layout_width="100dp"
-            android:layout_height="match_parent"
-            android:layout_marginRight="10dp"
-            android:visibility="invisible"
-            android:text="@string/cancel" />
-
-        <Button
-            android:id="@+id/submit"
-            android:layout_width="100dp"
-            android:layout_height="match_parent"
-            android:layout_marginRight="10dp"
-            android:text="@string/ok" />
-    </LinearLayout>
     <LinearLayout
         android:layout_width="530dp"
         android:layout_height="250dp"
@@ -240,4 +214,32 @@
                 android:layout_weight="1"></LinearLayout>
         </LinearLayout>
     </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/button_line"
+        android:layout_width="530dp"
+        android:layout_height="40dp"
+        android:layout_alignParentBottom="true"
+        android:orientation="horizontal">
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <Button
+            android:id="@+id/cancel"
+            android:layout_width="100dp"
+            android:layout_height="match_parent"
+            android:layout_marginRight="10dp"
+            android:visibility="invisible"
+            android:text="@string/cancel" />
+
+        <Button
+            android:id="@+id/submit"
+            android:layout_width="100dp"
+            android:layout_height="match_parent"
+            android:layout_marginRight="10dp"
+            android:text="@string/ok" />
+    </LinearLayout>
 </LinearLayout>
@@ -18,10 +18,10 @@
         <ImageButton
             android:id="@+id/content_detail_btnback"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/px120dp"
+            android:layout_height="@dimen/px120dp"
             android:layout_gravity="center_vertical"
-            android:background="@drawable/back_selector" />
+            android:background="@drawable/back" />
         <TextView
             android:id="@+id/content_detail_title"
@@ -44,10 +44,11 @@
             android:layout_height="@dimen/button_heigh"
             android:layout_gravity="center_vertical"
             android:layout_marginRight="20dp"
-            android:background="@drawable/signin_selector"
+            android:background="@drawable/oppos_selector"
             android:text="查看批注"
-            android:textColor="@color/yellow"
+            android:textColor="@color/white"
             android:textSize="@dimen/big_text_p4"
+            android:visibility="gone"
             android:textStyle="bold" />
     </LinearLayout>
@@ -10,7 +10,7 @@
         android:layout_height="@dimen/px152dp"
         android:background="#AC1007"
         android:orientation="horizontal"
-        android:paddingRight="@dimen/px120dp">
+        android:paddingRight="@dimen/px180dp">
         <TextView
             android:id="@+id/multivote_title"
@@ -72,9 +72,9 @@
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="26dp"
-        android:background="@drawable/modify_selector"
+        android:background="@drawable/agree_selector"
         android:text="@string/modify"
-        android:textColor="@color/modifytext"
+        android:textColor="@color/white"
         android:textSize="@dimen/big_text_p4"
         android:textStyle="bold"
         android:visibility="invisible" />
@@ -4,7 +4,7 @@
     android:layout_height="@dimen/px279dp"
     android:layout_marginBottom="1dp"
     android:layout_marginTop="1dp"
-    android:paddingRight="@dimen/px120dp"
+    android:paddingRight="@dimen/px180dp"
     android:background="@color/white">
     <LinearLayout
@@ -26,7 +26,7 @@
         android:layout_weight="1"
         android:text="@string/name_xpad"
         android:textColor="@color/white"
-        android:gravity="center"
+        android:gravity="left|center_vertical"
         android:textSize="@dimen/px48dp"
         android:textStyle="bold" />
@@ -146,8 +146,8 @@
     <string name="oppose_num">反对票数</string>
     <string name="abstant_num">弃权票数</string>
     <string name="my_number">序号</string>
-    <string name="fix">张</string>
-    <string name="agree_vote_ok">可投赞成票</string>
+    <string name="fix">票</string>
+    <string name="agree_vote_ok">可投</string>
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>