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 a57c07c..6c15bf2 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 @@ -4,6 +4,7 @@ import android.annotation.SuppressLint; import android.content.Context; import android.graphics.Color; import android.os.Bundle; +import android.text.Html; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -34,7 +35,7 @@ public class ElectionCustomFragment extends BaseFragment { private ArrayList aryContent = null; //标题，标题选举信息，提示信息，结果,页码 - private TextView tvTitle,tvTitleInfo,tvTipInfo,tvResult; + private TextView tvTitle,tvTitleInfo,tvTipInfo,tvResult,tvSubmiting; private ListView listview; private Button btnConfirm; private Button btnModify; @@ -60,6 +61,8 @@ public class ElectionCustomFragment extends BaseFragment { //确认面板 private RelativeLayout confirm_panel; + private View resultLayout; + public void setInfo(BillInfo info, ArrayList subInfo, XPadApiInterface.VoteInfo voteInfo){ this.bill = info; this.aryContent = subInfo; @@ -104,6 +107,8 @@ public class ElectionCustomFragment extends BaseFragment { ; } }); + + btnPageUp.setOnClickListener(new OnClickListener() { @Override @@ -150,6 +155,7 @@ public class ElectionCustomFragment extends BaseFragment { } }); + btnConfirmOK.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { @@ -195,6 +201,8 @@ public class ElectionCustomFragment extends BaseFragment { tvTipInfo= (TextView) view.findViewById(R.id.tv_tip_info); tvResult =(TextView) view.findViewById(R.id.singlevote_tv_result); + tvSubmiting = (TextView) view.findViewById(R.id.submiting_tv); + resultLayout =(View) view.findViewById(R.id.result_layout); confirm_panel = (RelativeLayout) view.findViewById(R.id.singlevote_confirm_panel); btnPageUp = view.findViewById(R.id.election_pageup); @@ -223,7 +231,12 @@ public class ElectionCustomFragment extends BaseFragment { } showSecrecyOrDisable(); - tvTipInfo.setText(getString(R.string.submiting)); + //tvTipInfo.setText(getString(R.string.submiting)); + tvSubmiting.setText(getString(R.string.submiting)); + tvSubmiting.setVisibility(View.VISIBLE); + tvResult.setVisibility(View.GONE); + resultLayout.setVisibility(View.VISIBLE); + this.listview.setEnabled(false); mMainActivity.presenter.submitVoteAllOK(); } @@ -287,7 +300,7 @@ public class ElectionCustomFragment extends BaseFragment { it.startVote = true; it.modifyModel=true; } - tvTipInfo.setText(getString(R.string.submited_no_modify)); + //tvTipInfo.setText(getString(R.string.submited_no_modify)); }else{ btnConfirm.setEnabled(false); btnConfirm.setVisibility(View.INVISIBLE); @@ -297,7 +310,7 @@ public class ElectionCustomFragment extends BaseFragment { it.startVote = true; it.modifyModel=false; } - tvTipInfo.setText(getString(R.string.submited)); + //tvTipInfo.setText(getString(R.string.submited)); } mAdapter.notifyDataSetChanged(); } @@ -460,13 +473,19 @@ public class ElectionCustomFragment extends BaseFragment { } private void showResult(){ - tvResult.setText("已投票"); + //tvResult.setText("已投票"); tvResult.setVisibility(View.VISIBLE); + resultLayout.setVisibility(View.VISIBLE); + tvSubmiting.setVisibility(View.GONE); + this.listview.setEnabled(false); } private void hideResult(){ - tvResult.setText("已投票"); - tvResult.setVisibility(View.INVISIBLE); + //tvResult.setText("已投票"); + tvResult.setVisibility(View.GONE); + resultLayout.setVisibility(View.INVISIBLE); + tvSubmiting.setVisibility(View.GONE); + this.listview.setEnabled(true); } private void checkVoted() { @@ -486,7 +505,10 @@ public class ElectionCustomFragment extends BaseFragment { } } if(voteInfo!=null){ - tvTitleInfo.setText(getString(R.string.agree_vote_ok) + voteInfo.limitFavor+ getString(R.string.fix) +",已投"+ agreeVotedCount + getString(R.string.fix)); + //tvTitleInfo.setText(getString(R.string.agree_vote_ok) + voteInfo.limitFavor+ getString(R.string.fix) +",已投"+ agreeVotedCount + getString(R.string.fix)); + String str= String.format("%s%s%s,已投%s%s",getString(R.string.agree_vote_ok), + voteInfo.limitFavor,getString(R.string.fix),agreeVotedCount,getString(R.string.fix)); + tvTitleInfo.setText(Html.fromHtml(str)); } mAdapter.notifyDataSetChanged(); listview.invalidate(); 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 f405fde..1f9116c 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 @@ -23,6 +23,7 @@ import android.widget.BaseAdapter; import android.widget.Button; import android.widget.ImageButton; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.ListView; import android.widget.RadioButton; import android.widget.RadioGroup; @@ -57,10 +58,12 @@ public class ElectionFragment extends BaseFragment { BillInfo bill; private TextView tvTitle; private ListView listview; - private TextView tvInfo; + private TextView tvInfo,tvSubmiting; private Button btnConfirm; private Button btnModify; private TextView tvResult; + private View resultLayout; + private PaletteView drawView; @@ -140,6 +143,8 @@ public class ElectionFragment extends BaseFragment { bottomLayout = (RelativeLayout) view.findViewById(R.id.election_pannal_bottom); addOtherLayout = view.findViewById(R.id.election_add_other_panel); tvResult =(TextView) view.findViewById(R.id.singlevote_tv_result); + 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); tv_all_ok=(TextView) view.findViewById(R.id.tv_all_ok); @@ -166,6 +171,7 @@ public class ElectionFragment extends BaseFragment { } }); + view.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { @@ -441,7 +447,12 @@ public class ElectionFragment extends BaseFragment { } showSecrecyOrDisable(); - tvInfo.setText(getString(R.string.submiting)); + //tvInfo.setText(getString(R.string.submiting)); + tvSubmiting.setText(getString(R.string.submiting)); + tvSubmiting.setVisibility(View.VISIBLE); + tvResult.setVisibility(View.GONE); + resultLayout.setVisibility(View.VISIBLE); + this.listview.setEnabled(false); new Thread(new Runnable() { public void run() { mMainActivity.presenter.submitVote(XPadApi.AnsType_SelectOther,"0"); @@ -576,7 +587,7 @@ public class ElectionFragment extends BaseFragment { it.startVote = true; it.modifyModel=true; } - tvInfo.setText(getString(R.string.submited_no_modify)); + //tvInfo.setText(getString(R.string.submited_no_modify)); }else{ btnConfirm.setEnabled(false); btnConfirm.setVisibility(View.INVISIBLE); @@ -587,7 +598,7 @@ public class ElectionFragment extends BaseFragment { it.startVote = true; it.modifyModel=false; } - tvInfo.setText(getString(R.string.submited)); + //tvInfo.setText(getString(R.string.submited)); } mAdapter.notifyDataSetChanged(); } @@ -806,13 +817,19 @@ public class ElectionFragment extends BaseFragment { } private void showResult(){ - tvResult.setText("已投票"); + //tvResult.setText("已投票"); tvResult.setVisibility(View.VISIBLE); + resultLayout.setVisibility(View.VISIBLE); + tvSubmiting.setVisibility(View.GONE); + this.listview.setEnabled(false); } private void hideResult(){ - tvResult.setText("已投票"); - tvResult.setVisibility(View.INVISIBLE); + //tvResult.setText("已投票"); + tvResult.setVisibility(View.GONE); + resultLayout.setVisibility(View.INVISIBLE); + tvSubmiting.setVisibility(View.GONE); + this.listview.setEnabled(true); } private void checkVoted() { diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultElectionFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultElectionFragment.java index cff1d80..65d67f3 100644 --- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultElectionFragment.java +++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultElectionFragment.java @@ -374,7 +374,6 @@ public class ResultElectionFragment extends BaseFragment { holder = new ViewHolder(); holder.tvNum = (TextView) convertView.findViewById(R.id.item_result_election_num); holder.tvName = (TextView) convertView.findViewById(R.id.item_result_election_name); - holder.tvVote = (TextView) convertView.findViewById(R.id.item_result_election_agree); holder.tvAgree = (TextView) convertView.findViewById(R.id.item_result_election_agree); holder.tvOppose = (TextView) convertView.findViewById(R.id.item_result_election_oppose_num); holder.tvAbstant = (TextView) convertView.findViewById(R.id.item_result_election_abstant_num); @@ -414,9 +413,9 @@ public class ResultElectionFragment extends BaseFragment { int width = metrics.widthPixels/5-80; if(!TextUtils.isEmpty(it.name)){ TextViewUtils.adjustTvTextSize(holder.tvName,width,it.name); - } + } holder.tvName.setText(it.name); - holder.tvName.setGravity(Gravity.CENTER_VERTICAL); + //holder.tvName.setGravity(Gravity.CENTER_VERTICAL); holder.tvAgree.setText(String.valueOf(it.agreeNum)); holder.tvOppose.setText(String.valueOf(it.opposeNum)); holder.tvAbstant.setText(String.valueOf(it.abstantNum)); @@ -430,13 +429,16 @@ public class ResultElectionFragment extends BaseFragment { holder.tvResult.setText(getString(R.string.pass)); } } + + if (position % 2 == 0) { + convertView.setBackgroundColor(getResources().getColor(R.color.blue2)); + } return convertView; } public final class ViewHolder { public TextView tvNum; public TextView tvName; - public TextView tvVote; public TextView tvAgree; public TextView tvOppose; public TextView tvAbstant; diff --git a/C5/app/src/main/res/drawable/oo_selector.xml b/C5/app/src/main/res/drawable/oo_selector.xml index e662df9..e86d6df 100644 --- a/C5/app/src/main/res/drawable/oo_selector.xml +++ b/C5/app/src/main/res/drawable/oo_selector.xml @@ -2,32 +2,33 @@ + android:drawable="@drawable/ic_btn_oo_s" /> + android:drawable="@drawable/ic_btn_oo" /> + android:drawable="@drawable/ic_btn_oo_s" /> + android:drawable="@drawable/ic_btn_oo" /> + android:drawable="@drawable/ic_btn_oo_s" /> + android:drawable="@drawable/ic_btn_oo" /> + android:drawable="@drawable/ic_btn_oo_s" /> + android:drawable="@drawable/ic_btn_oo" /> + android:drawable="@drawable/ic_btn_oo_s" /> - - - + android:drawable="@drawable/ic_btn_oo" /> + + + + diff --git a/C5/app/src/main/res/drawable/xx_selector.xml b/C5/app/src/main/res/drawable/xx_selector.xml index 7b53fb1..d27a3f4 100644 --- a/C5/app/src/main/res/drawable/xx_selector.xml +++ b/C5/app/src/main/res/drawable/xx_selector.xml @@ -3,32 +3,32 @@ + android:drawable="@drawable/ic_btn_xx_s" /> + android:drawable="@drawable/ic_btn_xx" /> + android:drawable="@drawable/ic_btn_xx_s" /> + android:drawable="@drawable/ic_btn_xx" /> + android:drawable="@drawable/ic_btn_xx_s" /> + android:drawable="@drawable/ic_btn_xx" /> + android:drawable="@drawable/ic_btn_xx_s" /> + android:drawable="@drawable/ic_btn_xx" /> + android:drawable="@drawable/ic_btn_xx_s" /> + android:drawable="@drawable/ic_btn_xx" /> - - + + diff --git a/C5/app/src/main/res/layout/dialog_service.xml b/C5/app/src/main/res/layout/dialog_service.xml index a4381f7..7018e27 100644 --- a/C5/app/src/main/res/layout/dialog_service.xml +++ b/C5/app/src/main/res/layout/dialog_service.xml @@ -12,6 +12,33 @@ android:textStyle="bold" android:textSize="18sp"/> + + + +