孙向锦 / VoteC5

Commit 0345eb58181248daad4625a764fc317cfcd01b4c

Authored by 孙向锦
2 parents 55207730 cadc1d8f

Merge branch 'C58寸' of http://120.78.57.84/Elvis/VoteC5 into C58寸

Inline Side-by-side
Showing 25 changed files with 1003 additions and 238 deletions
C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionCustomFragment.java
  View file @0345eb5
... ... @@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
4 4 import android.content.Context;
5 5 import android.graphics.Color;
6 6 import android.os.Bundle;
  7 +import android.text.Html;
7 8 import android.util.Log;
8 9 import android.view.LayoutInflater;
9 10 import android.view.View;
... ... @@ -34,7 +35,7 @@ public class ElectionCustomFragment extends BaseFragment {
34 35 private ArrayList<MultiTitleItem> aryContent = null;
35 36  
36 37 //标题，标题选举信息，提示信息，结果,页码
37   - private TextView tvTitle,tvTitleInfo,tvTipInfo,tvResult;
  38 + private TextView tvTitle,tvTitleInfo,tvTipInfo,tvResult,tvSubmiting;
38 39 private ListView listview;
39 40 private Button btnConfirm;
40 41 private Button btnModify;
... ... @@ -60,6 +61,8 @@ public class ElectionCustomFragment extends BaseFragment {
60 61 //确认面板
61 62 private RelativeLayout confirm_panel;
62 63  
  64 + private View resultLayout;
  65 +
63 66 public void setInfo(BillInfo info, ArrayList<MultiTitleItem> subInfo, XPadApiInterface.VoteInfo voteInfo){
64 67 this.bill = info;
65 68 this.aryContent = subInfo;
... ... @@ -104,6 +107,8 @@ public class ElectionCustomFragment extends BaseFragment {
104 107 ;
105 108 }
106 109 });
  110 +
  111 +
107 112 btnPageUp.setOnClickListener(new OnClickListener() {
108 113  
109 114 @Override
... ... @@ -150,6 +155,7 @@ public class ElectionCustomFragment extends BaseFragment {
150 155 }
151 156 });
152 157  
  158 +
153 159 btnConfirmOK.setOnClickListener(new OnClickListener() {
154 160 @Override
155 161 public void onClick(View v) {
... ... @@ -195,6 +201,8 @@ public class ElectionCustomFragment extends BaseFragment {
195 201 tvTipInfo= (TextView) view.findViewById(R.id.tv_tip_info);
196 202  
197 203 tvResult =(TextView) view.findViewById(R.id.singlevote_tv_result);
  204 + tvSubmiting = (TextView) view.findViewById(R.id.submiting_tv);
  205 + resultLayout =(View) view.findViewById(R.id.result_layout);
198 206 confirm_panel = (RelativeLayout) view.findViewById(R.id.singlevote_confirm_panel);
199 207  
200 208 btnPageUp = view.findViewById(R.id.election_pageup);
... ... @@ -223,7 +231,12 @@ public class ElectionCustomFragment extends BaseFragment {
223 231 }
224 232  
225 233 showSecrecyOrDisable();
226   - tvTipInfo.setText(getString(R.string.submiting));
  234 + //tvTipInfo.setText(getString(R.string.submiting));
  235 + tvSubmiting.setText(getString(R.string.submiting));
  236 + tvSubmiting.setVisibility(View.VISIBLE);
  237 + tvResult.setVisibility(View.GONE);
  238 + resultLayout.setVisibility(View.VISIBLE);
  239 + this.listview.setEnabled(false);
227 240 mMainActivity.presenter.submitVoteAllOK();
228 241 }
229 242  
... ... @@ -287,7 +300,7 @@ public class ElectionCustomFragment extends BaseFragment {
287 300 it.startVote = true;
288 301 it.modifyModel=true;
289 302 }
290   - tvTipInfo.setText(getString(R.string.submited_no_modify));
  303 + //tvTipInfo.setText(getString(R.string.submited_no_modify));
291 304 }else{
292 305 btnConfirm.setEnabled(false);
293 306 btnConfirm.setVisibility(View.INVISIBLE);
... ... @@ -297,7 +310,7 @@ public class ElectionCustomFragment extends BaseFragment {
297 310 it.startVote = true;
298 311 it.modifyModel=false;
299 312 }
300   - tvTipInfo.setText(getString(R.string.submited));
  313 + //tvTipInfo.setText(getString(R.string.submited));
301 314 }
302 315 mAdapter.notifyDataSetChanged();
303 316 }
... ... @@ -460,13 +473,19 @@ public class ElectionCustomFragment extends BaseFragment {
460 473 }
461 474  
462 475 private void showResult(){
463   - tvResult.setText("已投票");
  476 + //tvResult.setText("已投票");
464 477 tvResult.setVisibility(View.VISIBLE);
  478 + resultLayout.setVisibility(View.VISIBLE);
  479 + tvSubmiting.setVisibility(View.GONE);
  480 + this.listview.setEnabled(false);
465 481 }
466 482  
467 483 private void hideResult(){
468   - tvResult.setText("已投票");
469   - tvResult.setVisibility(View.INVISIBLE);
  484 + //tvResult.setText("已投票");
  485 + tvResult.setVisibility(View.GONE);
  486 + resultLayout.setVisibility(View.INVISIBLE);
  487 + tvSubmiting.setVisibility(View.GONE);
  488 + this.listview.setEnabled(true);
470 489 }
471 490  
472 491 private void checkVoted() {
... ... @@ -486,7 +505,10 @@ public class ElectionCustomFragment extends BaseFragment {
486 505 }
487 506 }
488 507 if(voteInfo!=null){
489   - tvTitleInfo.setText(getString(R.string.agree_vote_ok) + voteInfo.limitFavor+ getString(R.string.fix) +",已投"+ agreeVotedCount + getString(R.string.fix));
  508 + //tvTitleInfo.setText(getString(R.string.agree_vote_ok) + voteInfo.limitFavor+ getString(R.string.fix) +",已投"+ agreeVotedCount + getString(R.string.fix));
  509 + String str= String.format("%s%s%s,已投<font color='#FFFF00'><big>%s</big></font>%s",getString(R.string.agree_vote_ok),
  510 + voteInfo.limitFavor,getString(R.string.fix),agreeVotedCount,getString(R.string.fix));
  511 + tvTitleInfo.setText(Html.fromHtml(str));
490 512 }
491 513 mAdapter.notifyDataSetChanged();
492 514 listview.invalidate();
... ...
C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionFragment.java
  View file @0345eb5
... ... @@ -23,6 +23,7 @@ import android.widget.BaseAdapter;
23 23 import android.widget.Button;
24 24 import android.widget.ImageButton;
25 25 import android.widget.ImageView;
  26 +import android.widget.LinearLayout;
26 27 import android.widget.ListView;
27 28 import android.widget.RadioButton;
28 29 import android.widget.RadioGroup;
... ... @@ -57,10 +58,12 @@ public class ElectionFragment extends BaseFragment {
57 58 BillInfo bill;
58 59 private TextView tvTitle;
59 60 private ListView listview;
60   - private TextView tvInfo;
  61 + private TextView tvInfo,tvSubmiting;
61 62 private Button btnConfirm;
62 63 private Button btnModify;
63 64 private TextView tvResult;
  65 + private View resultLayout;
  66 +
64 67  
65 68 private PaletteView drawView;
66 69  
... ... @@ -140,6 +143,8 @@ public class ElectionFragment extends BaseFragment {
140 143 bottomLayout = (RelativeLayout) view.findViewById(R.id.election_pannal_bottom);
141 144 addOtherLayout = view.findViewById(R.id.election_add_other_panel);
142 145 tvResult =(TextView) view.findViewById(R.id.singlevote_tv_result);
  146 + resultLayout =(View) view.findViewById(R.id.result_layout);
  147 + tvSubmiting=(TextView) view.findViewById(R.id.submiting_tv);
143 148 confirm_panel = (RelativeLayout) view.findViewById(R.id.singlevote_confirm_panel);
144 149  
145 150 tv_all_ok=(TextView) view.findViewById(R.id.tv_all_ok);
... ... @@ -166,6 +171,7 @@ public class ElectionFragment extends BaseFragment {
166 171  
167 172 }
168 173 });
  174 +
169 175 view.setOnClickListener(new OnClickListener() {
170 176 @Override
171 177 public void onClick(View v) {
... ... @@ -441,7 +447,12 @@ public class ElectionFragment extends BaseFragment {
441 447 }
442 448  
443 449 showSecrecyOrDisable();
444   - tvInfo.setText(getString(R.string.submiting));
  450 + //tvInfo.setText(getString(R.string.submiting));
  451 + tvSubmiting.setText(getString(R.string.submiting));
  452 + tvSubmiting.setVisibility(View.VISIBLE);
  453 + tvResult.setVisibility(View.GONE);
  454 + resultLayout.setVisibility(View.VISIBLE);
  455 + this.listview.setEnabled(false);
445 456 new Thread(new Runnable() {
446 457 public void run() {
447 458 mMainActivity.presenter.submitVote(XPadApi.AnsType_SelectOther,"0");
... ... @@ -576,7 +587,7 @@ public class ElectionFragment extends BaseFragment {
576 587 it.startVote = true;
577 588 it.modifyModel=true;
578 589 }
579   - tvInfo.setText(getString(R.string.submited_no_modify));
  590 + //tvInfo.setText(getString(R.string.submited_no_modify));
580 591 }else{
581 592 btnConfirm.setEnabled(false);
582 593 btnConfirm.setVisibility(View.INVISIBLE);
... ... @@ -587,7 +598,7 @@ public class ElectionFragment extends BaseFragment {
587 598 it.startVote = true;
588 599 it.modifyModel=false;
589 600 }
590   - tvInfo.setText(getString(R.string.submited));
  601 + //tvInfo.setText(getString(R.string.submited));
591 602 }
592 603 mAdapter.notifyDataSetChanged();
593 604 }
... ... @@ -806,13 +817,19 @@ public class ElectionFragment extends BaseFragment {
806 817 }
807 818  
808 819 private void showResult(){
809   - tvResult.setText("已投票");
  820 + //tvResult.setText("已投票");
810 821 tvResult.setVisibility(View.VISIBLE);
  822 + resultLayout.setVisibility(View.VISIBLE);
  823 + tvSubmiting.setVisibility(View.GONE);
  824 + this.listview.setEnabled(false);
811 825 }
812 826  
813 827 private void hideResult(){
814   - tvResult.setText("已投票");
815   - tvResult.setVisibility(View.INVISIBLE);
  828 + //tvResult.setText("已投票");
  829 + tvResult.setVisibility(View.GONE);
  830 + resultLayout.setVisibility(View.INVISIBLE);
  831 + tvSubmiting.setVisibility(View.GONE);
  832 + this.listview.setEnabled(true);
816 833 }
817 834  
818 835 private void checkVoted() {
... ...
C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultElectionCustomFragment.java 0 → 100644
  View file @0345eb5
  1 +package com.sunvote.xpadapp.fragments;
  2 +
  3 +import android.annotation.SuppressLint;
  4 +import android.app.FragmentManager;
  5 +import android.app.FragmentTransaction;
  6 +import android.content.Context;
  7 +import android.graphics.Color;
  8 +import android.os.Bundle;
  9 +import android.text.TextUtils;
  10 +import android.util.DisplayMetrics;
  11 +import android.util.Log;
  12 +import android.view.LayoutInflater;
  13 +import android.view.View;
  14 +import android.view.View.OnClickListener;
  15 +import android.view.ViewGroup;
  16 +import android.widget.BaseAdapter;
  17 +import android.widget.ImageButton;
  18 +import android.widget.ListView;
  19 +import android.widget.TextView;
  20 +
  21 +import com.sunvote.util.LogUtil;
  22 +import com.sunvote.xpadapp.MainActivity;
  23 +import com.sunvote.xpadapp.R;
  24 +import com.sunvote.xpadapp.base.BaseFragment;
  25 +import com.sunvote.xpadapp.base.TextViewUtils;
  26 +import com.sunvote.xpadapp.db.modal.BillInfo;
  27 +import com.sunvote.xpadapp.db.modal.MultiTitleItem;
  28 +import com.sunvote.xpadcomm.XPadApiInterface;
  29 +import com.ycanfunc.util.StringUtils;
  30 +
  31 +import java.io.UnsupportedEncodingException;
  32 +import java.util.ArrayList;
  33 +
  34 +import static com.sunvote.xpadapp.utils.MyStringUtil.replaceBlank;
  35 +
  36 +public class ResultElectionCustomFragment extends BaseFragment {
  37 +
  38 + public byte[] data;
  39 + public BillInfo bill;
  40 + public XPadApiInterface.VoteInfo voteInfo;
  41 + String TAG = "ResultMultiVoteFragment";
  42 +
  43 + public ArrayList<BillInfo> subInfo;
  44 + String[] options;
  45 +
  46 + private ArrayList<ListItem> aryContent = null;
  47 +
  48 + private TextView tvTitle;
  49 + private TextView titleAbstain;
  50 + private TextView titleUnvote;
  51 + private TextView titleResult;
  52 +
  53 + private ListView listview;
  54 + private MyAdapter mAdapter;
  55 + private int resultBits;
  56 +
  57 + int fenmu;
  58 + int yindao;
  59 + int shidao;
  60 +
  61 + @SuppressLint("NewApi")
  62 + @Override
  63 + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
  64 + LogUtil.d(TAG, "onCreateView");
  65 + View view = inflater.inflate(R.layout.fragment_result_multi_vote, container, false);
  66 + final MainActivity mact = (MainActivity) getActivity();
  67 +
  68 + view.setOnClickListener(new OnClickListener() {
  69 + @Override
  70 + public void onClick(View v) {
  71 + ;
  72 + }
  73 + });
  74 +
  75 + listview = (ListView) view.findViewById(R.id.multi_vote_result_listview);
  76 + options = bill.billOptions.split("/");
  77 +
  78 + try {
  79 + initData();
  80 + }catch (Exception ex){ex.printStackTrace();}
  81 +
  82 + mAdapter = new MyAdapter(getActivity());
  83 + listview.setAdapter(mAdapter);
  84 +
  85 + tvTitle = (TextView) view.findViewById(R.id.multi_vote_result_tv_title);
  86 + if (bill != null) {
  87 + tvTitle.setText( replaceBlank(bill.title));
  88 + }
  89 +
  90 + titleAbstain = (TextView) view.findViewById(R.id.multi_vote_result_title_abstan);
  91 + titleUnvote = (TextView) view.findViewById(R.id.multi_vote_result_title_unvote);
  92 + titleResult = (TextView) view.findViewById(R.id.multi_vote_result_title_result);
  93 +
  94 + if (resultBits == 0xffff) {
  95 + titleResult.setVisibility(View.GONE);
  96 + } else {
  97 + titleResult.setVisibility(View.VISIBLE);
  98 + }
  99 + if (options.length == 2) {
  100 + titleAbstain.setVisibility(View.GONE);
  101 + } else {
  102 + titleAbstain.setVisibility(View.VISIBLE);
  103 + }
  104 + TextView tvYindao = (TextView) view.findViewById(R.id.multi_vote_result_yindao);
  105 + TextView tvShidao = (TextView) view.findViewById(R.id.multi_vote_result_shidao);
  106 + if (yindao == 0xff || yindao == 0xffff) {
  107 + tvYindao.setVisibility(View.GONE);
  108 + } else {
  109 + tvYindao.setText("" + + yindao);
  110 + tvYindao.setVisibility(View.VISIBLE);
  111 + }
  112 +
  113 + if (shidao == 0xff || shidao == 0xffff) {
  114 + tvShidao.setVisibility(View.GONE);
  115 + } else {
  116 + tvShidao.setText("" + shidao);
  117 + tvShidao.setVisibility(View.VISIBLE);
  118 + }
  119 +
  120 + return view;
  121 + }
  122 +
  123 + private void initData() {
  124 +
  125 + int bitNum = data[2] & 0xf;
  126 + int digiters = data[2] >> 4 & 0xf;
  127 + int voteNo = data[3] & 0xff;
  128 + int startNo = ((data[4] & 0xff) << 8) | (data[5] & 0xff) ;
  129 + int endNo = ((data[6] & 0xff) << 8) | (data[7] & 0xff) ;
  130 + int rH = data[8] & 0xff;
  131 + int rL = data[9] & 0xff;
  132 + resultBits = rH << 8 | rL;
  133 +
  134 + // resultBits = ((data[8] << 8) | data[9]) & 0xff;
  135 +
  136 + // Log.d(TAG, "data len:" + data.length);
  137 + // Toast.makeText(mMainActivity, "data len:" + data.length,
  138 + // Toast.LENGTH_LONG).show();
  139 + subInfo = mMainActivity.dbm.getSubBillItems(mMainActivity.meetingId, bill.billId);
  140 + aryContent = new ArrayList<ListItem>();
  141 +
  142 + if (bitNum == 0) {
  143 + // 0 单字节数值（数值范围0-254） 现按一次最多显示5个事项
  144 + fenmu = data[10] & 0xff;
  145 + yindao = data[11] & 0xff;
  146 + shidao = data[12] & 0xff;
  147 + int pos = 13;
  148 + for (int i = startNo; i <= endNo; i++) {
  149 + ListItem it = new ListItem();
  150 + it.No = i;
  151 + it.title = getTitle(i);
  152 + it.agree = data[pos++] & 0xff;
  153 + it.oppose = data[pos++] & 0xff;
  154 + if (pos == data.length - 1) {
  155 + aryContent.add(it);
  156 + break;
  157 + }
  158 + if (options.length == 3) {
  159 + it.abstain = data[pos++] & 0xff;
  160 + }
  161 + if (pos == data.length - 1) {
  162 + aryContent.add(it);
  163 + break;
  164 + }
  165 + it.unvote = data[pos++] & 0xff;
  166 + if (resultBits == 0xffff) {
  167 +// it.pass = data[pos++] & 0xff;
  168 + it.pass = 0xffff;
  169 + } else {
  170 + int moveBits = 15 - (i - startNo);
  171 + it.pass = (resultBits >> moveBits) & 1;
  172 + }
  173 + aryContent.add(it);
  174 + }
  175 + } else if(bitNum == 1){
  176 + // 1 双字节数值（数值范围0-65534） 现按一次最多显示5个事项
  177 + fenmu = (data[10] << 8 | data[11]) & 0xffff;
  178 + yindao = (data[12] << 8 | data[13]) & 0xffff;
  179 + shidao = (data[14] << 8 | data[15]) & 0xffff;
  180 + int pos = 16;
  181 + for (int i = startNo; i <= endNo; i++) {
  182 + ListItem it = new ListItem();
  183 + it.No = i;
  184 + it.title = getTitle(i);
  185 + it.agree = (data[pos++] << 8 | data[pos++]) & 0xffff;
  186 + it.oppose = (data[pos++] << 8 | data[pos++]) & 0xffff;
  187 + if (options.length == 3) {
  188 + it.abstain = (data[pos++] << 8 | data[pos++]) & 0xffff;
  189 + }
  190 + it.unvote = (data[pos++] << 8 | data[pos++]) & 0xffff;
  191 + if (resultBits == 0xffff) {
  192 + it.pass = 0xffff;
  193 + } else {
  194 + int moveBits = 15 - (i - startNo);
  195 + it.pass = (resultBits >> moveBits) & 1;
  196 + }
  197 + aryContent.add(it);
  198 + }
  199 + }else if(bitNum == 2){
  200 + // 0 单字节数值（数值范围0-254） 现按一次最多显示5个事项
  201 + fenmu = data[10] & 0xff;
  202 + yindao = data[11] & 0xff;
  203 + shidao = data[12] & 0xff;
  204 + int pos = 13;
  205 + for (int i = startNo; i <= endNo; i++) {
  206 + ListItem it = new ListItem();
  207 + it.No = data[pos++] & 0xff;
  208 + it.title = getTitle(it.No);
  209 + it.agree = data[pos++] & 0xff;
  210 + it.oppose = data[pos++] & 0xff;
  211 + if (pos == data.length - 1) {
  212 + aryContent.add(it);
  213 + break;
  214 + }
  215 + if (options.length == 3) {
  216 + it.abstain = data[pos++] & 0xff;
  217 + }
  218 + if (pos == data.length - 1) {
  219 + aryContent.add(it);
  220 + break;
  221 + }
  222 + it.unvote = data[pos++] & 0xff;
  223 + if (resultBits == 0xffff) {
  224 + it.pass = 0xffff;
  225 + } else {
  226 + int moveBits = 15 - (i - startNo);
  227 + it.pass = (resultBits >> moveBits) & 1;
  228 + }
  229 + aryContent.add(it);
  230 + }
  231 + }else if(bitNum == 3){
  232 + // 双字节数值制定表决事项编号（数值范围0-65534）现按一次最多显示5个事项
  233 + // 单字节数值制定表决事项编号（数值范围0-254）现按一次最多显示5个事项
  234 + // 1 双字节数值（数值范围0-65534） 现按一次最多显示5个事项
  235 + fenmu = (data[10] << 8 | data[11]) & 0xffff;
  236 + yindao = (data[12] << 8 | data[13]) & 0xffff;
  237 + shidao = (data[14] << 8 | data[15]) & 0xffff;
  238 + int pos = 16;
  239 + for (int i = startNo; i <= endNo; i++) {
  240 + ListItem it = new ListItem();
  241 + it.No = (data[pos++] << 8 | data[pos++]) & 0xffff;
  242 + it.title = getTitle(it.No);
  243 + it.agree = (data[pos++] << 8 | data[pos++]) & 0xffff;
  244 + it.oppose = (data[pos++] << 8 | data[pos++]) & 0xffff;
  245 + if (options.length == 3) {
  246 + it.abstain = (data[pos++] << 8 | data[pos++]) & 0xffff;
  247 + }
  248 + it.unvote = (data[pos++] << 8 | data[pos++]) & 0xffff;
  249 + if (resultBits == 0xffff) {
  250 + it.pass = 0xffff;
  251 + } else {
  252 + int moveBits = 15 - (i - startNo);
  253 + it.pass = (resultBits >> moveBits) & 1;
  254 + }
  255 + aryContent.add(it);
  256 + }
  257 + }
  258 +
  259 + }
  260 +
  261 + private String getTitle(int billNo) {
  262 + for (int i = 0; i < subInfo.size(); i++) {
  263 + BillInfo subItem = subInfo.get(i);
  264 + if (subItem.billNo == billNo) {
  265 + return subItem.title;
  266 + }
  267 + }
  268 + return "";
  269 + }
  270 +
  271 + public class ListItem {
  272 + int No;
  273 + String title;
  274 + int agree;
  275 + int oppose;
  276 + int abstain;
  277 + int unvote;
  278 + int pass;
  279 + }
  280 +
  281 + /*
  282 + * MyAdapter
  283 + *
  284 + */
  285 + private class MyAdapter extends BaseAdapter {
  286 +
  287 + private LayoutInflater mInflater;
  288 +
  289 + public MyAdapter(Context context) {
  290 + this.mInflater = LayoutInflater.from(context);
  291 + }
  292 +
  293 + @Override
  294 + public int getCount() {
  295 + // TODO Auto-generated method stub
  296 + return aryContent.size();
  297 + }
  298 +
  299 + @Override
  300 + public Object getItem(int position) {
  301 + // TODO Auto-generated method stub
  302 + return aryContent.get(position);
  303 + }
  304 +
  305 + @Override
  306 + public long getItemId(int position) {
  307 + // TODO Auto-generated method stub
  308 + return position;
  309 + }
  310 +
  311 + @Override
  312 + public boolean isEnabled(int position) {
  313 + // TODO Auto-generated method stub
  314 +
  315 + return super.isEnabled(position);
  316 + }
  317 +
  318 + @Override
  319 + public View getView(final int position, View convertView, ViewGroup parent) {
  320 + ViewHolder holder;
  321 + LogUtil.v("BaseAdapterTest", "getView " + position + " " + convertView);
  322 +
  323 + if (convertView == null) {
  324 + convertView = mInflater.inflate(R.layout.list_multi_vote_result_item, null);
  325 + holder = new ViewHolder();
  326 +
  327 + holder.tvNum = (TextView) convertView.findViewById(R.id.list_multi_result_item_num);
  328 + holder.tvTitle = (TextView) convertView.findViewById(R.id.list_multi_result_item_name);
  329 + holder.tvAgree = (TextView) convertView.findViewById(R.id.list_multi_result_item_agree);
  330 + holder.tvOppose = (TextView) convertView.findViewById(R.id.list_multi_result_item_oppose);
  331 + holder.tvAbstain = (TextView) convertView.findViewById(R.id.list_multi_result_item_abstan);
  332 + holder.tvUnvote = (TextView) convertView.findViewById(R.id.list_multi_result_item_unvote);
  333 + holder.tvResult = (TextView) convertView.findViewById(R.id.list_multi_result_item_result);
  334 +
  335 + convertView.setTag(holder);
  336 + } else {
  337 + holder = (ViewHolder) convertView.getTag();
  338 + }
  339 +
  340 +
  341 +
  342 + ListItem it = aryContent.get(position);
  343 + holder.tvNum.setText(String.valueOf(it.No));
  344 + holder.tvTitle.setText(it.title);
  345 +
  346 +
  347 + holder.tvOppose.setText(String.valueOf(it.oppose));
  348 + holder.tvAbstain.setText(String.valueOf(it.abstain));
  349 + if(it.agree != 0xff && it.agree != 0xffff){
  350 + holder.tvAgree.setVisibility(View.VISIBLE);
  351 + holder.tvAgree.setText(String.valueOf(it.agree));
  352 + }else{
  353 + holder.tvAgree.setVisibility(View.INVISIBLE);
  354 + holder.tvAgree.setText("");
  355 + }
  356 + if(it.oppose != 0xff && it.oppose != 0xffff){
  357 + holder.tvOppose.setVisibility(View.VISIBLE);
  358 + holder.tvOppose.setText(String.valueOf(it.oppose));
  359 + }else{
  360 + holder.tvOppose.setVisibility(View.INVISIBLE);
  361 + holder.tvOppose.setText("");
  362 + }
  363 + if(it.abstain != 0xff && it.abstain != 0xffff){
  364 + holder.tvAbstain.setVisibility(View.VISIBLE);
  365 + holder.tvAbstain.setText(String.valueOf(it.abstain));
  366 + }else{
  367 + holder.tvAbstain.setVisibility(View.INVISIBLE);
  368 + holder.tvAbstain.setText("");
  369 + }
  370 +
  371 + if (it.unvote != 0xff && it.unvote != 0xffff) {
  372 + titleUnvote.setVisibility(View.VISIBLE);
  373 + holder.tvUnvote.setVisibility(View.VISIBLE);
  374 + holder.tvUnvote.setText(String.valueOf(it.unvote));
  375 + } else {
  376 + titleUnvote.setVisibility(View.INVISIBLE);
  377 + holder.tvUnvote.setVisibility(View.INVISIBLE);
  378 + holder.tvUnvote.setText("");
  379 +
  380 + }
  381 +
  382 + String strPass = "";
  383 +
  384 + if (it.pass == 0) {
  385 + strPass = getString(R.string.no_pass);
  386 + } else if (it.pass == 1) {
  387 + strPass = getString(R.string.pass);
  388 + }
  389 +
  390 + holder.tvResult.setText(strPass);
  391 + if (it.pass == 0xffff) {
  392 + holder.tvResult.setVisibility(View.GONE);
  393 + } else {
  394 + holder.tvResult.setVisibility(View.VISIBLE);
  395 + }
  396 +
  397 + if (options.length == 2) {
  398 + holder.tvAbstain.setVisibility(View.GONE);
  399 +
  400 + } else {
  401 + holder.tvAbstain.setVisibility(View.VISIBLE);
  402 + }
  403 +
  404 + return convertView;
  405 + }
  406 +
  407 +
  408 + public final class ViewHolder {
  409 + public TextView tvNum;
  410 + public TextView tvTitle;
  411 + public TextView tvAgree;
  412 + public TextView tvOppose;
  413 + public TextView tvAbstain;
  414 + public TextView tvUnvote;
  415 + public TextView tvResult;
  416 + }
  417 + }
  418 +}
... ...
C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultElectionFragment.java
  View file @0345eb5
... ... @@ -374,7 +374,6 @@ public class ResultElectionFragment extends BaseFragment {
374 374 holder = new ViewHolder();
375 375 holder.tvNum = (TextView) convertView.findViewById(R.id.item_result_election_num);
376 376 holder.tvName = (TextView) convertView.findViewById(R.id.item_result_election_name);
377   - holder.tvVote = (TextView) convertView.findViewById(R.id.item_result_election_agree);
378 377 holder.tvAgree = (TextView) convertView.findViewById(R.id.item_result_election_agree);
379 378 holder.tvOppose = (TextView) convertView.findViewById(R.id.item_result_election_oppose_num);
380 379 holder.tvAbstant = (TextView) convertView.findViewById(R.id.item_result_election_abstant_num);
... ... @@ -414,9 +413,9 @@ public class ResultElectionFragment extends BaseFragment {
414 413 int width = metrics.widthPixels/5-80;
415 414 if(!TextUtils.isEmpty(it.name)){
416 415 TextViewUtils.adjustTvTextSize(holder.tvName,width,it.name);
417   - }
  416 + }
418 417 holder.tvName.setText(it.name);
419   - holder.tvName.setGravity(Gravity.CENTER_VERTICAL);
  418 + //holder.tvName.setGravity(Gravity.CENTER_VERTICAL);
420 419 holder.tvAgree.setText(String.valueOf(it.agreeNum));
421 420 holder.tvOppose.setText(String.valueOf(it.opposeNum));
422 421 holder.tvAbstant.setText(String.valueOf(it.abstantNum));
... ... @@ -430,13 +429,16 @@ public class ResultElectionFragment extends BaseFragment {
430 429 holder.tvResult.setText(getString(R.string.pass));
431 430 }
432 431 }
  432 +
  433 + if (position % 2 == 0) {
  434 + convertView.setBackgroundColor(getResources().getColor(R.color.blue2));
  435 + }
433 436 return convertView;
434 437 }
435 438  
436 439 public final class ViewHolder {
437 440 public TextView tvNum;
438 441 public TextView tvName;
439   - public TextView tvVote;
440 442 public TextView tvAgree;
441 443 public TextView tvOppose;
442 444 public TextView tvAbstant;
... ...
C5/app/src/main/res/drawable/ic_btn_oo.xml 0 → 100644
  View file @0345eb5
  1 +<vector android:height="24dp" android:viewportHeight="78"
  2 + android:viewportWidth="78" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
  3 + <path android:fillColor="#DFDFDF" android:pathData="M39,78C17.5,78 0,60.5 0,39S17.5,0 39,0s39,17.5 39,39S60.5,78 39,78zM39,10c-16,0 -29,13 -29,29s13,29 29,29s29,-13 29,-29S55,10 39,10z"/>
  4 +</vector>
... ...
C5/app/src/main/res/drawable/ic_btn_oo_s.xml 0 → 100644
  View file @0345eb5
  1 +<vector android:height="24dp" android:viewportHeight="78"
  2 + android:viewportWidth="78" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
  3 + <path android:fillColor="#9AC243" android:pathData="M39,78C17.5,78 0,60.5 0,39S17.5,0 39,0s39,17.5 39,39S60.5,78 39,78zM39,10c-16,0 -29,13 -29,29s13,29 29,29s29,-13 29,-29S55,10 39,10z"/>
  4 +</vector>
... ...
C5/app/src/main/res/drawable/ic_btn_xx.xml 0 → 100644
  View file @0345eb5
  1 +<vector android:height="24dp" android:viewportHeight="182.5"
  2 + android:viewportWidth="182.6" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
  3 + <path android:fillColor="#DFDFDF" android:pathData="M177.7,177.6c-6.5,6.5 -17,6.5 -23.5,0L5,28.5c-6.5,-6.5 -6.5,-17 0,-23.5c6.5,-6.5 17,-6.5 23.6,0L177.7,154C184.2,160.6 184.2,171.1 177.7,177.6L177.7,177.6zM177.5,28.4L28.4,177.5c-6.5,6.5 -17.1,6.5 -23.6,0c-6.5,-6.5 -6.5,-17 0,-23.5L154,4.9c6.5,-6.5 17.1,-6.5 23.5,0C184.1,11.4 184,21.9 177.5,28.4L177.5,28.4zM177.5,28.4"/>
  4 +</vector>
... ...
C5/app/src/main/res/drawable/ic_btn_xx_s.xml 0 → 100644
  View file @0345eb5
  1 +<vector android:height="24dp" android:viewportHeight="182.5"
  2 + android:viewportWidth="182.6" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
  3 + <path android:fillColor="#D31A1A" android:pathData="M177.7,177.6c-6.5,6.5 -17,6.5 -23.5,0L5,28.5c-6.5,-6.5 -6.5,-17 0,-23.5c6.5,-6.5 17,-6.5 23.6,0L177.7,154C184.2,160.6 184.2,171.1 177.7,177.6L177.7,177.6zM177.5,28.4L28.4,177.5c-6.5,6.5 -17.1,6.5 -23.6,0c-6.5,-6.5 -6.5,-17 0,-23.5L154,4.9c6.5,-6.5 17.1,-6.5 23.5,0C184.1,11.4 184,21.9 177.5,28.4L177.5,28.4zM177.5,28.4"/>
  4 +</vector>
... ...
C5/app/src/main/res/drawable/ic_delete.xml 0 → 100644
  View file @0345eb5
  1 +<vector android:height="24dp" android:viewportHeight="182.1"
  2 + android:viewportWidth="168.8" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
  3 + <path android:fillColor="#ABABAB" android:pathData="M69.5,142.3v-50c0,-3.9 -3.2,-7.1 -7.1,-7.1s-7.1,3.2 -7.1,7.1v50c0,3.9 3.2,7.1 7.1,7.1S69.5,146.2 69.5,142.3L69.5,142.3zM113,142.3v-50c-0.6,-3.9 -3.9,-6.5 -7.8,-6.5c-3.2,0 -5.8,3.2 -6.5,6.5v50c0.6,3.9 3.9,6.5 7.8,6.5C109.7,148.8 112.3,145.6 113,142.3L113,142.3zM161.7,33.9h-36.4V21.5c0,-12.3 -9.7,-21.4 -22.1,-21.4H63c-11.7,0 -21.4,9.7 -21.4,21.4v12.3H7.1C3.2,33.9 0,37.1 0,41c0,3.9 3.2,7.1 7.1,7.1h154.5c3.9,0 7.1,-3.2 7.1,-7.1C168.8,37.1 165.6,33.9 161.7,33.9L161.7,33.9zM111,33.9H55.2V21.5c0,-4.5 3.2,-7.8 7.8,-7.8h40.3c4.5,0 7.8,3.2 7.8,7.8V33.9zM111,33.9"/>
  4 + <path android:fillColor="#ABABAB" android:pathData="M148.7,58.6c-3.9,0 -7.1,2.6 -7.1,6.5v94.2c0,5.2 -4.5,9.1 -9.7,9.1H37c-5.2,0 -9.7,-3.9 -9.7,-9.1V65c0,-3.9 -3.2,-6.5 -7.1,-6.5c-3.9,0 -7.1,2.6 -7.1,6.5v94.2c0.6,13 11,22.7 24,22.7h95.5c13,0 23.4,-9.7 23.4,-22.7V65C155.8,61.2 152.6,58.6 148.7,58.6L148.7,58.6zM148.7,58.6"/>
  5 +</vector>
... ...
C5/app/src/main/res/drawable/ic_gray_selected.xml 0 → 100644
  View file @0345eb5
  1 +<vector android:height="24dp" android:viewportHeight="199.9"
  2 + android:viewportWidth="201.7" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
  3 + <path android:fillColor="#CCCCCC" android:pathData="M83.2,136.7l-32.9,-32.9c-4,-4 -10.4,-4 -14.4,0c-4,4 -4,10.4 0,14.4L71.7,154c3.4,3.4 8,5.3 12.8,5.3c4.9,0 9.6,-1.9 13.1,-5.4l95,-94.9c2.6,-2.6 3.6,-6.3 2.7,-9.8c-0.9,-3.5 -3.7,-6.3 -7.2,-7.2c-3.5,-0.9 -7.3,0 -9.8,2.6l-92.1,92.1C85.3,137.5 84,137.5 83.2,136.7L83.2,136.7zM83.2,136.7"/>
  4 + <path android:fillColor="#CCCCCC" android:pathData="M190.7,98.8c-5.5,0 -11,4.6 -11,10.2v57.4c0,7.8 -5.9,15.2 -13.9,15.2h-131c-7.9,0 -16.5,-7.3 -16.5,-15.2V35.3c0,-7.9 8.5,-15.1 16.5,-15.1h90c2.7,0 5.3,-1 7.2,-2.9c1.9,-1.9 3,-4.5 3,-7.2C135,4.5 130.4,0 124.8,0h-90C15.5,0.3 0,16 0,35.3v131.1c0,19.1 15.7,33.5 34.8,33.5h131c19.1,0 35.9,-14.4 35.9,-33.5V109C201.7,103.3 196.3,98.8 190.7,98.8L190.7,98.8zM190.7,98.8"/>
  5 +</vector>
... ...
C5/app/src/main/res/drawable/ic_green_selected.xml 0 → 100644
  View file @0345eb5
  1 +<vector android:height="24dp" android:viewportHeight="199.9"
  2 + android:viewportWidth="201.7" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
  3 + <path android:fillColor="#95BA46" android:pathData="M83.2,136.7l-32.9,-32.9c-4,-4 -10.4,-4 -14.4,0c-4,4 -4,10.4 0,14.4L71.7,154c3.4,3.4 8,5.3 12.8,5.3c4.9,0 9.6,-1.9 13.1,-5.4l95,-94.9c2.6,-2.6 3.6,-6.3 2.7,-9.8c-0.9,-3.5 -3.7,-6.3 -7.2,-7.2c-3.5,-0.9 -7.3,0 -9.8,2.6l-92.1,92.1C85.3,137.5 84,137.5 83.2,136.7L83.2,136.7zM83.2,136.7"/>
  4 + <path android:fillColor="#95BA46" android:pathData="M190.7,98.8c-5.5,0 -11,4.6 -11,10.2v57.4c0,7.8 -5.9,15.2 -13.9,15.2h-131c-7.9,0 -16.5,-7.3 -16.5,-15.2V35.3c0,-7.9 8.5,-15.1 16.5,-15.1h90c2.7,0 5.3,-1 7.2,-2.9c1.9,-1.9 3,-4.5 3,-7.2C135,4.5 130.4,0 124.8,0h-90C15.5,0.3 0,16 0,35.3v131.1c0,19.1 15.7,33.5 34.8,33.5h131c19.1,0 35.9,-14.4 35.9,-33.5V109C201.7,103.3 196.3,98.8 190.7,98.8L190.7,98.8zM190.7,98.8"/>
  5 +</vector>
... ...
C5/app/src/main/res/drawable/oo_selector.xml
  View file @0345eb5
... ... @@ -2,32 +2,33 @@
2 2 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
3 3  
4 4 <item android:state_checked="true" android:state_window_focused="false"
5   - android:drawable="@drawable/btn_oo_s" />
  5 + android:drawable="@drawable/ic_btn_oo_s" />
6 6 <item android:state_checked="false" android:state_window_focused="false"
7   - android:drawable="@drawable/btn_oo" />
  7 + android:drawable="@drawable/ic_btn_oo" />
8 8  
9 9 <item android:state_checked="true" android:state_window_focused="true"
10   - android:drawable="@drawable/btn_oo_s" />
  10 + android:drawable="@drawable/ic_btn_oo_s" />
11 11 <item android:state_checked="false" android:state_window_focused="true"
12   - android:drawable="@drawable/btn_oo" />
  12 + android:drawable="@drawable/ic_btn_oo" />
13 13  
14 14 <item android:state_checked="true" android:state_pressed="true"
15   - android:drawable="@drawable/btn_oo_s" />
  15 + android:drawable="@drawable/ic_btn_oo_s" />
16 16 <item android:state_checked="false" android:state_pressed="true"
17   - android:drawable="@drawable/btn_oo" />
  17 + android:drawable="@drawable/ic_btn_oo" />
18 18  
19 19 <item android:state_checked="true" android:state_focused="true"
20   - android:drawable="@drawable/btn_oo_s" />
  20 + android:drawable="@drawable/ic_btn_oo_s" />
21 21 <item android:state_checked="false" android:state_focused="true"
22   - android:drawable="@drawable/btn_oo" />
  22 + android:drawable="@drawable/ic_btn_oo" />
23 23  
24 24 <item android:state_checked="true" android:state_focused="false"
25   - android:drawable="@drawable/btn_oo_s" />
  25 + android:drawable="@drawable/ic_btn_oo_s" />
26 26 <item android:state_checked="false" android:state_focused="false"
27   - android:drawable="@drawable/btn_oo" />
28   -
29   - <item android:state_checked="false" android:drawable="@drawable/btn_oo" />
30   - <item android:state_checked="true" android:drawable="@drawable/btn_oo_s" />
  27 + android:drawable="@drawable/ic_btn_oo" />
  28 +
  29 +
  30 + <item android:state_checked="false" android:drawable="@drawable/ic_btn_oo" />
  31 + <item android:state_checked="true" android:drawable="@drawable/ic_btn_oo_s" />
31 32  
32 33  
33 34  
... ...
C5/app/src/main/res/drawable/selected_selector.xml 0 → 100644
  View file @0345eb5
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<selector xmlns:android="http://schemas.android.com/apk/res/android" >
  3 +
  4 + <item android:state_checked="true" android:state_window_focused="false"
  5 + android:drawable="@drawable/ic_green_selected" />
  6 + <item android:state_checked="false" android:state_window_focused="false"
  7 + android:drawable="@drawable/ic_gray_selected" />
  8 +
  9 + <item android:state_checked="true" android:state_window_focused="true"
  10 + android:drawable="@drawable/ic_green_selected" />
  11 + <item android:state_checked="false" android:state_window_focused="true"
  12 + android:drawable="@drawable/ic_gray_selected" />
  13 +
  14 + <item android:state_checked="true" android:state_pressed="true"
  15 + android:drawable="@drawable/ic_green_selected" />
  16 + <item android:state_checked="false" android:state_pressed="true"
  17 + android:drawable="@drawable/ic_gray_selected" />
  18 +
  19 + <item android:state_checked="true" android:state_focused="true"
  20 + android:drawable="@drawable/ic_green_selected" />
  21 + <item android:state_checked="false" android:state_focused="true"
  22 + android:drawable="@drawable/ic_gray_selected" />
  23 +
  24 + <item android:state_checked="true" android:state_focused="false"
  25 + android:drawable="@drawable/ic_green_selected" />
  26 + <item android:state_checked="false" android:state_focused="false"
  27 + android:drawable="@drawable/ic_gray_selected" />
  28 +
  29 + <item android:state_checked="false" android:drawable="@drawable/ic_gray_selected" />
  30 + <item android:state_checked="true" android:drawable="@drawable/ic_green_selected" />
  31 +
  32 +
  33 +
  34 +
  35 +
  36 +
  37 +</selector>
... ...
C5/app/src/main/res/drawable/xx_selector.xml
  View file @0345eb5
... ... @@ -3,32 +3,32 @@
3 3  
4 4  
5 5 <item android:state_checked="true" android:state_window_focused="false"
6   - android:drawable="@drawable/btn_xx_s" />
  6 + android:drawable="@drawable/ic_btn_xx_s" />
7 7 <item android:state_checked="false" android:state_window_focused="false"
8   - android:drawable="@drawable/btn_xx" />
  8 + android:drawable="@drawable/ic_btn_xx" />
9 9  
10 10 <item android:state_checked="true" android:state_window_focused="true"
11   - android:drawable="@drawable/btn_xx_s" />
  11 + android:drawable="@drawable/ic_btn_xx_s" />
12 12 <item android:state_checked="false" android:state_window_focused="true"
13   - android:drawable="@drawable/btn_xx" />
  13 + android:drawable="@drawable/ic_btn_xx" />
14 14  
15 15 <item android:state_checked="true" android:state_pressed="true"
16   - android:drawable="@drawable/btn_xx_s" />
  16 + android:drawable="@drawable/ic_btn_xx_s" />
17 17 <item android:state_checked="false" android:state_pressed="true"
18   - android:drawable="@drawable/btn_xx" />
  18 + android:drawable="@drawable/ic_btn_xx" />
19 19  
20 20 <item android:state_checked="true" android:state_focused="true"
21   - android:drawable="@drawable/btn_xx_s" />
  21 + android:drawable="@drawable/ic_btn_xx_s" />
22 22 <item android:state_checked="false" android:state_focused="true"
23   - android:drawable="@drawable/btn_xx" />
  23 + android:drawable="@drawable/ic_btn_xx" />
24 24  
25 25 <item android:state_checked="true" android:state_focused="false"
26   - android:drawable="@drawable/btn_xx_s" />
  26 + android:drawable="@drawable/ic_btn_xx_s" />
27 27 <item android:state_checked="false" android:state_focused="false"
28   - android:drawable="@drawable/btn_xx" />
  28 + android:drawable="@drawable/ic_btn_xx" />
29 29  
30   - <item android:state_checked="false" android:drawable="@drawable/btn_xx" />
31   - <item android:state_checked="true" android:drawable="@drawable/btn_xx_s" />
  30 + <item android:state_checked="false" android:drawable="@drawable/ic_btn_xx" />
  31 + <item android:state_checked="true" android:drawable="@drawable/ic_btn_xx_s" />
32 32  
33 33  
34 34  
... ...
C5/app/src/main/res/layout/dialog_service.xml
  View file @0345eb5
... ... @@ -12,6 +12,33 @@
12 12 android:textStyle="bold"
13 13 android:textSize="18sp"/>
14 14 <LinearLayout
  15 + android:id="@+id/button_line"
  16 + android:layout_width="530dp"
  17 + android:layout_height="40dp"
  18 + android:layout_alignParentBottom="true"
  19 + android:orientation="horizontal">
  20 +
  21 + <View
  22 + android:layout_width="0dp"
  23 + android:layout_height="wrap_content"
  24 + android:layout_weight="1" />
  25 +
  26 + <Button
  27 + android:id="@+id/cancel"
  28 + android:layout_width="100dp"
  29 + android:layout_height="match_parent"
  30 + android:layout_marginRight="10dp"
  31 + android:visibility="invisible"
  32 + android:text="@string/cancel" />
  33 +
  34 + <Button
  35 + android:id="@+id/submit"
  36 + android:layout_width="100dp"
  37 + android:layout_height="match_parent"
  38 + android:layout_marginRight="10dp"
  39 + android:text="@string/ok" />
  40 + </LinearLayout>
  41 + <LinearLayout
15 42 android:layout_width="530dp"
16 43 android:layout_height="250dp"
17 44 android:layout_marginTop="10dp"
... ... @@ -213,31 +240,4 @@
213 240 android:layout_weight="1"></LinearLayout>
214 241 </LinearLayout>
215 242 </LinearLayout>
216   - <LinearLayout
217   - android:id="@+id/button_line"
218   - android:layout_width="530dp"
219   - android:layout_height="40dp"
220   - android:layout_alignParentBottom="true"
221   - android:orientation="horizontal">
222   -
223   - <View
224   - android:layout_width="0dp"
225   - android:layout_height="wrap_content"
226   - android:layout_weight="1" />
227   -
228   - <Button
229   - android:id="@+id/cancel"
230   - android:layout_width="100dp"
231   - android:layout_height="match_parent"
232   - android:layout_marginRight="10dp"
233   - android:visibility="invisible"
234   - android:text="@string/cancel" />
235   -
236   - <Button
237   - android:id="@+id/submit"
238   - android:layout_width="100dp"
239   - android:layout_height="match_parent"
240   - android:layout_marginRight="10dp"
241   - android:text="@string/ok" />
242   - </LinearLayout>
243 243 </LinearLayout>
... ...
C5/app/src/main/res/layout/fragment_custom_election.xml
  View file @0345eb5
... ... @@ -9,7 +9,7 @@
9 9 android:id="@+id/line_panel"
10 10 android:layout_width="match_parent"
11 11 android:layout_height="wrap_content"
12   - android:background="@color/red"
  12 + android:background="@color/red2"
13 13 android:orientation="horizontal"
14 14 android:paddingBottom="20dp"
15 15 android:paddingLeft="20dp"
... ... @@ -22,18 +22,21 @@
22 22 android:layout_height="wrap_content"
23 23 android:layout_weight="1"
24 24 android:ellipsize="end"
  25 + android:textStyle="bold"
25 26 android:lines="1"
26 27 android:text="票决民生实事项目"
27 28 android:textColor="@color/white"
28   - android:textSize="@dimen/big_text_p4" />
  29 + android:textSize="@dimen/px60dp" />
29 30  
30 31 <TextView
31 32 android:id="@+id/title_info"
32 33 android:layout_width="wrap_content"
33 34 android:layout_height="wrap_content"
34 35 android:text=""
  36 + android:textStyle="bold"
35 37 android:layout_marginRight="20dp"
36   - android:textSize="@dimen/big_text_p5" />
  38 + android:textColor="@color/white"
  39 + android:textSize="@dimen/px40dp" />
37 40  
38 41 </LinearLayout>
39 42  
... ... @@ -51,9 +54,10 @@
51 54 android:layout_alignParentLeft="true"
52 55 android:layout_centerVertical="true"
53 56 android:gravity="center"
  57 + android:textStyle="bold"
54 58 android:text="序号"
55 59 android:textColor="@color/gray"
56   - android:textSize="@dimen/big_text_p5" />
  60 + android:textSize="@dimen/px40dp" />
57 61  
58 62 <!-- <View
59 63 android:id="@+id/view_line"
... ... @@ -64,14 +68,15 @@
64 68  
65 69 <TextView
66 70 android:id="@+id/tv_name"
67   - android:layout_width="400dp"
  71 + android:layout_width="@dimen/px1000dp"
68 72 android:layout_height="wrap_content"
69 73 android:layout_centerVertical="true"
70 74 android:layout_toRightOf="@id/tv_num"
71 75 android:gravity="center"
  76 + android:textStyle="bold"
72 77 android:text="项目"
73 78 android:textColor="@color/red"
74   - android:textSize="@dimen/big_text_p5" />
  79 + android:textSize="@dimen/px40dp" />
75 80  
76 81 <!-- <View
77 82 android:layout_width="2px"
... ... @@ -85,11 +90,12 @@
85 90 android:layout_height="wrap_content"
86 91 android:gravity="center"
87 92 android:layout_centerVertical="true"
  93 + android:textStyle="bold"
88 94 android:text="赞成"
89 95 android:textColor="@color/red"
90 96 android:layout_toRightOf="@id/tv_name"
91   - android:layout_marginLeft="50dp"
92   - android:textSize="@dimen/big_text_p5" />
  97 + android:layout_marginLeft="@dimen/px300dp"
  98 + android:textSize="@dimen/px40dp" />
93 99  
94 100 <TextView
95 101 android:id="@+id/tv_oppose"
... ... @@ -98,10 +104,11 @@
98 104 android:gravity="center"
99 105 android:layout_centerVertical="true"
100 106 android:text="反对"
  107 + android:visibility="gone"
101 108 android:textColor="@color/red"
102 109 android:layout_toRightOf="@id/tv_agree"
103 110 android:layout_marginLeft="40dp"
104   - android:textSize="@dimen/big_text_p5" />
  111 + android:textSize="@dimen/px40dp" />
105 112  
106 113 <TextView
107 114 android:id="@+id/tv_abstain"
... ... @@ -110,10 +117,11 @@
110 117 android:gravity="center"
111 118 android:layout_centerVertical="true"
112 119 android:text="弃权"
  120 + android:visibility="gone"
113 121 android:textColor="@color/red"
114 122 android:layout_toRightOf="@id/tv_oppose"
115 123 android:layout_marginLeft="40dp"
116   - android:textSize="@dimen/big_text_p5" />
  124 + android:textSize="@dimen/px40dp" />
117 125  
118 126 </RelativeLayout>
119 127  
... ... @@ -129,27 +137,28 @@
129 137  
130 138 <Button
131 139 android:id="@+id/election_btn_confirm"
132   - android:layout_width="wrap_content"
133   - android:layout_height="wrap_content"
  140 + android:layout_width="@dimen/px420dp"
  141 + android:layout_height="@dimen/px110dp"
134 142 android:layout_centerInParent="true"
135 143 android:background="@drawable/oppos_selector"
136 144 android:text="@string/confirm_submit"
137 145 android:textColor="@color/white"
138   - android:textSize="@dimen/big_text_p4"
  146 + android:textSize="@dimen/px60dp"
139 147 android:textStyle="bold" />
140 148  
141 149 <Button
142 150 android:id="@+id/election_btn_modify"
143   - android:layout_width="wrap_content"
144   - android:layout_height="wrap_content"
  151 + android:layout_width="@dimen/px420dp"
  152 + android:layout_height="@dimen/px110dp"
145 153 android:layout_centerInParent="true"
146   - android:background="@drawable/signin_selector"
  154 + android:background="@drawable/agree_selector"
147 155 android:text="@string/modify"
148 156 android:textColor="@color/white"
149   - android:textSize="@dimen/big_text_p4"
  157 + android:textSize="@dimen/px60dp"
150 158 android:textStyle="bold"
151 159 android:visibility="invisible" />
152 160  
  161 +
153 162 <TextView
154 163 android:id="@+id/tv_tip_info"
155 164 android:layout_width="wrap_content"
... ... @@ -181,6 +190,7 @@
181 190 android:layout_marginRight="20dp"
182 191 android:layout_marginTop="50dp"
183 192 android:background="@drawable/right_control"
  193 + android:visibility="gone"
184 194 android:orientation="vertical">
185 195  
186 196 <ImageView
... ... @@ -255,20 +265,42 @@
255 265 android:textStyle="bold" />
256 266 </RelativeLayout>
257 267  
258   - <TextView
259   - android:id="@+id/singlevote_tv_result"
260   - android:layout_width="wrap_content"
261   - android:layout_height="wrap_content"
262   - android:alpha="0.9"
263   - android:background="@drawable/voted_empty"
264   - android:gravity="center"
265   - android:rotation="-15"
266   - android:text=""
267   - android:textColor="#ddff9933"
268   - android:textSize="@dimen/big_text_p2"
269   - android:textStyle="bold"
270   - android:visibility="invisible"
271   - android:layout_centerInParent="true"
272   - android:layout_marginTop="40dp"
273   - android:layout_marginRight="40dp"/>
  268 +
  269 + <FrameLayout
  270 + android:id="@+id/result_layout"
  271 + android:layout_width="match_parent"
  272 + android:layout_height="match_parent"
  273 + android:layout_above="@+id/election_pannal_bottom"
  274 + android:visibility="gone"
  275 + android:gravity="center">
  276 +
  277 + <LinearLayout
  278 + android:layout_width="match_parent"
  279 + android:layout_height="match_parent"
  280 + android:background="@color/white"
  281 + android:alpha="0.4"
  282 + android:orientation="horizontal"/>
  283 +
  284 + <TextView
  285 + android:id="@+id/singlevote_tv_result"
  286 + android:layout_width="@dimen/px625dp"
  287 + android:layout_height="@dimen/px217dp"
  288 + android:layout_marginTop="@dimen/px100dp"
  289 + android:background="@drawable/voted"
  290 + android:layout_gravity="center"
  291 + android:textSize="@dimen/big_text_p2"
  292 + android:textStyle="bold"/>
  293 +
  294 + <TextView
  295 + android:id="@+id/submiting_tv"
  296 + android:layout_width="wrap_content"
  297 + android:layout_height="wrap_content"
  298 + android:layout_marginTop="@dimen/px100dp"
  299 + android:layout_gravity="center"
  300 + android:textColor="@color/red"
  301 + android:text="@string/submiting"
  302 + android:textSize="@dimen/px140dp"
  303 + android:visibility="gone"
  304 + android:textStyle="bold"/>
  305 + </FrameLayout>
274 306 </RelativeLayout>
275 307 \ No newline at end of file
... ...
C5/app/src/main/res/layout/fragment_election.xml
  View file @0345eb5
... ... @@ -9,7 +9,7 @@
9 9 android:id="@+id/line_panel"
10 10 android:layout_width="match_parent"
11 11 android:layout_height="wrap_content"
12   - android:background="@color/red"
  12 + android:background="@color/red2"
13 13 android:orientation="horizontal"
14 14 android:paddingBottom="20dp"
15 15 android:paddingLeft="20dp"
... ... @@ -24,6 +24,7 @@
24 24 android:ellipsize="end"
25 25 android:lines="1"
26 26 android:text="@string/sunvote_no_paper"
  27 + android:textStyle="bold"
27 28 android:textColor="@color/white"
28 29 android:textSize="@dimen/big_text_p4" />
29 30  
... ... @@ -34,6 +35,7 @@
34 35 android:layout_marginRight="20dp"
35 36 android:textColor="@color/white"
36 37 android:text=""
  38 + android:textStyle="bold"
37 39 android:textSize="@dimen/big_text_p5" />
38 40  
39 41 <Button
... ... @@ -43,6 +45,7 @@
43 45 android:background="@drawable/agree_selector"
44 46 android:text="@string/select_other"
45 47 android:textColor="@color/white"
  48 + android:textStyle="bold"
46 49 android:layout_marginRight="@dimen/px40dp"
47 50 android:textSize="@dimen/big_text_p5" />
48 51  
... ... @@ -125,7 +128,7 @@
125 128 android:layout_height="@dimen/px110dp"
126 129 android:layout_centerInParent="true"
127 130 android:layout_marginRight="@dimen/content_margin"
128   - android:background="@drawable/signin_selector"
  131 + android:background="@drawable/agree_selector"
129 132 android:text="@string/modify"
130 133 android:textColor="@color/white"
131 134 android:textSize="@dimen/px60dp"
... ... @@ -148,6 +151,7 @@
148 151 android:layout_height="wrap_content"
149 152 android:layout_gravity="center_vertical"
150 153 android:layout_marginLeft="150dp"
  154 + android:textStyle="bold"
151 155 android:gravity="center"
152 156 android:text="序号"
153 157 android:textColor="@color/gray"
... ... @@ -161,6 +165,7 @@
161 165 android:layout_marginLeft="40dp"
162 166 android:layout_weight="1"
163 167 android:gravity="left|center_vertical"
  168 + android:textStyle="bold"
164 169 android:text="侯选人"
165 170 android:textColor="@color/red"
166 171 android:textSize="@dimen/big_text_p6" />
... ... @@ -175,6 +180,7 @@
175 180 android:layout_height="wrap_content"
176 181 android:layout_gravity="center_vertical"
177 182 android:text="@string/agree"
  183 + android:textStyle="bold"
178 184 android:textColor="@color/red"
179 185 android:textSize="@dimen/big_text_p6" />
180 186  
... ... @@ -184,6 +190,7 @@
184 190 android:layout_gravity="center_vertical"
185 191 android:layout_marginLeft="@dimen/button_to_content"
186 192 android:text="@string/oppose"
  193 + android:textStyle="bold"
187 194 android:textColor="@color/red"
188 195 android:textSize="@dimen/big_text_p6" />
189 196  
... ... @@ -193,6 +200,7 @@
193 200 android:layout_gravity="center_vertical"
194 201 android:layout_marginLeft="@dimen/button_to_content"
195 202 android:text="@string/delete"
  203 + android:textStyle="bold"
196 204 android:textColor="@color/red"
197 205 android:textSize="@dimen/big_text_p6"
198 206 android:visibility="gone" />
... ... @@ -279,6 +287,7 @@
279 287 android:layout_height="@dimen/px120dp"
280 288 android:text="@string/input_other"
281 289 android:layout_marginRight="@dimen/px90dp"
  290 + android:textStyle="bold"
282 291 android:textColor="@color/black"
283 292 android:textSize="@dimen/px60dp" />
284 293  
... ... @@ -308,7 +317,7 @@
308 317 android:id="@+id/election_add_edit_btn_ok"
309 318 android:layout_width="@dimen/px360dp"
310 319 android:layout_height="@dimen/px120dp"
311   - android:layout_marginLeft="@dimen/px67dp"
  320 + android:layout_marginLeft="@dimen/px80dp"
312 321 android:background="@drawable/btn_agree"
313 322 android:text="@string/ok"
314 323 android:textColor="@color/white"
... ... @@ -320,7 +329,7 @@
320 329 android:layout_width="@dimen/px360dp"
321 330 android:layout_height="@dimen/px120dp"
322 331 android:background="@drawable/oppos_selector"
323   - android:layout_marginLeft="@dimen/px90dp"
  332 + android:layout_marginLeft="@dimen/px80dp"
324 333 android:text="@string/cancel"
325 334 android:textColor="@color/white"
326 335 android:textSize="@dimen/big_text_p4"
... ... @@ -414,19 +423,41 @@
414 423 android:textStyle="bold" />
415 424 </RelativeLayout>
416 425  
417   - <TextView
418   - android:id="@+id/singlevote_tv_result"
419   - android:layout_width="wrap_content"
420   - android:layout_height="wrap_content"
421   - android:layout_centerInParent="true"
422   - android:layout_marginRight="@dimen/content_margin"
423   - android:layout_marginTop="@dimen/content_margin"
424   - android:alpha="0.9"
425   - android:background="@drawable/voted_empty"
426   - android:gravity="center"
427   - android:rotation="-15"
428   - android:textColor="#ddff9933"
429   - android:textSize="@dimen/big_text_p2"
430   - android:textStyle="bold"
431   - android:visibility="invisible" />
  426 + <FrameLayout
  427 + android:id="@+id/result_layout"
  428 + android:layout_width="match_parent"
  429 + android:layout_height="match_parent"
  430 + android:layout_above="@+id/election_pannal_bottom"
  431 + android:visibility="gone"
  432 + android:gravity="center">
  433 +
  434 + <LinearLayout
  435 + android:layout_width="match_parent"
  436 + android:layout_height="match_parent"
  437 + android:background="@color/white"
  438 + android:alpha="0.4"
  439 + android:orientation="horizontal" />
  440 +
  441 + <TextView
  442 + android:id="@+id/singlevote_tv_result"
  443 + android:layout_width="@dimen/px625dp"
  444 + android:layout_height="@dimen/px217dp"
  445 + android:layout_marginTop="@dimen/px100dp"
  446 + android:background="@drawable/voted"
  447 + android:layout_gravity="center"
  448 + android:textSize="@dimen/big_text_p2"
  449 + android:textStyle="bold"/>
  450 +
  451 + <TextView
  452 + android:id="@+id/submiting_tv"
  453 + android:layout_width="wrap_content"
  454 + android:layout_height="wrap_content"
  455 + android:layout_marginTop="@dimen/px100dp"
  456 + android:layout_gravity="center"
  457 + android:textColor="@color/red"
  458 + android:text="@string/submiting"
  459 + android:textSize="@dimen/px140dp"
  460 + android:visibility="gone"
  461 + android:textStyle="bold"/>
  462 + </FrameLayout>
432 463 </RelativeLayout>
433 464 \ No newline at end of file
... ...
C5/app/src/main/res/layout/fragment_result_election.xml
  View file @0345eb5
... ... @@ -2,14 +2,14 @@
2 2 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 3 android:layout_width="match_parent"
4 4 android:layout_height="match_parent"
5   - android:background="#ff004586"
  5 + android:background="#0952b5"
6 6 android:orientation="vertical">
7 7  
8 8 <RelativeLayout
9 9 android:id="@+id/title_linear"
10 10 android:layout_width="match_parent"
11 11 android:layout_height="wrap_content"
12   - android:layout_marginTop="10dp">
  12 + android:layout_marginTop="@dimen/px110dp">
13 13  
14 14 <ImageButton
15 15 android:id="@+id/fragment_result_election_btn_back"
... ... @@ -35,27 +35,65 @@
35 35 android:textStyle="bold" />
36 36 </RelativeLayout>
37 37  
38   - <TextView
39   - android:id="@+id/fragment_result_election_title"
40   - android:layout_width="fill_parent"
  38 + <LinearLayout
  39 + android:id="@+id/bottom_linear"
  40 + android:layout_width="400dp"
41 41 android:layout_height="wrap_content"
42   - android:layout_below="@id/title_linear"
  42 + android:layout_marginTop="@dimen/px60dp"
43 43 android:layout_centerHorizontal="true"
44   - android:layout_marginLeft="@dimen/content_margin"
45   - android:layout_marginRight="@dimen/content_margin"
46   - android:layout_marginTop="10dp"
47   - android:gravity="center"
48   - android:lines="1"
49   - android:text="@string/vote_result"
50   - android:textColor="@color/white"
51   - android:textSize="@dimen/big_text_p3" />
  44 + android:layout_below="@id/title_linear"
  45 + android:orientation="horizontal">
  46 +
  47 + <TextView
  48 + android:layout_width="wrap_content"
  49 + android:layout_height="wrap_content"
  50 + android:layout_weight="1"
  51 + android:gravity="right"
  52 + android:text="@string/yindao1"
  53 + android:textColor="@color/white"
  54 + android:textSize="@dimen/px60dp"
  55 + android:textStyle="bold" />
  56 +
  57 + <TextView
  58 + android:id="@+id/yingdaoresult"
  59 + android:layout_width="wrap_content"
  60 + android:layout_height="wrap_content"
  61 + android:layout_marginLeft="10dp"
  62 + android:layout_marginRight="60dp"
  63 + android:layout_weight="1"
  64 + android:gravity="left"
  65 + android:text="150"
  66 + android:textColor="@color/white"
  67 + android:textSize="@dimen/px60dp"/>
  68 +
  69 + <TextView
  70 + android:layout_width="wrap_content"
  71 + android:layout_height="wrap_content"
  72 + android:gravity="right"
  73 + android:text="@string/shidao1"
  74 + android:textColor="@color/white"
  75 + android:textSize="@dimen/px60dp"
  76 + android:textStyle="bold" />
  77 +
  78 + <TextView
  79 + android:id="@+id/shidaoresult"
  80 + android:layout_width="wrap_content"
  81 + android:layout_height="wrap_content"
  82 + android:layout_marginLeft="10dp"
  83 + android:layout_weight="1"
  84 + android:gravity="left"
  85 + android:text="150"
  86 + android:textColor="@color/white"
  87 + android:textSize="@dimen/px60dp"/>
  88 +
  89 + </LinearLayout>
52 90  
53 91 <LinearLayout
54 92 android:id="@+id/data_title_layout"
55 93 android:layout_width="match_parent"
56 94 android:layout_height="wrap_content"
57   - android:layout_below="@id/fragment_result_election_title"
58   - android:layout_marginTop="20dp"
  95 + android:layout_below="@id/bottom_linear"
  96 + android:layout_marginTop="@dimen/px91dp"
59 97 android:orientation="horizontal"
60 98 android:paddingRight="80dp">
61 99  
... ... @@ -65,9 +103,9 @@
65 103 android:layout_height="match_parent"
66 104 android:gravity="center"
67 105 android:paddingLeft="@dimen/content_margin"
68   - android:text="@string/name_index"
69   - android:textColor="@color/yellow"
70   - android:textSize="@dimen/big_text_p4"
  106 + android:text="@string/number"
  107 + android:textColor="@color/white"
  108 + android:textSize="@dimen/px48dp"
71 109 android:textStyle="bold" />
72 110  
73 111 <TextView
... ... @@ -75,9 +113,10 @@
75 113 android:layout_width="0dp"
76 114 android:layout_height="match_parent"
77 115 android:layout_weight="1"
  116 + android:gravity="center"
78 117 android:text="@string/name_xpad"
79   - android:textColor="@color/yellow"
80   - android:textSize="@dimen/big_text_p4"
  118 + android:textColor="@color/white"
  119 + android:textSize="@dimen/px48dp"
81 120 android:textStyle="bold" />
82 121  
83 122 <TextView
... ... @@ -85,9 +124,9 @@
85 124 android:layout_width="140dp"
86 125 android:layout_height="match_parent"
87 126 android:gravity="center"
88   - android:text="@string/agree_num"
89   - android:textColor="@color/yellow"
90   - android:textSize="@dimen/big_text_p4"
  127 + android:text="@string/agree"
  128 + android:textColor="@color/white"
  129 + android:textSize="@dimen/px48dp"
91 130 android:textStyle="bold" />
92 131  
93 132 <TextView
... ... @@ -95,9 +134,9 @@
95 134 android:layout_width="140dp"
96 135 android:layout_height="match_parent"
97 136 android:gravity="center"
98   - android:text="@string/oppose_num"
99   - android:textColor="@color/yellow"
100   - android:textSize="@dimen/big_text_p4"
  137 + android:text="@string/oppose"
  138 + android:textColor="@color/white"
  139 + android:textSize="@dimen/px48dp"
101 140 android:textStyle="bold" />
102 141  
103 142 <TextView
... ... @@ -105,9 +144,9 @@
105 144 android:layout_width="140dp"
106 145 android:layout_height="match_parent"
107 146 android:gravity="center"
108   - android:text="@string/abstant_num"
109   - android:textColor="@color/yellow"
110   - android:textSize="@dimen/big_text_p4"
  147 + android:text="@string/abstant"
  148 + android:textColor="@color/white"
  149 + android:textSize="@dimen/px48dp"
111 150 android:textStyle="bold" />
112 151  
113 152 <TextView
... ... @@ -118,74 +157,18 @@
118 157 android:layout_centerVertical="true"
119 158 android:gravity="center"
120 159 android:text="@string/result"
121   - android:textColor="@color/yellow"
122   - android:textSize="@dimen/big_text_p4"
123   - android:textStyle="bold" />
124   - </LinearLayout>
125   -
126   - <LinearLayout
127   - android:id="@+id/bottom_linear"
128   - android:layout_width="800dp"
129   - android:layout_height="wrap_content"
130   - android:layout_centerHorizontal="true"
131   - android:layout_alignParentBottom="true"
132   - android:layout_marginBottom="20dp"
133   - android:orientation="horizontal">
134   -
135   - <TextView
136   - android:layout_width="wrap_content"
137   - android:layout_height="wrap_content"
138   - android:layout_weight="1"
139   - android:gravity="right"
140   - android:text="@string/yindao1"
141   - android:textColor="@color/yellow"
142   - android:textSize="@dimen/big_text_p3"
143   - android:textStyle="bold" />
144   -
145   - <TextView
146   - android:id="@+id/yingdaoresult"
147   - android:layout_width="wrap_content"
148   - android:layout_height="wrap_content"
149   - android:layout_marginLeft="10dp"
150   - android:layout_marginRight="60dp"
151   - android:layout_weight="1"
152   - android:gravity="left"
153   - android:text="150"
154 160 android:textColor="@color/white"
155   - android:textSize="@dimen/big_text_p3" />
156   -
157   - <TextView
158   - android:layout_width="wrap_content"
159   - android:layout_height="wrap_content"
160   - android:layout_marginLeft="60dp"
161   - android:layout_weight="1"
162   - android:gravity="right"
163   - android:text="@string/shidao1"
164   - android:textColor="@color/yellow"
165   - android:textSize="@dimen/big_text_p3"
  161 + android:textSize="@dimen/px48dp"
166 162 android:textStyle="bold" />
167   -
168   - <TextView
169   - android:id="@+id/shidaoresult"
170   - android:layout_width="wrap_content"
171   - android:layout_height="wrap_content"
172   - android:layout_marginLeft="10dp"
173   - android:layout_weight="1"
174   - android:gravity="left"
175   - android:text="150"
176   - android:textColor="@color/white"
177   - android:textSize="@dimen/big_text_p3" />
178   -
179 163 </LinearLayout>
180 164  
181 165 <ListView
182 166 android:id="@+id/fragment_result_election_list"
183 167 android:layout_width="match_parent"
184 168 android:layout_height="match_parent"
185   - android:layout_above="@id/bottom_linear"
186 169 android:layout_below="@id/data_title_layout"
187 170 android:layout_marginBottom="@dimen/content_margin"
188   - android:divider="@color/votebakground"
  171 + android:layout_marginTop="@dimen/px20dp"
  172 + android:divider="@color/blue1"
189 173 android:dividerHeight="1dp" />
190   -
191 174 </RelativeLayout>
192 175 \ No newline at end of file
... ...
C5/app/src/main/res/layout/fragment_result_election_custom.xml 0 → 100644
  View file @0345eb5
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + android:layout_width="match_parent"
  4 + android:layout_height="match_parent"
  5 + android:background="#0952b5"
  6 + android:orientation="vertical">
  7 +
  8 + <RelativeLayout
  9 + android:id="@+id/title_linear"
  10 + android:layout_width="match_parent"
  11 + android:layout_height="wrap_content"
  12 + android:layout_marginTop="@dimen/px110dp">
  13 +
  14 + <ImageButton
  15 + android:id="@+id/fragment_result_election_btn_back"
  16 + android:layout_width="wrap_content"
  17 + android:layout_height="wrap_content"
  18 + android:layout_marginLeft="@dimen/content_margin"
  19 + android:background="@drawable/back_white_selector"
  20 + android:visibility="invisible" />
  21 +
  22 + <TextView
  23 + android:id="@+id/fragment_result_election_bill_title"
  24 + android:layout_width="fill_parent"
  25 + android:layout_height="wrap_content"
  26 + android:layout_centerHorizontal="true"
  27 + android:layout_marginLeft="@dimen/content_margin"
  28 + android:layout_marginRight="@dimen/content_margin"
  29 + android:ellipsize="end"
  30 + android:gravity="center"
  31 + android:lines="1"
  32 + android:text="@string/vote_election"
  33 + android:textColor="@color/white"
  34 + android:textSize="@dimen/big_text_p3"
  35 + android:textStyle="bold" />
  36 + </RelativeLayout>
  37 +
  38 + <LinearLayout
  39 + android:id="@+id/bottom_linear"
  40 + android:layout_width="400dp"
  41 + android:layout_height="wrap_content"
  42 + android:layout_marginTop="@dimen/px60dp"
  43 + android:layout_centerHorizontal="true"
  44 + android:layout_below="@id/title_linear"
  45 + android:orientation="horizontal">
  46 +
  47 + <TextView
  48 + android:layout_width="wrap_content"
  49 + android:layout_height="wrap_content"
  50 + android:layout_weight="1"
  51 + android:gravity="right"
  52 + android:text="@string/yindao1"
  53 + android:textColor="@color/white"
  54 + android:textSize="@dimen/px60dp"
  55 + android:textStyle="bold" />
  56 +
  57 + <TextView
  58 + android:id="@+id/yingdaoresult"
  59 + android:layout_width="wrap_content"
  60 + android:layout_height="wrap_content"
  61 + android:layout_marginLeft="10dp"
  62 + android:layout_marginRight="60dp"
  63 + android:layout_weight="1"
  64 + android:gravity="left"
  65 + android:text="150"
  66 + android:textColor="@color/white"
  67 + android:textSize="@dimen/px60dp"/>
  68 +
  69 + <TextView
  70 + android:layout_width="wrap_content"
  71 + android:layout_height="wrap_content"
  72 + android:gravity="right"
  73 + android:text="@string/shidao1"
  74 + android:textColor="@color/white"
  75 + android:textSize="@dimen/px60dp"
  76 + android:textStyle="bold" />
  77 +
  78 + <TextView
  79 + android:id="@+id/shidaoresult"
  80 + android:layout_width="wrap_content"
  81 + android:layout_height="wrap_content"
  82 + android:layout_marginLeft="10dp"
  83 + android:layout_weight="1"
  84 + android:gravity="left"
  85 + android:text="150"
  86 + android:textColor="@color/white"
  87 + android:textSize="@dimen/px60dp"/>
  88 +
  89 + </LinearLayout>
  90 +
  91 + <LinearLayout
  92 + android:id="@+id/data_title_layout"
  93 + android:layout_width="match_parent"
  94 + android:layout_height="wrap_content"
  95 + android:layout_below="@id/bottom_linear"
  96 + android:layout_marginTop="@dimen/px91dp"
  97 + android:orientation="horizontal"
  98 + android:paddingRight="80dp">
  99 +
  100 + <TextView
  101 + android:id="@+id/fragment_result_election_num"
  102 + android:layout_width="140dp"
  103 + android:layout_height="match_parent"
  104 + android:gravity="center"
  105 + android:paddingLeft="@dimen/content_margin"
  106 + android:text="@string/number"
  107 + android:textColor="@color/white"
  108 + android:textSize="@dimen/px48dp"
  109 + android:textStyle="bold" />
  110 +
  111 + <TextView
  112 + android:id="@+id/fragment_result_election_name"
  113 + android:layout_width="0dp"
  114 + android:layout_height="match_parent"
  115 + android:layout_weight="1"
  116 + android:gravity="center"
  117 + android:text="@string/item"
  118 + android:textColor="@color/white"
  119 + android:textSize="@dimen/px48dp"
  120 + android:textStyle="bold" />
  121 +
  122 + <TextView
  123 + android:id="@+id/fragment_result_election_agree_num"
  124 + android:layout_width="140dp"
  125 + android:layout_height="match_parent"
  126 + android:gravity="center"
  127 + android:text="@string/vote_num"
  128 + android:textColor="@color/white"
  129 + android:textSize="@dimen/px48dp"
  130 + android:textStyle="bold" />
  131 + </LinearLayout>
  132 +
  133 + <ListView
  134 + android:id="@+id/fragment_result_election_list"
  135 + android:layout_width="match_parent"
  136 + android:layout_height="match_parent"
  137 + android:layout_below="@id/data_title_layout"
  138 + android:layout_marginBottom="@dimen/content_margin"
  139 + android:layout_marginTop="@dimen/px20dp"
  140 + android:divider="@color/blue1"
  141 + android:dividerHeight="1dp" />
  142 +
  143 +</RelativeLayout>
0 144 \ No newline at end of file
... ...
C5/app/src/main/res/layout/list_custom_election_item.xml
  View file @0345eb5
... ... @@ -6,7 +6,7 @@
6 6  
7 7 <RelativeLayout
8 8 android:layout_width="match_parent"
9   - android:layout_height="match_parent"
  9 + android:layout_height="@dimen/px120dp"
10 10 android:paddingLeft="20dp"
11 11 android:paddingRight="20dp"
12 12 android:layout_alignParentTop="true"
... ... @@ -21,8 +21,8 @@
21 21 android:layout_centerVertical="true"
22 22 android:gravity="center"
23 23 android:text=""
24   - android:textColor="@color/black"
25   - android:textSize="26px" />
  24 + android:textColor="@color/darkgray"
  25 + android:textSize="@dimen/px40dp" />
26 26  
27 27 <!-- <View
28 28 android:id="@+id/election_item_middle"
... ... @@ -33,14 +33,14 @@
33 33 -->
34 34 <TextView
35 35 android:id="@+id/list_election_item_name"
36   - android:layout_width="400dp"
  36 + android:layout_width="@dimen/px1000dp"
37 37 android:layout_height="wrap_content"
38 38 android:layout_centerVertical="true"
39 39 android:layout_toRightOf="@id/list_election_item_num"
40 40 android:gravity="center"
41 41 android:text=""
42 42 android:textColor="@color/black"
43   - android:textSize="@dimen/big_text_p5" />
  43 + android:textSize="@dimen/px40dp" />
44 44  
45 45 <!-- <View
46 46 android:layout_width="2px"
... ... @@ -57,33 +57,35 @@
57 57  
58 58 <RadioButton
59 59 android:id="@+id/list_election_item_oo"
60   - android:layout_width="wrap_content"
61   - android:layout_height="wrap_content"
  60 + android:layout_width="@dimen/px70dp"
  61 + android:layout_height="@dimen/px70dp"
62 62 android:layout_centerVertical="true"
63 63 android:layout_marginTop="10dp"
64 64 android:button="@null"
65   - android:background="@drawable/oo_selector"
66   - android:layout_marginLeft="50dp"
  65 + android:background="@drawable/selected_selector"
  66 + android:layout_marginLeft="@dimen/px300dp"
67 67 android:visibility="visible" />
68 68  
69 69 <RadioButton
70 70 android:id="@+id/list_election_item_xx"
71   - android:layout_width="wrap_content"
72   - android:layout_height="wrap_content"
  71 + android:layout_width="@dimen/px70dp"
  72 + android:layout_height="@dimen/px70dp"
73 73 android:layout_centerVertical="true"
74 74 android:layout_marginTop="10dp"
75 75 android:button="@null"
76 76 android:background="@drawable/xx_selector"
  77 + android:visibility="gone"
77 78 android:layout_marginLeft="50dp"
78 79 android:layout_toRightOf="@id/list_election_item_oo" />
79 80  
80 81 <RadioButton
81 82 android:id="@+id/list_election_item_abstain"
82   - android:layout_width="wrap_content"
83   - android:layout_height="wrap_content"
  83 + android:layout_width="@dimen/px70dp"
  84 + android:layout_height="@dimen/px70dp"
84 85 android:layout_centerVertical="true"
85 86 android:layout_marginTop="10dp"
86 87 android:button="@null"
  88 + android:visibility="gone"
87 89 android:background="@drawable/eab_selector"
88 90 android:layout_marginLeft="50dp"
89 91 android:layout_toRightOf="@id/list_election_item_xx" />
... ...
C5/app/src/main/res/layout/list_election_item.xml
  View file @0345eb5
... ... @@ -153,7 +153,7 @@
153 153 android:visibility="invisible"
154 154 android:layout_marginTop="@dimen/inner_button_margin"
155 155 android:button="@null"
156   - android:background="@drawable/delete"/>
  156 + android:background="@drawable/ic_delete"/>
157 157 </RadioGroup>
158 158 </LinearLayout>
159 159 </RelativeLayout>
160 160 \ No newline at end of file
... ...
C5/app/src/main/res/layout/list_result_election_custom_item.xml 0 → 100644
  View file @0345eb5
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + android:layout_width="match_parent"
  4 + android:layout_height="@dimen/px110dp"
  5 + android:layout_marginBottom="@dimen/content_margin"
  6 + android:layout_marginTop="@dimen/content_margin"
  7 + android:minHeight="@dimen/px110dp"
  8 + android:paddingRight="80dp">
  9 +
  10 + <TextView
  11 + android:id="@+id/item_result_election_num"
  12 + android:layout_width="140dp"
  13 + android:layout_height="match_parent"
  14 + android:layout_centerVertical="true"
  15 + android:gravity="center"
  16 + android:paddingLeft="@dimen/content_margin"
  17 + android:text="@string/name_index"
  18 + android:textColor="@color/white"
  19 + android:textSize="@dimen/px48dp"
  20 + android:textStyle="bold"/>
  21 +
  22 + <TextView
  23 + android:id="@+id/item_result_election_name"
  24 + android:layout_width="0dp"
  25 + android:layout_height="match_parent"
  26 + android:layout_weight="1"
  27 + android:text="@string/name_xpad"
  28 + android:textColor="@color/white"
  29 + android:gravity="center"
  30 + android:textSize="@dimen/px48dp"
  31 + android:textStyle="bold" />
  32 +
  33 + <TextView
  34 + android:id="@+id/item_result_election_agree"
  35 + android:layout_width="140dp"
  36 + android:layout_height="match_parent"
  37 + android:gravity="center"
  38 + android:text="@string/agree_num"
  39 + android:textColor="@color/white"
  40 + android:textSize="@dimen/px48dp"
  41 + android:textStyle="bold" />
  42 +</LinearLayout>
... ...
C5/app/src/main/res/layout/list_result_election_item.xml
  View file @0345eb5
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 3 android:layout_width="match_parent"
4   - android:layout_height="wrap_content"
  4 + android:layout_height="@dimen/px110dp"
5 5 android:layout_marginBottom="@dimen/content_margin"
6 6 android:layout_marginTop="@dimen/content_margin"
  7 + android:minHeight="@dimen/px110dp"
7 8 android:paddingRight="80dp">
8 9  
9 10 <TextView
... ... @@ -15,8 +16,8 @@
15 16 android:paddingLeft="@dimen/content_margin"
16 17 android:text="@string/name_index"
17 18 android:textColor="@color/white"
18   - android:textSize="@dimen/big_text_p4"
19   - android:textStyle="bold" />
  19 + android:textSize="@dimen/px48dp"
  20 + android:textStyle="bold"/>
20 21  
21 22 <TextView
22 23 android:id="@+id/item_result_election_name"
... ... @@ -25,7 +26,8 @@
25 26 android:layout_weight="1"
26 27 android:text="@string/name_xpad"
27 28 android:textColor="@color/white"
28   - android:textSize="@dimen/big_text_p4"
  29 + android:gravity="center"
  30 + android:textSize="@dimen/px48dp"
29 31 android:textStyle="bold" />
30 32  
31 33 <TextView
... ... @@ -35,7 +37,7 @@
35 37 android:gravity="center"
36 38 android:text="@string/agree_num"
37 39 android:textColor="@color/white"
38   - android:textSize="@dimen/big_text_p4"
  40 + android:textSize="@dimen/px48dp"
39 41 android:textStyle="bold" />
40 42  
41 43 <TextView
... ... @@ -45,8 +47,8 @@
45 47 android:gravity="center"
46 48 android:text="@string/oppose_num"
47 49 android:textColor="@color/white"
48   - android:textSize="@dimen/big_text_p4"
49   - android:textStyle="bold" />
  50 + android:textSize="@dimen/px48dp"
  51 + android:textStyle="bold"/>
50 52  
51 53 <TextView
52 54 android:id="@+id/item_result_election_abstant_num"
... ... @@ -55,7 +57,7 @@
55 57 android:gravity="center"
56 58 android:text="@string/abstant_num"
57 59 android:textColor="@color/white"
58   - android:textSize="@dimen/big_text_p4"
  60 + android:textSize="@dimen/px48dp"
59 61 android:textStyle="bold" />
60 62  
61 63 <TextView
... ... @@ -65,7 +67,6 @@
65 67 android:gravity="center"
66 68 android:text="@string/result"
67 69 android:textColor="@color/white"
68   - android:textSize="@dimen/big_text_p4"
  70 + android:textSize="@dimen/px48dp"
69 71 android:textStyle="bold" />
70   -
71 72 </LinearLayout>
... ...
C5/app/src/main/res/values/color.xml
  View file @0345eb5
... ... @@ -166,5 +166,8 @@
166 166  
167 167 <color name="green1">#00964d</color> <!--绿色 -->
168 168 <color name="red1">#d50c00</color> <!--红色 -->
  169 + <color name="red2">#ac1007</color> <!--红色 -->
169 170  
  171 + <color name="blue1">#5386cb</color> <!--绿色 -->
  172 + <color name="blue2">#084aa3</color> <!--红色 -->
170 173 </resources>
171 174 \ No newline at end of file
... ...
C5/app/src/main/res/values/strings.xml
  View file @0345eb5
... ... @@ -16,7 +16,7 @@
16 16 <string name="base_connecting">基站连接中</string>
17 17 <string name="keypad_test">键盘测试</string>
18 18 <string name="sunvote_no_paper">无纸化会议</string>
19   - <string name="submiting">提交中</string>
  19 + <string name="submiting">提交中...</string>
20 20 <string name="modify">修改</string>
21 21 <string name="doc_title">会议内容</string>
22 22 <string name="page_up">上 翻</string>
... ... @@ -139,7 +139,7 @@
139 139 <string name="modify_id_msg">请2秒内在主控端完成</string>
140 140  
141 141 <string name="service_paper">白纸</string>
142   -
  142 + <string name="vote_num">票数</string>
143 143  
144 144 <string name="name_xpad">姓名</string>
145 145 <string name="agree_num">赞成票数</string>
... ...