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 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 @@ + android:textSize="@dimen/px70dp" + android:textStyle="bold" />