From 9eecf3b7f519d8965ef15d1ebaa3848b62eb0502 Mon Sep 17 00:00:00 2001
From: wutaian <Wutaian@psunsky.com>
Date: Fri, 15 Mar 2019 21:23:19 +0800
Subject: [PATCH] 修改民事,选举提示

---
 C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionCustomFragment.java | 12 ++++++++++++
 C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionFragment.java       | 10 ++++++++++
 C5/app/src/main/res/layout/fragment_custom_election.xml                        | 32 ++++++++++++++++++--------------
 C5/app/src/main/res/layout/fragment_election.xml                               | 27 ++++++++++++++-------------
 4 files changed, 54 insertions(+), 27 deletions(-)

diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionCustomFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionCustomFragment.java
index 82f7378..3cddab2 100644
--- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionCustomFragment.java
+++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionCustomFragment.java
@@ -64,6 +64,8 @@ public class ElectionCustomFragment extends BaseFragment {
 
 	private  View resultLayout;
 
+	public TextView confirm_tv;
+
 	public void setInfo(BillInfo info, ArrayList<MultiTitleItem> subInfo, XPadApiInterface.VoteInfo voteInfo){
 		this.bill = info;
 		this.aryContent = subInfo;
@@ -109,6 +111,12 @@ public class ElectionCustomFragment extends BaseFragment {
 			}
 		});
 
+        confirm_panel.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                ;
+            }
+        });
 
 		btnPageUp.setOnClickListener(new OnClickListener() {
 
@@ -149,6 +157,7 @@ public class ElectionCustomFragment extends BaseFragment {
 			public void onClick(View v) {
 				if(voteInfo.mode2_modify==0){
 					showConfirm();
+					confirm_tv.setText("可选"+ voteInfo.limitFavor +"项,已选"+agreeVotedCount+"项,确定提交吗？");
 				}else{
 					hideConfirm();
 					confirmInfo();
@@ -214,6 +223,9 @@ public class ElectionCustomFragment extends BaseFragment {
 		btnModify = (Button)view.findViewById(R.id.election_btn_modify);
 		btnConfirmOK = (Button) view.findViewById(R.id.singlevote_btn_confirm_ok);
 		btnConfirmCancel = (Button) view.findViewById(R.id.singlevote_btn_confirm_cancel);
+
+		confirm_tv = (TextView)  view.findViewById(R.id.singlevote_confirm_textview);
+
 	}
 
 	private void confirmInfo(){
diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionFragment.java
index 09abae2..15ce10a 100644
--- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionFragment.java
+++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionFragment.java
@@ -91,6 +91,7 @@ public class ElectionFragment extends BaseFragment {
 	private XPadApiInterface.VoteInfo.ElectInfo voteInfo;
 	private XPadApiInterface.VoteInfo vtInfo;
 
+	TextView confirm_tv;
 	private RelativeLayout confirm_panel;
 	private String[] options;
 	private ImageButton btn_all_ok,btn_all_xx;
@@ -147,6 +148,7 @@ public class ElectionFragment extends BaseFragment {
 		resultLayout =(View)  view.findViewById(R.id.result_layout);
 		tvSubmiting=(TextView)  view.findViewById(R.id.submiting_tv);
 		confirm_panel = (RelativeLayout) view.findViewById(R.id.singlevote_confirm_panel);
+		confirm_tv = (TextView) view.findViewById(R.id.singlevote_confirm_textview);
 
 		tv_all_ok=(TextView)  view.findViewById(R.id.tv_all_ok);
 		tv_all_xx=(TextView)  view.findViewById(R.id.tv_all_xx);
@@ -173,6 +175,13 @@ public class ElectionFragment extends BaseFragment {
 			}
 		});
 
+		confirm_panel.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				;
+			}
+		});
+
 		view.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View v) {
@@ -273,6 +282,7 @@ public class ElectionFragment extends BaseFragment {
 			public void onClick(View v) {
 				if(voteInfo.modify==0){
 					showConfirm();
+					confirm_tv.setText("可选"+ voteInfo.select +"人,已选"+votedCount+"人,确定提交吗？");
 				}else{
 					hideConfirm();
 					confirmInfo();
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 f9d6247..5fce5ab 100644
--- a/C5/app/src/main/res/layout/fragment_custom_election.xml
+++ b/C5/app/src/main/res/layout/fragment_custom_election.xml
@@ -221,9 +221,9 @@
 
     <RelativeLayout
         android:id="@+id/singlevote_confirm_panel"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:background="#ff000000"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#bb000000"
         android:visibility="gone">
 
         <TextView
@@ -231,38 +231,42 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
-            android:layout_marginTop="100dp"
+            android:layout_marginLeft="@dimen/content_margin"
+            android:layout_marginRight="@dimen/content_margin"
+            android:layout_marginTop="@dimen/px352dp"
             android:text="@string/cant_modify_confirm"
             android:textColor="@color/white"
-            android:textSize="@dimen/big_text_p4" />
+            android:textSize="@dimen/px70dp"
+            android:textStyle="bold" />
 
         <Button
             android:id="@+id/singlevote_btn_confirm_cancel"
-            android:layout_width="@dimen/button_width"
-            android:layout_height="@dimen/button_heigh"
+            android:layout_width="@dimen/px360dp"
+            android:layout_height="@dimen/px110dp"
             android:layout_alignParentLeft="true"
             android:layout_below="@id/singlevote_confirm_textview"
             android:layout_marginLeft="200dp"
-            android:layout_marginTop="@dimen/button_to_right"
-            android:background="@drawable/btn_signin_d"
+            android:layout_marginTop="@dimen/button_to_content"
+            android:background="#FBBF16"
             android:text="@string/cancel"
             android:textColor="@color/white"
-            android:textSize="@dimen/big_text_p5"
+            android:textSize="@dimen/px60dp"
             android:textStyle="bold" />
 
         <Button
             android:id="@+id/singlevote_btn_confirm_ok"
-            android:layout_width="@dimen/button_width"
-            android:layout_height="@dimen/button_heigh"
+            android:layout_width="@dimen/px360dp"
+            android:layout_height="@dimen/px110dp"
             android:layout_alignParentRight="true"
             android:layout_below="@id/singlevote_confirm_textview"
             android:layout_marginRight="200dp"
-            android:layout_marginTop="@dimen/button_to_right"
+            android:layout_marginTop="@dimen/button_to_content"
             android:background="@drawable/btn_agree"
             android:text="@string/ok"
             android:textColor="@color/white"
-            android:textSize="@dimen/big_text_p5"
+            android:textSize="@dimen/px60dp"
             android:textStyle="bold" />
+
     </RelativeLayout>
 
 
diff --git a/C5/app/src/main/res/layout/fragment_election.xml b/C5/app/src/main/res/layout/fragment_election.xml
index dc8f7f9..4d2dc2d 100644
--- a/C5/app/src/main/res/layout/fragment_election.xml
+++ b/C5/app/src/main/res/layout/fragment_election.xml
@@ -376,9 +376,9 @@
 
     <RelativeLayout
         android:id="@+id/singlevote_confirm_panel"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:background="#ff000000"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#bb000000"
         android:visibility="gone">
 
         <TextView
@@ -388,30 +388,30 @@
             android:layout_centerHorizontal="true"
             android:layout_marginLeft="@dimen/content_margin"
             android:layout_marginRight="@dimen/content_margin"
-            android:layout_marginTop="@dimen/button_to_content"
-            android:gravity="center"
+            android:layout_marginTop="@dimen/px352dp"
             android:text="@string/cant_modify_confirm"
             android:textColor="@color/white"
-            android:textSize="@dimen/big_text_p4" />
+            android:textSize="@dimen/px70dp"
+            android:textStyle="bold" />
 
         <Button
             android:id="@+id/singlevote_btn_confirm_cancel"
-            android:layout_width="@dimen/button_width"
-            android:layout_height="@dimen/button_heigh"
+            android:layout_width="@dimen/px360dp"
+            android:layout_height="@dimen/px110dp"
             android:layout_alignParentLeft="true"
             android:layout_below="@id/singlevote_confirm_textview"
             android:layout_marginLeft="200dp"
             android:layout_marginTop="@dimen/button_to_content"
-            android:background="@drawable/btn_signin_d"
+            android:background="#FBBF16"
             android:text="@string/cancel"
             android:textColor="@color/white"
-            android:textSize="@dimen/big_text_p5"
+            android:textSize="@dimen/px60dp"
             android:textStyle="bold" />
 
         <Button
             android:id="@+id/singlevote_btn_confirm_ok"
-            android:layout_width="@dimen/button_width"
-            android:layout_height="@dimen/button_heigh"
+            android:layout_width="@dimen/px360dp"
+            android:layout_height="@dimen/px110dp"
             android:layout_alignParentRight="true"
             android:layout_below="@id/singlevote_confirm_textview"
             android:layout_marginRight="200dp"
@@ -419,8 +419,9 @@
             android:background="@drawable/btn_agree"
             android:text="@string/ok"
             android:textColor="@color/white"
-            android:textSize="@dimen/big_text_p5"
+            android:textSize="@dimen/px60dp"
             android:textStyle="bold" />
+
     </RelativeLayout>
 
     <FrameLayout
--
libgit2 0.21.4