孙向锦 / VoteC5

Commit 3bef69936ad142cd368810e3bd5313a7420dce2e

Authored by 孙向锦
1 parent 4c3de86c

批次表决界面UI修改

Inline Side-by-side
Showing 16 changed files with 218 additions and 102 deletions
C5/app/src/main/java/com/sunvote/xpadapp/fragments/MultiTitleFragment.java
  View file @3bef699
... ... @@ -6,6 +6,9 @@ import android.app.FragmentTransaction;
6 6 import android.content.Context;
7 7 import android.os.Bundle;
8 8 import android.os.Handler;
  9 +import android.text.Spannable;
  10 +import android.text.SpannableStringBuilder;
  11 +import android.text.style.AbsoluteSizeSpan;
9 12 import android.util.Log;
10 13 import android.view.LayoutInflater;
11 14 import android.view.View;
... ... @@ -113,8 +116,9 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack
113 116 tvConfirmText = (TextView) view.findViewById(R.id.multivote_confirm_text);
114 117  
115 118 // tvPage = (TextView) view.findViewById(R.id.multivote_page);
116   - Button btnPageUp = (Button) view.findViewById(R.id.multivote_pageup);
117   - Button btnPageDown = (Button) view.findViewById(R.id.multivote_pagedown);
  119 + View btnPageUp = view.findViewById(R.id.multivote_pageup);
  120 + View btnPageDown = view.findViewById(R.id.multivote_pagedown);
  121 + View btnPageEnd = view.findViewById(R.id.multivote_pageend);
118 122  
119 123 btnPageUp.setOnClickListener(new OnClickListener() {
120 124  
... ... @@ -132,6 +136,13 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack
132 136 }
133 137 });
134 138  
  139 + btnPageEnd.setOnClickListener(new OnClickListener() {
  140 + @Override
  141 + public void onClick(View v) {
  142 + listview.setSelection(mAdapter.getCount() - 1);
  143 + }
  144 + });
  145 +
135 146 btnConfirm = (Button) view.findViewById(R.id.multivote_btn_submit);
136 147 btnConfirm.setOnClickListener(new OnClickListener() {
137 148 @Override
... ... @@ -341,10 +352,16 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack
341 352 if (fDetail != null) {
342 353 fDetail.showVote();
343 354 }
  355 + SpannableStringBuilder text1= new SpannableStringBuilder(replaceBlank(bill.title));
  356 + text1.setSpan(new AbsoluteSizeSpan(70), 0, text1.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
344 357 if (voteInfo.less == 1) {// 迫选
345   - tvTitle.setText(replaceBlank(bill.title) + "(总共" + aryContent.size() + "项), 不可缺选");
  358 + SpannableStringBuilder text= new SpannableStringBuilder( "(总共" + aryContent.size() + "项, 不可缺选)");
  359 + text.setSpan(new AbsoluteSizeSpan(45), 0, text.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
  360 + tvTitle.setText(text1.append(text));
346 361 } else {
347   - tvTitle.setText(replaceBlank(bill.title) + "(总共" + aryContent.size() + "项)");
  362 + SpannableStringBuilder text= new SpannableStringBuilder( "(总共" + aryContent.size() + "项)");
  363 + text.setSpan(new AbsoluteSizeSpan(45), 0, text.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
  364 + tvTitle.setText(text1.append(text));
348 365 }
349 366 }
350 367  
... ... @@ -379,10 +396,16 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack
379 396 fDetail.showVote();
380 397 }
381 398 mAdapter.notifyDataSetChanged();
  399 + SpannableStringBuilder text1= new SpannableStringBuilder(replaceBlank(bill.title));
  400 + text1.setSpan(new AbsoluteSizeSpan(70), 0, text1.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
382 401 if (voteInfo.less == 1) {// 迫选
383   - tvTitle.setText(replaceBlank(bill.title) + "(总共" + aryContent.size() + "项), 不可缺选");
  402 + SpannableStringBuilder text= new SpannableStringBuilder( "(总共" + aryContent.size() + "项, 不可缺选)");
  403 + text.setSpan(new AbsoluteSizeSpan(45), 0, text.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
  404 + tvTitle.setText(text1.append(text));
384 405 } else {
385   - tvTitle.setText(replaceBlank(bill.title) + "(总共" + aryContent.size() + "项)");
  406 + SpannableStringBuilder text= new SpannableStringBuilder( "(总共" + aryContent.size() + "项)");
  407 + text.setSpan(new AbsoluteSizeSpan(45), 0, text.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
  408 + tvTitle.setText(text1.append(text));
386 409 }
387 410 checkVoted();
388 411 }
... ...
C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java
  View file @3bef699
... ... @@ -46,6 +46,8 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
46 46 private BillInfo bill;
47 47 private VoteInfo voteInfo;
48 48 private RelativeLayout singlevoteLayout;
  49 + private RelativeLayout singlevoteTvTipsLayout;
  50 + private TextView votetype;
49 51  
50 52  
51 53 private String TAG = "SingleTitleFragment";
... ... @@ -121,6 +123,7 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
121 123  
122 124 View view = inflater.inflate(R.layout.fragment_singlevote, container, false);
123 125 singlevoteLayout=(RelativeLayout)view.findViewById(R.id.singlevote_btn_layout1);
  126 + votetype = view.findViewById(R.id.votetype);
124 127 initOptions();
125 128 mact = (MainActivity) getActivity();
126 129 view.setOnClickListener(new OnClickListener() {
... ... @@ -131,10 +134,21 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
131 134 }
132 135 });
133 136 tvTitle = (TextView) view.findViewById(R.id.singlevote_content);
  137 + singlevoteTvTipsLayout = view.findViewById(R.id.singlevote_tv_tips_layout);
134 138 if (bill != null && bill.title != null && bill.title.length() > 0) {
135 139 tvTitle.setText(bill.title);
136 140 }
137 141  
  142 + if(voteInfo.mode1_msgType < 2){
  143 + votetype.setText(R.string.yianbiaojue);
  144 + }
  145 + if(voteInfo.mode1_msgType == 2){
  146 + votetype.setText(R.string.yianxuanju);
  147 + }
  148 + if(voteInfo.mode1_msgType > 2){
  149 + votetype.setText(R.string.yianceping);
  150 + }
  151 +
138 152 tvTitle.setOnClickListener(new OnClickListener() {
139 153 @Override
140 154 public void onClick(View v) {
... ... @@ -314,9 +328,6 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
314 328 }
315 329 }
316 330  
317   - /**
318   - * 评测按钮点击事件 wutaian 2017.08.23
319   - */
320 331 View.OnClickListener btnClick=new View.OnClickListener() {
321 332 @Override
322 333 public void onClick(View v) {
... ... @@ -429,6 +440,7 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
429 440 private void doVoteWithIndex(int index) {
430 441  
431 442 if (bill != null) {
  443 + singlevoteTvTipsLayout.setVisibility(View.VISIBLE);
432 444 tvTips.setText(getString(R.string.submiting));
433 445 bill.voteResult = index;
434 446 }
... ... @@ -473,7 +485,6 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
473 485 btnB.setVisibility(View.INVISIBLE);
474 486 btnC.setVisibility(View.INVISIBLE);
475 487 }
476   - // tvTips.setVisibility(View.INVISIBLE);
477 488 btnModify.setVisibility(View.INVISIBLE);
478 489 }
479 490  
... ... @@ -490,7 +501,6 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
490 501 enableVote();
491 502 }
492 503 ivReuslt.setVisibility(View.INVISIBLE);
493   - // tvTips.setVisibility(View.VISIBLE);
494 504 btnModify.setVisibility(View.INVISIBLE);
495 505 }
496 506  
... ... @@ -525,9 +535,11 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
525 535 if (bill.voteResult > 0) {
526 536 if (voteInfo.mode2_modify == 1) {
527 537 showModify();
  538 + singlevoteTvTipsLayout.setVisibility(View.VISIBLE);
528 539 tvTips.setText(getString(R.string.submited));
529 540 } else {
530 541 disableVote();
  542 + singlevoteTvTipsLayout.setVisibility(View.VISIBLE);
531 543 tvTips.setText(getString(R.string.submited_no_modify));
532 544 }
533 545 }
... ...
C5/app/src/main/java/com/sunvote/xpadcomm/XPadApi.java
  View file @3bef699
... ... @@ -771,7 +771,7 @@ public class XPadApi implements XPadApiInterface {
771 771 VoteResultItem it = new VoteResultItem();
772 772 it.status = 0;
773 773 it.ansType = AnsType_BatchSingle;
774   - it.serialNo = (byte)allokSerialNum;
  774 + it.serialNo = ((byte)allokSerialNum & 0xff);
775 775 allOkSerialNumber = (byte)allokSerialNum;
776 776 it.ansCount = 1;
777 777 it.allOK = 1;
... ...
C5/app/src/main/res/drawable/bh_cicle.xml 0 → 100644
  View file @3bef699
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<shape xmlns:android="http://schemas.android.com/apk/res/android"
  3 + android:shape="oval"
  4 + android:useLevel="false">
  5 + <solid android:color="#F00" />
  6 + <size
  7 + android:width="48dp"
  8 + android:height="48dp" />
  9 +
  10 +</shape>
... ...
C5/app/src/main/res/drawable/page_down.xml 0 → 100644
  View file @3bef699
  1 +<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
  2 + android:viewportWidth="149.2"
  3 + android:viewportHeight="107.7"
  4 + android:width="149.2dp"
  5 + android:height="107.7dp">
  6 + <path
  7 + android:pathData="M12.4 0h124.4c6.9 0 12.5 5.5 12.5 12.4c0 3.2 -1.2 6.1 -3.2 8.3l-61.5 82.1c-4.1 5.4 -11.9 6.6 -17.4 2.5c-1 -0.7 -1.8 -1.5 -2.5 -2.5l-62.2 -83C-1.6 14.4 -0.5 6.6 5 2.5C7.2 0.8 9.8 0 12.4 0L12.4 0zM12.4 0"
  8 + android:fillColor="#434343" />
  9 +</vector>
0 10 \ No newline at end of file
... ...
C5/app/src/main/res/drawable/page_frist.xml 0 → 100644
  View file @3bef699
  1 +<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
  2 + android:viewportWidth="96.4"
  3 + android:viewportHeight="103.4"
  4 + android:width="96.4dp"
  5 + android:height="103.4dp">
  6 + <group>
  7 + <clip-path
  8 + android:pathData="M0 0H96.4V103.4H0V0Z" />
  9 + <path
  10 + android:pathData="M12.3 101.1l53 -40c6.8 -5.1 6.8 -13.5 0 -18.6l-53 -40C5.6 -2.6 0 1 0 10.5v82.7C0 102.7 5.6 106.2 12.3 101.1L12.3 101.1zM89.8 0.2c3.6 0 6.4 2.9 6.5 6.5V97c0 3.6 -2.9 6.4 -6.5 6.5c-3.6 0 -6.4 -2.9 -6.5 -6.5V6.7C83.4 3.1 86.3 0.2 89.8 0.2L89.8 0.2zM89.8 0.2"
  11 + android:fillColor="#000000"
  12 + android:fillAlpha="0.8" />
  13 + </group>
  14 +</vector>
0 15 \ No newline at end of file
... ...
C5/app/src/main/res/drawable/page_up.xml 0 → 100644
  View file @3bef699
  1 +<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
  2 + android:viewportWidth="149.2"
  3 + android:viewportHeight="107.7"
  4 + android:width="149.2dp"
  5 + android:height="107.7dp">
  6 + <path
  7 + android:pathData="M12.4 107.7c-2.6 0 -5.2 -0.8 -7.4 -2.5c-5.5 -4.1 -6.6 -11.9 -2.5 -17.3l62.2 -83c0.7 -0.9 1.5 -1.8 2.5 -2.5c5.5 -4.1 13.2 -3 17.4 2.5L146 87c2 2.2 3.2 5.1 3.2 8.3c0 6.9 -5.6 12.4 -12.5 12.4L12.4 107.7L12.4 107.7zM12.4 107.7"
  8 + android:fillColor="#434343" />
  9 +</vector>
0 10 \ No newline at end of file
... ...
C5/app/src/main/res/drawable/right_control.xml 0 → 100644
  View file @3bef699
  1 +<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
  2 + android:viewportWidth="124"
  3 + android:viewportHeight="394"
  4 + android:width="124dp"
  5 + android:height="394dp">
  6 + <path
  7 + android:pathData="M62 394c-34.2 0 -62 -27.8 -62 -62V62C0 27.8 27.8 0 62 0s62 27.8 62 62v270C124 366.2 96.2 394 62 394z"
  8 + android:fillColor="#D2D2D2" />
  9 + <path
  10 + android:pathData="M62 4C30 4 4 30 4 62v270c0 32 26 58 58 58s58 -26 58 -58V62C120 30 94 4 62 4z"
  11 + android:fillColor="#FFFFFF" />
  12 +</vector>
... ...
C5/app/src/main/res/drawable/scan_qrcode.xml
  View file @3bef699
1   -<vector android:height="80dp" android:viewportHeight="578.957"
2   - android:viewportWidth="578.955" android:width="80dp" xmlns:android="http://schemas.android.com/apk/res/android">
3   - <path android:fillColor="#1296DB" android:pathData="M26.1,201.9c12.1,0 22,-9.9 22,-21.9V70.3c0,-12.1 9.9,-22 22,-22h109.8c12.1,0 22,-9.9 22,-21.9c0,-12.1 -9.9,-21.9 -22,-21.9H70c-36.3,0 -65.9,29.5 -65.9,65.8v109.6C4.1,191.9 13.9,201.9 26.1,201.9z"/>
4   - <path android:fillColor="#1296DB" android:pathData="M179.8,530.8H70.1c-12.1,0 -22,-9.9 -22,-22V399.1c0,-12.1 -9.8,-22 -22,-22c-12.1,0 -22,9.9 -22,22v109.6c0,36.4 29.5,65.8 65.9,65.8h109.7c12.1,0 22.1,-9.7 22.1,-21.9C201.8,540.6 192,530.8 179.8,530.8z"/>
5   - <path android:fillColor="#1296DB" android:pathData="M4.3,289.5c0,12.1 9.9,22 22,22h526.3c12.1,0 22,-9.9 22,-22c0,-12.1 -9.9,-21.9 -22,-21.9H26.3C14.2,267.5 4.3,277.4 4.3,289.5z"/>
6   - <path android:fillColor="#1296DB" android:pathData="M552.9,377.1c-12.1,0 -21.9,9.9 -21.9,22v109.6c0,12.1 -9.9,21.9 -22,21.9H377.2c-12.1,0 -22,9.8 -22,21.9c0,12.1 9.8,21.9 22,21.9h131.8c36.3,0 65.9,-29.4 65.9,-65.8V399.1C574.9,387 565,377.1 552.9,377.1z"/>
7   - <path android:fillColor="#1296DB" android:pathData="M509,4.4H377.2c-12.1,0 -21.9,9.8 -22,21.9c0,12.1 9.8,22 22,22h131.8c12.1,0 21.9,9.9 21.9,21.9v109.6c0,12.1 9.9,22 22,22c12.1,0 22,-9.9 22,-22V70.2C574.9,33.9 545.3,4.4 509,4.4z"/>
  1 +<vector xmlns:android="http://schemas.android.com/apk/res/android"
  2 + xmlns:aapt="http://schemas.android.com/aapt"
  3 + android:width="205.9dp"
  4 + android:height="191.2dp"
  5 + android:viewportHeight="191.2"
  6 + android:viewportWidth="205.9">
  7 + <path
  8 + android:fillColor="#999999"
  9 + android:pathData="M198.6 103H7.4C3.3 103 0 99.7 0 95.6c0 -4.1 3.3 -7.4 7.4 -7.4h191.2c4.1 0 7.4 3.3 7.4 7.4C205.9 99.7 202.6 103 198.6 103L198.6 103zM176.5 191.2h-44.1c-4.1 0 -7.4 -3.3 -7.4 -7.4c0 -4.1 3.3 -7.4 7.4 -7.4h44.1c4.1 0 7.3 -3.3 7.4 -7.4v-36.8c0 -4.1 3.3 -7.4 7.4 -7.4c4.1 0 7.4 3.3 7.4 7.4v36.8C198.5 181.3 188.7 191.2 176.5 191.2zM66.2 191.2H29.4c-12.2 0 -22 -9.9 -22.1 -22.1v-36.8c0 -4.1 3.3 -7.4 7.4 -7.4c4.1 0 7.4 3.3 7.4 7.4v36.8c0 4.1 3.3 7.3 7.4 7.4h36.8c4.1 0 7.4 3.3 7.4 7.4C73.5 187.9 70.2 191.2 66.2 191.2L66.2 191.2zM14.7 66.2c-4.1 0 -7.3 -3.3 -7.4 -7.4V22.1C7.4 9.9 17.2 0 29.4 0h36.8c4.1 0 7.4 3.3 7.4 7.4c0 4.1 -3.3 7.4 -7.4 7.4H29.4c-4.1 0 -7.3 3.3 -7.4 7.4v36.8C22.1 62.9 18.8 66.2 14.7 66.2L14.7 66.2zM191.2 66.2c-4.1 0 -7.4 -3.3 -7.4 -7.3v0V22.1c0 -4.1 -3.3 -7.3 -7.4 -7.3h-44.1c-4.1 0 -7.4 -3.3 -7.4 -7.4c0 -4.1 3.3 -7.4 7.4 -7.4h44.1c12.2 0 22 9.9 22.1 22.1v36.8C198.6 62.9 195.3 66.2 191.2 66.2L191.2 66.2L191.2 66.2z" />
8 10 </vector>
... ...
C5/app/src/main/res/drawable/service_server.xml
  View file @3bef699
1   -<vector android:height="50dp" android:viewportHeight="1024.0"
2   - android:viewportWidth="1024.0" android:width="50dp" xmlns:android="http://schemas.android.com/apk/res/android">
3   - <path android:fillColor="#1296db" android:pathData="M428.8,272c83.2,-44.8 195.2,-147.2 195.2,-147.2 76.8,176 156.8,185.6 166.4,176 -22.4,-188.8 -156.8,-252.8 -179.2,-265.6 -73.6,-35.2 -192,-9.6 -214.4,0C224,121.6 211.2,284.8 214.4,307.2c54.4,16 160,-6.4 214.4,-35.2zM163.2,505.6c25.6,80 89.6,28.8 99.2,12.8 -16,-19.2 -28.8,-54.4 -32,-76.8 -6.4,-25.6 -9.6,-83.2 -9.6,-83.2 -9.6,-16 -48,-3.2 -54.4,0 -44.8,12.8 -22.4,76.8 -22.4,76.8s12.8,48 19.2,70.4zM764.8,441.6c-6.4,25.6 -19.2,54.4 -32,73.6 9.6,16 73.6,67.2 99.2,-12.8 6.4,-22.4 22.4,-70.4 22.4,-70.4s22.4,-64 -22.4,-76.8c-6.4,-3.2 -44.8,-16 -54.4,0 -3.2,3.2 -9.6,73.6 -12.8,86.4zM665.6,633.6c-28.8,54.4 -89.6,92.8 -156.8,92.8s-128,-38.4 -156.8,-92.8c-22.4,9.6 -41.6,19.2 -64,28.8 0,3.2 51.2,99.2 70.4,112 16,3.2 86.4,3.2 86.4,3.2s51.2,-48 121.6,-16c0,0 64,41.6 6.4,96 -19.2,19.2 -80,28.8 -124.8,-6.4 -9.6,-3.2 -105.6,-12.8 -108.8,-19.2 -51.2,-51.2 -92.8,-108.8 -108.8,-137.6 -89.6,70.4 -153.6,172.8 -172.8,291.2h896c-22.4,-160 -134.4,-294.4 -288,-352z"/>
4   -</vector>
  1 +<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
  2 + android:viewportWidth="218.6"
  3 + android:viewportHeight="226.8"
  4 + android:width="218.6dp"
  5 + android:height="226.8dp">
  6 + <path
  7 + android:pathData="M47.8 160.9c20.1 15.5 40.2 20.4 62.4 20.4c22.3 0 46.3 -9.2 61.4 -22.3c19.1 10.8 36.1 35.1 36.4 58.7H10.9C13.7 189.7 32.5 169.5 47.8 160.9L47.8 160.9zM170.3 148.5c-16.1 15.3 -37.6 24.6 -61.3 24.6c-23.7 0 -45.3 -9.3 -61.3 -24.5C18.9 163.6 0 190.4 0 226.8h218.6C218.6 190.4 199.4 163.5 170.3 148.5L170.3 148.5zM37.9 115.4V57.7l-2.4 0.1C48.2 29.4 76.3 9.6 109 9.6c32.6 0 60.7 19.7 73.3 48.2l-2.3 -0.1v57.7c15.6 0 28.4 -12.9 28.4 -28.8c0 -10.9 -5.9 -20.3 -14.6 -25.3C181.7 25.6 148.3 0 109 0C69.6 0 36.3 25.6 24 61.3c-8.7 5 -14.5 14.4 -14.5 25.3C9.5 102.5 22.2 115.4 37.9 115.4L37.9 115.4zM108.9 143.4c-28.4 0 -51.4 -23.4 -51.4 -52.2c0 -28.8 24.4 -52.2 51.4 -52.2c28.3 0 51.3 23.4 51.3 52.2C160.1 120.1 137.2 143.4 108.9 143.4L108.9 143.4zM109 28.9c-34 0 -61.5 28 -61.5 62.5C47.4 126 75 154 109 154c33.9 0 61.4 -28 61.4 -62.6C170.4 56.9 142.9 28.9 109 28.9L109 28.9zM109 28.9"
  8 + android:fillColor="#C8C8C8" />
  9 +</vector>
5 10 \ No newline at end of file
... ...
C5/app/src/main/res/layout/activity_main.xml
  View file @3bef699
... ... @@ -23,8 +23,8 @@
23 23  
24 24 <ImageView
25 25 android:id="@+id/service"
26   - android:layout_width="50dp"
27   - android:layout_height="50dp"
  26 + android:layout_width="40dp"
  27 + android:layout_height="40dp"
28 28 android:layout_alignParentRight="true"
29 29 android:layout_alignParentTop="true"
30 30 android:layout_marginRight="20dp"
... ...
C5/app/src/main/res/layout/fragment_multi_title.xml
  View file @3bef699
... ... @@ -8,10 +8,12 @@
8 8 android:id="@+id/line_panel"
9 9 android:layout_width="match_parent"
10 10 android:layout_height="wrap_content"
11   - android:layout_marginLeft="20dp"
12   - android:layout_marginRight="40dp"
13   - android:layout_marginTop="30dp"
14   - android:orientation="horizontal">
  11 + android:background="@color/red"
  12 + android:orientation="horizontal"
  13 + android:paddingBottom="20dp"
  14 + android:paddingLeft="20dp"
  15 + android:paddingRight="80dp"
  16 + android:paddingTop="20dp">
15 17  
16 18 <TextView
17 19 android:id="@+id/multivote_title"
... ... @@ -20,12 +22,13 @@
20 22 android:layout_gravity="center_vertical"
21 23 android:layout_weight="1"
22 24 android:text="@string/sunvote_no_paper"
  25 + android:textColor="@color/white"
23 26 android:textSize="@dimen/big_text_p4" />
24 27  
25 28 <TextView
26 29 android:id="@+id/multi_title_btn_agree_all"
27 30 android:layout_width="@dimen/inner_button_width"
28   - android:layout_height="50dp"
  31 + android:layout_height="40dp"
29 32 android:layout_marginLeft="30dp"
30 33 android:background="@drawable/agree_selector"
31 34 android:gravity="center"
... ... @@ -37,7 +40,7 @@
37 40 <TextView
38 41 android:id="@+id/multi_title_btn_oppose_all"
39 42 android:layout_width="@dimen/inner_button_width"
40   - android:layout_height="50dp"
  43 + android:layout_height="40dp"
41 44 android:layout_marginLeft="10dp"
42 45 android:background="@drawable/oppos_selector"
43 46 android:gravity="center"
... ... @@ -49,7 +52,7 @@
49 52 <TextView
50 53 android:id="@+id/multi_title_btn_abstain_all"
51 54 android:layout_width="@dimen/inner_button_width"
52   - android:layout_height="50dp"
  55 + android:layout_height="40dp"
53 56 android:layout_marginLeft="@dimen/inner_button_margin"
54 57 android:background="@drawable/signin_selector"
55 58 android:gravity="center"
... ... @@ -63,10 +66,10 @@
63 66 android:id="@+id/multivote_pannal_bottom"
64 67 android:layout_width="match_parent"
65 68 android:layout_height="80dp"
  69 + android:paddingTop="20dp"
66 70 android:layout_alignParentBottom="true"
67 71 android:alpha="0.9"
68   - android:background="@drawable/gray_alpha"
69   - android:visibility="visible">
  72 + android:background="@drawable/gray_alpha">
70 73  
71 74 <TextView
72 75 android:id="@+id/multivote_info"
... ... @@ -77,41 +80,12 @@
77 80 android:text="@string/should_vote"
78 81 android:textSize="@dimen/big_text_p4" />
79 82  
80   - <View
81   - android:id="@+id/multivote_page"
82   - android:layout_width="40dp"
83   - android:layout_height="20dp"
84   - android:layout_centerInParent="true"
85   - android:visibility="invisible" />
86   -
87   - <Button
88   - android:id="@+id/multivote_pageup"
89   - android:layout_width="wrap_content"
90   - android:layout_height="wrap_content"
91   - android:layout_centerVertical="true"
92   - android:layout_toLeftOf="@id/multivote_page"
93   - android:background="@drawable/page_selector"
94   - android:text="@string/page_up"
95   - android:textSize="@dimen/big_text_p5" />
96   -
97   - <Button
98   - android:id="@+id/multivote_pagedown"
99   - android:layout_width="wrap_content"
100   - android:layout_height="wrap_content"
101   - android:layout_centerVertical="true"
102   - android:layout_toRightOf="@id/multivote_page"
103   - android:background="@drawable/page_selector"
104   - android:text="@string/page_down"
105   - android:textSize="@dimen/big_text_p5" />
106   -
107 83 <Button
108 84 android:id="@+id/multivote_btn_submit"
109 85 android:layout_width="wrap_content"
110 86 android:layout_height="wrap_content"
111   - android:layout_alignParentRight="true"
112   - android:layout_centerVertical="true"
113   - android:layout_marginRight="20dp"
114   - android:background="@drawable/signin_selector"
  87 + android:layout_centerInParent="true"
  88 + android:background="@drawable/oppos_selector"
115 89 android:text="@string/confirm_submit"
116 90 android:textColor="@color/white"
117 91 android:textSize="@dimen/big_text_p4"
... ... @@ -121,9 +95,7 @@
121 95 android:id="@+id/multivote_btn_modify"
122 96 android:layout_width="wrap_content"
123 97 android:layout_height="wrap_content"
124   - android:layout_alignParentRight="true"
125   - android:layout_centerVertical="true"
126   - android:layout_marginRight="20dp"
  98 + android:layout_centerInParent="true"
127 99 android:background="@drawable/signin_selector"
128 100 android:text="@string/modify"
129 101 android:textColor="@color/white"
... ... @@ -138,14 +110,48 @@
138 110 android:layout_height="fill_parent"
139 111 android:layout_above="@id/multivote_pannal_bottom"
140 112 android:layout_below="@id/line_panel"
141   - android:layout_marginBottom="@dimen/content_margin"
142   - android:layout_marginLeft="@dimen/content_margin"
143   - android:layout_marginRight="@dimen/content_margin"
144 113 android:layout_marginTop="@dimen/content_margin"
145 114 android:divider="@color/votebakground"
146 115 android:dividerHeight="8dp"
147 116 android:fastScrollEnabled="false"></ListView>
148 117  
  118 + <LinearLayout
  119 + android:layout_width="40dp"
  120 + android:layout_height="150dp"
  121 + android:layout_alignParentRight="true"
  122 + android:layout_centerVertical="true"
  123 + android:layout_marginBottom="50dp"
  124 + android:layout_marginRight="20dp"
  125 + android:layout_marginTop="50dp"
  126 + android:background="@drawable/right_control"
  127 + android:orientation="vertical">
  128 +
  129 + <ImageView
  130 + android:id="@+id/multivote_pageup"
  131 + android:layout_width="wrap_content"
  132 + android:layout_height="0dp"
  133 + android:padding="10dp"
  134 + android:layout_weight="1"
  135 + android:src="@drawable/page_up" />
  136 +
  137 + <ImageView
  138 + android:id="@+id/multivote_pagedown"
  139 + android:layout_width="wrap_content"
  140 + android:layout_height="0dp"
  141 + android:layout_weight="1"
  142 + android:padding="10dp"
  143 + android:src="@drawable/page_down" />
  144 +
  145 + <ImageView
  146 + android:id="@+id/multivote_pageend"
  147 + android:layout_width="wrap_content"
  148 + android:layout_height="0dp"
  149 + android:layout_weight="1"
  150 + android:padding="10dp"
  151 + android:src="@drawable/page_frist" />
  152 +
  153 + </LinearLayout>
  154 +
149 155 <RelativeLayout
150 156 android:id="@+id/multivote_confirm_panel"
151 157 android:layout_width="match_parent"
... ...
C5/app/src/main/res/layout/fragment_singlevote.xml
  View file @3bef699
... ... @@ -11,6 +11,7 @@
11 11 android:background="#AC1007">
12 12  
13 13 <TextView
  14 + android:id="@+id/votetype"
14 15 android:layout_width="wrap_content"
15 16 android:layout_height="match_parent"
16 17 android:layout_marginLeft="25dp"
... ... @@ -138,10 +139,12 @@
138 139 android:src="@drawable/detail_icon" />
139 140  
140 141 <RelativeLayout
  142 + android:id="@+id/singlevote_tv_tips_layout"
141 143 android:layout_width="match_parent"
142 144 android:layout_height="50dp"
143 145 android:layout_alignParentBottom="true"
144   - android:background="#FFF134">
  146 + android:background="#FFF134"
  147 + android:visibility="gone">
145 148  
146 149 <TextView
147 150 android:id="@+id/singlevote_tv_tips"
... ...
C5/app/src/main/res/layout/list_multi_title_item.xml
  View file @3bef699
... ... @@ -3,27 +3,29 @@
3 3 android:layout_width="fill_parent"
4 4 android:layout_height="fill_parent"
5 5 android:layout_marginBottom="1dp"
6   - android:layout_marginTop="1dp">
  6 + android:layout_marginTop="1dp"
  7 + android:paddingRight="70dp"
  8 + android:background="@color/white">
7 9  
8 10 <LinearLayout
9 11 android:id="@+id/line_panel"
10 12 android:layout_width="match_parent"
11 13 android:layout_height="wrap_content"
12   - android:paddingLeft="@dimen/content_margin"
13   - android:paddingRight="@dimen/content_margin"
14   - android:paddingTop="@dimen/inner_button_margin"
15   - android:paddingBottom="@dimen/inner_button_margin"
16   - android:orientation="horizontal"
17   - android:background="@color/white">
  14 + android:orientation="horizontal">
18 15  
19 16 <TextView
20 17 android:id="@+id/list_multivote_item_num"
21 18 android:layout_width="wrap_content"
22 19 android:layout_height="wrap_content"
23   - android:gravity="center_vertical"
  20 + android:layout_marginLeft="15dp"
  21 + android:layout_marginTop="5dp"
  22 + android:layout_marginBottom="5dp"
  23 + android:background="@drawable/bh_cicle"
  24 + android:gravity="center"
  25 + android:lines="1"
24 26 android:text="1"
25   - android:textColor="@color/black"
26   - android:textSize="@dimen/big_text_p3" />
  27 + android:textColor="@color/white"
  28 + android:textSize="@dimen/big_text_p4" />
27 29  
28 30 <TextView
29 31 android:id="@+id/list_multivote_item_content"
... ... @@ -31,35 +33,29 @@
31 33 android:layout_height="wrap_content"
32 34 android:layout_marginLeft="10dp"
33 35 android:layout_weight="1"
  36 + android:ellipsize="end"
34 37 android:gravity="center_vertical"
  38 + android:lines="2"
  39 + android:paddingBottom="10dp"
35 40 android:text="@string/content"
36 41 android:textColor="@color/black"
37   - android:textSize="@dimen/big_text_p4"
38   - android:paddingBottom="10dp"/>
  42 + android:textSize="@dimen/big_text_p4" />
  43 + </LinearLayout>
39 44  
40   - <TextView
41   - android:id="@+id/list_multivote_item_tv_result"
42   - android:layout_width="@dimen/inner_button_width"
43   - android:layout_height="40dp"
44   - android:layout_marginLeft="10dp"
45   - android:layout_marginRight="20dp"
46   - android:layout_marginTop="10dp"
47   - android:layout_marginBottom="25dp"
48   - android:alpha="0.9"
49   - android:background="@drawable/voted_empty"
50   - android:gravity="center"
51   - android:rotation="-15"
52   - android:src="@drawable/agree_small"
53   - android:textColor="#ddff9933"
54   - android:textSize="@dimen/big_text_p4"
55   - android:textStyle="bold" />
  45 + <LinearLayout
  46 + android:layout_width="wrap_content"
  47 + android:layout_height="wrap_content"
  48 + android:layout_alignParentRight="true"
  49 + android:layout_below="@id/line_panel"
  50 + android:orientation="horizontal"
  51 + android:layout_marginBottom="10dp">
56 52  
57 53 <TextView
58 54 android:id="@+id/list_multivote_item_btnvote1"
59 55 android:layout_width="@dimen/inner_button_width"
60 56 android:layout_height="40dp"
61   - android:background="@drawable/agree_selector"
62 57 android:layout_marginLeft="@dimen/inner_button_margin"
  58 + android:background="@drawable/agree_selector"
63 59 android:gravity="center"
64 60 android:text="@string/agree"
65 61 android:textColor="@color/white"
... ... @@ -91,7 +87,19 @@
91 87 android:textColor="@color/white"
92 88 android:textSize="@dimen/big_text_p4"
93 89 android:textStyle="bold" />
94   -
95 90 </LinearLayout>
96 91  
  92 + <TextView
  93 + android:id="@+id/list_multivote_item_tv_result"
  94 + android:layout_width="150dp"
  95 + android:layout_centerInParent="true"
  96 + android:layout_height="60dp"
  97 + android:alpha="0.9"
  98 + android:background="@drawable/voted_empty"
  99 + android:gravity="center"
  100 + android:rotation="-15"
  101 + android:src="@drawable/agree_small"
  102 + android:textColor="#ddff9933"
  103 + android:textSize="@dimen/big_text_p4"
  104 + android:textStyle="bold" />
97 105 </RelativeLayout>
... ...
C5/app/src/main/res/values/strings.xml
  View file @3bef699
... ... @@ -152,6 +152,9 @@
152 152 <!-- TODO: Remove or change this placeholder text -->
153 153 <string name="hello_blank_fragment">Hello blank fragment</string>
154 154  
  155 + <string name="yianbiaojue">议案表决</string>
  156 + <string name="yianceping">议案测评</string>
  157 + <string name="yianxuanju">议案选举</string>
155 158  
156 159 <string name="title_license">免责声明与软件许可协议</string>
157 160 <string name="know">已阅读</string>
... ...
C5/xpadprotocal/build/libs/xpadprotocal.jar
View file @3bef699
No preview for this file type