孙向锦 / VoteC5

Commit 5520773074b138acd1f7ed098042c24ee38befb1

Authored by 孙向锦
1 parent 36cce4cb

批次表決UI修改

Inline Side-by-side
Showing 13 changed files with 235 additions and 105 deletions
C5/app/src/main/java/com/sunvote/xpadapp/MainActivity.java
  View file @5520773
... ... @@ -1733,7 +1733,6 @@ public class MainActivity extends BaseActivity implements ComListener {
1733 1733 return;
1734 1734 }
1735 1735 if ((data[0] & 0xff) == 0xF2 && data[1] == 20) {
1736   -
1737 1736 if (tmpMulResultBuffer != null && Arrays.equals(buf, tmpMulResultBuffer)) {
1738 1737 Log.e(TAG, "onMultiPackageData same data,abort");
1739 1738 return;
... ...
C5/app/src/main/java/com/sunvote/xpadapp/dialog/ToastAlertDialog.java 0 → 100644
  View file @5520773
  1 +package com.sunvote.xpadapp.dialog;
  2 +
  3 +import android.app.AlertDialog;
  4 +import android.content.Context;
  5 +import android.os.Handler;
  6 +import android.os.Looper;
  7 +import android.view.LayoutInflater;
  8 +import android.view.View;
  9 +import android.view.WindowManager;
  10 +import android.widget.TextView;
  11 +
  12 +import com.sunvote.xpadapp.R;
  13 +
  14 +public class ToastAlertDialog {
  15 +
  16 + private AlertDialog dialog;
  17 + private AlertDialog.Builder builder;
  18 + private TextView messageView ;
  19 + private TextView confirm;
  20 + private Handler handler;
  21 +
  22 + public ToastAlertDialog setMessage(CharSequence message) {
  23 + messageView.setText(message);
  24 + return this;
  25 + }
  26 +
  27 + public ToastAlertDialog(Context context){
  28 + builder = new AlertDialog.Builder(context);
  29 + handler = new Handler(Looper.getMainLooper());
  30 + builder.setCancelable(true);
  31 + View rootView = LayoutInflater.from(context).inflate(R.layout.toast_dialog,null);
  32 + messageView = rootView.findViewById(R.id.message);
  33 + confirm = rootView.findViewById(R.id.confirm);
  34 + rootView.setOnClickListener(new View.OnClickListener() {
  35 + @Override
  36 + public void onClick(View v) {
  37 + if(dialog != null){
  38 + dialog.dismiss();
  39 + }
  40 + }
  41 + });
  42 + builder.setView(rootView);
  43 + }
  44 +
  45 + Runnable close = new Runnable() {
  46 + @Override
  47 + public void run() {
  48 + if(dialog != null){
  49 + dialog.dismiss();
  50 + }
  51 + }
  52 + };
  53 +
  54 + public void show(){
  55 + if(dialog == null){
  56 + dialog = builder.create();
  57 + }
  58 + WindowManager.LayoutParams lp= dialog.getWindow().getAttributes();
  59 + lp.width=750;
  60 + lp.height=380;
  61 + lp.alpha = 0.6f;
  62 + dialog.getWindow().setAttributes(lp);
  63 + dialog.show();
  64 + handler.postDelayed(close,2000);
  65 + }
  66 +
  67 + public static ToastAlertDialog makeText(Context context, CharSequence text){
  68 + return new ToastAlertDialog(context).setMessage(text);
  69 + }
  70 +}
... ...
C5/app/src/main/java/com/sunvote/xpadapp/fragments/MultiTitleFragment.java
  View file @5520773
... ... @@ -20,7 +20,6 @@ import android.widget.Button;
20 20 import android.widget.ListView;
21 21 import android.widget.RelativeLayout;
22 22 import android.widget.TextView;
23   -import android.widget.Toast;
24 23  
25 24 import com.sunvote.util.LogUtil;
26 25 import com.sunvote.xpadapp.MainActivity;
... ... @@ -28,6 +27,7 @@ import com.sunvote.xpadapp.R;
28 27 import com.sunvote.xpadapp.base.BaseFragment;
29 28 import com.sunvote.xpadapp.db.modal.BillInfo;
30 29 import com.sunvote.xpadapp.db.modal.MultiTitleItem;
  30 +import com.sunvote.xpadapp.dialog.ToastAlertDialog;
31 31 import com.sunvote.xpadapp.fragments.MutilTitleDetailFragment.TitleVoteOnBack;
32 32 import com.sunvote.xpadapp.utils.SharedPreferencesUtil;
33 33 import com.sunvote.xpadcomm.XPadApi;
... ... @@ -136,7 +136,7 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack
136 136 int remain = aryContent.size() - votedCount;
137 137 if (voteInfo.less == 1) {// 不可缺选
138 138 if (remain > 0) {
139   - Toast.makeText(mMainActivity, "您还有" + remain + "项未表决", Toast.LENGTH_SHORT).show();
  139 + ToastAlertDialog.makeText(mMainActivity, "您还有" + remain + "项未表决").show();
140 140 return;
141 141 }
142 142 if (voteInfo.mode2_modify == 1) {
... ... @@ -172,6 +172,7 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack
172 172 public void onClick(View v) {
173 173 // mMainActivity.presenter.cancelSubmitVoteAllOK();
174 174 showVote(true);
  175 + tvInfoLayout.setVisibility(View.GONE);
175 176 }
176 177 });
177 178  
... ... @@ -410,6 +411,17 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack
410 411 tvInfoLayout.setVisibility(View.VISIBLE);
411 412 // tvInfo.setText(getString(R.string.submited_no_modify));
412 413 }
  414 + if(voteInfo.mode3_secret != 0){
  415 + for (int i = 0; i < aryContent.size(); i++) {
  416 + try {
  417 + MultiTitleItem it = aryContent.get(i);
  418 + it.result = 0;
  419 + } catch (Exception ex) {
  420 + }
  421 + }
  422 + mAdapter.notifyDataSetChanged();
  423 +
  424 + }
413 425 }
414 426  
415 427 /*
... ...
C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultMultiVoteFragment.java
  View file @5520773
... ... @@ -11,6 +11,7 @@ import com.sunvote.xpadcomm.XPadApiInterface.VoteInfo;
11 11  
12 12 import android.annotation.SuppressLint;
13 13 import android.content.Context;
  14 +import android.graphics.Color;
14 15 import android.os.Bundle;
15 16 import android.view.LayoutInflater;
16 17 import android.view.View;
... ... @@ -109,6 +110,12 @@ public class ResultMultiVoteFragment extends SuperBaseFragment {
109 110 return view;
110 111 }
111 112  
  113 + @Override
  114 + public void onResume() {
  115 + super.onResume();
  116 + ((MainActivity)getActivity()).setBackgroundColor(Color.parseColor("#042148"));
  117 + }
  118 +
112 119 private void initData() {
113 120  
114 121 int bitNum = data[2] & 0xf;
... ... @@ -325,7 +332,11 @@ public class ResultMultiVoteFragment extends SuperBaseFragment {
325 332 } else {
326 333 holder = (ViewHolder) convertView.getTag();
327 334 }
328   -
  335 + if(position % 2 == 0){
  336 + convertView.setBackgroundColor(Color.parseColor("#084AA3"));
  337 + }else{
  338 + convertView.setBackgroundResource(0);
  339 + }
329 340  
330 341  
331 342 ListItem it = aryContent.get(position);
... ...
C5/app/src/main/res/drawable-xxhdpi/btn_modify_disable.xml 0 → 100644
  View file @5520773
  1 +<vector android:height="24dp" android:viewportHeight="120"
  2 + android:viewportWidth="500" android:width="100dp" xmlns:android="http://schemas.android.com/apk/res/android">
  3 + <path android:fillColor="@color/darkgrey" android:pathData="M490,120H10c-5.5,0 -10,-4.5 -10,-10V10C0,4.5 4.5,0 10,0h480c5.5,0 10,4.5 10,10v100C500,115.5 495.5,120 490,120z"/>
  4 +</vector>
... ...
C5/app/src/main/res/drawable-xxhdpi/btn_modify_enable.xml 0 → 100644
  View file @5520773
  1 +<vector android:height="24dp" android:viewportHeight="120"
  2 + android:viewportWidth="500" android:width="100dp" xmlns:android="http://schemas.android.com/apk/res/android">
  3 + <path android:fillColor="#00964D" android:pathData="M490,120H10c-5.5,0 -10,-4.5 -10,-10V10C0,4.5 4.5,0 10,0h480c5.5,0 10,4.5 10,10v100C500,115.5 495.5,120 490,120z"/>
  4 +</vector>
... ...
C5/app/src/main/res/drawable-xxhdpi/modify_selector_new.xml 0 → 100644
  View file @5520773
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<selector xmlns:android="http://schemas.android.com/apk/res/android" >
  3 +
  4 + <!-- 点击后的颜色 -->
  5 + <item android:state_pressed="true" android:drawable="@drawable/btn_modify_disable"/>
  6 + <item android:state_focused="true" android:drawable="@drawable/btn_modify_enable"/>
  7 +
  8 + <item android:state_enabled="false" android:drawable="@drawable/btn_modify_disable"/>
  9 + <!-- 默认 -->
  10 + <item android:drawable="@drawable/btn_modify_enable"/>
  11 +
  12 +</selector>
... ...
C5/app/src/main/res/drawable/modify_selector.xml
  View file @5520773
... ... @@ -4,8 +4,6 @@
4 4 <!-- 点击后的颜色 -->
5 5 <item android:state_pressed="true" android:drawable="@drawable/btn_modify_s"/>
6 6 <item android:state_focused="true" android:drawable="@drawable/btn_modify_s"/>
7   -
8   -
9 7 <!-- 默认 -->
10 8 <item android:drawable="@drawable/btn_modify"/>
11 9  
... ...
C5/app/src/main/res/layout/fragment_multi_title.xml
  View file @5520773
... ... @@ -87,7 +87,7 @@
87 87 android:layout_width="@dimen/px420dp"
88 88 android:layout_height="@dimen/px110dp"
89 89 android:layout_centerInParent="true"
90   - android:background="@drawable/signin_selector"
  90 + android:background="@drawable/modify_selector_new"
91 91 android:text="@string/modify"
92 92 android:textColor="@color/white"
93 93 android:textSize="@dimen/px60dp"
... ...
C5/app/src/main/res/layout/fragment_result_multi_vote.xml
  View file @5520773
... ... @@ -2,7 +2,7 @@
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  
7 7 <LinearLayout
8 8 android:id="@+id/multi_vote_result_top_panal"
... ... @@ -27,19 +27,66 @@
27 27 android:layout_weight="1"
28 28 android:gravity="center"
29 29 android:textColor="@color/white"
30   - android:textSize="@dimen/big_text_p3"
  30 + android:textSize="@dimen/px80dp"
31 31 android:maxLines="2"
32 32 android:ellipsize="end"
33 33 android:textStyle="bold" />
34 34 </LinearLayout>
  35 + <LinearLayout
  36 + android:id="@+id/yingdao_layout"
  37 + android:layout_below="@id/multi_vote_result_top_panal"
  38 + android:layout_width="@dimen/px675dp"
  39 + android:layout_height="wrap_content"
  40 + android:layout_centerHorizontal="true"
  41 + android:layout_marginTop="@dimen/px40dp"
  42 + android:orientation="horizontal">
35 43  
  44 + <TextView
  45 + android:layout_width="wrap_content"
  46 + android:layout_height="wrap_content"
  47 + android:layout_weight="1"
  48 + android:text="@string/yindao1"
  49 + android:textColor="@color/white"
  50 + android:textSize="@dimen/px60dp"
  51 + android:textStyle="bold" />
  52 +
  53 + <TextView
  54 + android:id="@+id/multi_vote_result_yindao"
  55 + android:layout_width="wrap_content"
  56 + android:layout_height="wrap_content"
  57 + android:layout_weight="1"
  58 + android:text="150"
  59 + android:textColor="@color/white"
  60 + android:textSize="@dimen/px60dp" />
  61 +
  62 + <TextView
  63 + android:layout_width="wrap_content"
  64 + android:layout_height="wrap_content"
  65 + android:layout_weight="1"
  66 + android:text="@string/shidao1"
  67 + android:textColor="@color/white"
  68 + android:textSize="@dimen/px60dp"
  69 + android:gravity="center_vertical|right"
  70 + android:textStyle="bold" />
  71 +
  72 + <TextView
  73 + android:id="@+id/multi_vote_result_shidao"
  74 + android:layout_width="wrap_content"
  75 + android:layout_height="wrap_content"
  76 + android:layout_weight="1"
  77 + android:text="150"
  78 + android:gravity="center_vertical|right"
  79 + android:textColor="@color/white"
  80 + android:textSize="@dimen/px60dp" />
  81 +
  82 + </LinearLayout>
36 83 <LinearLayout
37 84 android:id="@+id/multi_vote_result_title_panel"
38 85 android:layout_width="fill_parent"
39 86 android:layout_height="wrap_content"
40   - android:layout_below="@id/multi_vote_result_top_panal"
  87 + android:layout_below="@id/yingdao_layout"
41 88 android:paddingRight="80dp"
42   - android:layout_marginTop="10dp"
  89 + android:layout_marginTop="@dimen/px60dp"
43 90 android:orientation="horizontal">
44 91  
45 92 <TextView
... ... @@ -49,10 +96,10 @@
49 96 android:layout_marginLeft="5dp"
50 97 android:gravity="center"
51 98 android:layout_centerVertical="true"
52   - android:textColor="@color/yellow"
53   - android:textSize="@dimen/big_text_p4"
  99 + android:textColor="@color/white"
  100 + android:textSize="@dimen/px48dp"
54 101 android:textStyle="bold"
55   - android:text="序号"/>
  102 + android:text=""/>
56 103  
57 104 <TextView
58 105 android:id="@+id/multi_vote_result_title_name"
... ... @@ -61,9 +108,10 @@
61 108 android:layout_centerVertical="true"
62 109 android:layout_weight="1"
63 110 android:gravity="center"
64   - android:textColor="@color/yellow"
65   - android:text="表决项"
66   - android:textSize="@dimen/big_text_p4"
  111 + android:textColor="@color/white"
  112 + android:layout_marginLeft="10dp"
  113 + android:text=""
  114 + android:textSize="@dimen/px48dp"
67 115 android:textStyle="bold" />
68 116  
69 117 <TextView
... ... @@ -74,8 +122,8 @@
74 122 android:layout_marginLeft="15dp"
75 123 android:gravity="center"
76 124 android:text="@string/agree"
77   - android:textColor="@color/yellow"
78   - android:textSize="@dimen/big_text_p4"
  125 + android:textColor="@color/white"
  126 + android:textSize="@dimen/px48dp"
79 127 android:textStyle="bold" />
80 128  
81 129 <TextView
... ... @@ -85,8 +133,8 @@
85 133 android:layout_marginLeft="15dp"
86 134 android:gravity="center"
87 135 android:text="@string/oppose"
88   - android:textColor="@color/yellow"
89   - android:textSize="@dimen/big_text_p4"
  136 + android:textColor="@color/white"
  137 + android:textSize="@dimen/px48dp"
90 138 android:textStyle="bold" />
91 139  
92 140 <TextView
... ... @@ -96,8 +144,8 @@
96 144 android:layout_marginLeft="15dp"
97 145 android:gravity="center"
98 146 android:text="@string/abstant"
99   - android:textColor="@color/yellow"
100   - android:textSize="@dimen/big_text_p4"
  147 + android:textColor="@color/white"
  148 + android:textSize="@dimen/px48dp"
101 149 android:textStyle="bold" />
102 150  
103 151 <TextView
... ... @@ -107,83 +155,24 @@
107 155 android:layout_marginLeft="15dp"
108 156 android:gravity="center"
109 157 android:text="@string/unvote"
110   - android:textColor="@color/yellow"
111   - android:textSize="@dimen/big_text_p4"
  158 + android:textColor="@color/white"
  159 + android:textSize="@dimen/px48dp"
112 160 android:textStyle="bold" />
113 161  
114 162 <TextView
115 163 android:id="@+id/multi_vote_result_title_result"
116   - android:layout_width="80dp"
  164 + android:layout_width="100dp"
117 165 android:layout_height="wrap_content"
118 166 android:layout_centerVertical="true"
119 167 android:layout_marginLeft="15dp"
120 168 android:gravity="center"
121 169 android:text="@string/result"
122   - android:textColor="@color/yellow"
123   - android:textSize="@dimen/big_text_p4"
  170 + android:textColor="@color/white"
  171 + android:textSize="@dimen/px48dp"
124 172 android:textStyle="bold" />
125 173 </LinearLayout>
126 174  
127   - <RelativeLayout
128   - android:id="@+id/bottom_linear"
129   - android:layout_width="match_parent"
130   - android:layout_height="wrap_content"
131   - android:layout_alignParentBottom="true"
132   - android:layout_centerHorizontal="true"
133   - android:layout_marginBottom="20dp">
134 175  
135   - <LinearLayout
136   - android:layout_width="800dp"
137   - android:layout_height="wrap_content"
138   - android:layout_centerHorizontal="true"
139   - android:orientation="horizontal">
140   -
141   - <TextView
142   - android:layout_width="wrap_content"
143   - android:layout_height="wrap_content"
144   - android:layout_weight="1"
145   - android:gravity="right"
146   - android:text="@string/yindao1"
147   - android:textColor="@color/yellow"
148   - android:textSize="@dimen/big_text_p3"
149   - android:textStyle="bold" />
150   -
151   - <TextView
152   - android:id="@+id/multi_vote_result_yindao"
153   - android:layout_width="wrap_content"
154   - android:layout_height="wrap_content"
155   - android:layout_marginLeft="10dp"
156   - android:layout_marginRight="60dp"
157   - android:layout_weight="1"
158   - android:gravity="left"
159   - android:text="150"
160   - android:textColor="@color/white"
161   - android:textSize="@dimen/big_text_p3" />
162   -
163   - <TextView
164   - android:layout_width="wrap_content"
165   - android:layout_height="wrap_content"
166   - android:layout_marginLeft="60dp"
167   - android:layout_weight="1"
168   - android:gravity="right"
169   - android:text="@string/shidao1"
170   - android:textColor="@color/yellow"
171   - android:textSize="@dimen/big_text_p3"
172   - android:textStyle="bold" />
173   -
174   - <TextView
175   - android:id="@+id/multi_vote_result_shidao"
176   - android:layout_width="wrap_content"
177   - android:layout_height="wrap_content"
178   - android:layout_marginLeft="10dp"
179   - android:layout_weight="1"
180   - android:gravity="left"
181   - android:text="150"
182   - android:textColor="@color/white"
183   - android:textSize="@dimen/big_text_p3" />
184   -
185   - </LinearLayout>
186   - </RelativeLayout>
187 176  
188 177  
189 178  
... ... @@ -192,9 +181,8 @@
192 181 android:layout_width="fill_parent"
193 182 android:layout_height="fill_parent"
194 183 android:layout_below="@id/multi_vote_result_title_panel"
195   - android:layout_above="@id/bottom_linear"
196 184 android:layout_marginBottom="10dp"
197   - android:divider="@color/material_grey_600"
198   - android:dividerHeight="2dp"></ListView>
  185 + android:divider="#5381BF"
  186 + android:dividerHeight="@dimen/px4dp"></ListView>
199 187  
200 188 </RelativeLayout>
201 189 \ No newline at end of file
... ...
C5/app/src/main/res/layout/list_multi_vote_result_item.xml
  View file @5520773
... ... @@ -7,7 +7,6 @@
7 7 <LinearLayout
8 8 android:layout_width="fill_parent"
9 9 android:layout_height="wrap_content"
10   - android:layout_marginLeft="20dp"
11 10 android:layout_marginTop="10dp"
12 11 android:paddingBottom="15dp"
13 12 android:orientation="horizontal">
... ... @@ -20,8 +19,8 @@
20 19 android:gravity="center"
21 20 android:layout_gravity="center_vertical"
22 21 android:text="1234"
23   - android:textColor="@color/white"
24   - android:textSize="@dimen/big_text_p5" />
  22 + android:textColor="#F1F1F1"
  23 + android:textSize="@dimen/px40dp" />
25 24  
26 25 <TextView
27 26 android:id="@+id/list_multi_result_item_name"
... ... @@ -30,22 +29,21 @@
30 29 android:layout_gravity="center_vertical"
31 30 android:layout_marginLeft="10dp"
32 31 android:layout_weight="1"
33   - android:lines="1"
34   - android:ellipsize="end"
35 32 android:gravity="center"
  33 + android:text="表决标题表决标题表决标题表决标题表决标题表决标题表决标题表决标题"
36 34 android:textColor="@color/white"
37   - android:textSize="@dimen/big_text_p5" />
  35 + android:textSize="@dimen/px40dp" />
38 36  
39 37 <TextView
40 38 android:id="@+id/list_multi_result_item_agree"
41 39 android:layout_width="80dp"
42 40 android:layout_height="wrap_content"
43 41 android:layout_centerVertical="true"
44   - android:layout_marginLeft="15dp"
45 42 android:gravity="center"
46 43 android:text="@string/agree"
  44 + android:layout_marginLeft="15dp"
47 45 android:textColor="@color/white"
48   - android:textSize="@dimen/big_text_p5" />
  46 + android:textSize="@dimen/px48dp" />
49 47  
50 48 <TextView
51 49 android:id="@+id/list_multi_result_item_oppose"
... ... @@ -56,7 +54,7 @@
56 54 android:gravity="center"
57 55 android:text="@string/oppose"
58 56 android:textColor="@color/white"
59   - android:textSize="@dimen/big_text_p5" />
  57 + android:textSize="@dimen/px48dp" />
60 58  
61 59 <TextView
62 60 android:id="@+id/list_multi_result_item_abstan"
... ... @@ -67,7 +65,7 @@
67 65 android:gravity="center"
68 66 android:text="@string/abstant"
69 67 android:textColor="@color/white"
70   - android:textSize="@dimen/big_text_p5" />
  68 + android:textSize="@dimen/px48dp" />
71 69  
72 70 <TextView
73 71 android:id="@+id/list_multi_result_item_unvote"
... ... @@ -78,7 +76,7 @@
78 76 android:gravity="center"
79 77 android:text="@string/abstant"
80 78 android:textColor="@color/white"
81   - android:textSize="@dimen/big_text_p5" />
  79 + android:textSize="@dimen/px48dp" />
82 80  
83 81 <TextView
84 82 android:id="@+id/list_multi_result_item_result"
... ... @@ -89,7 +87,7 @@
89 87 android:gravity="center"
90 88 android:text="@string/pass"
91 89 android:textColor="@color/white"
92   - android:textSize="@dimen/big_text_p5" />
  90 + android:textSize="@dimen/px48dp" />
93 91  
94 92 </LinearLayout>
95 93  
... ...
C5/app/src/main/res/layout/toast_dialog.xml 0 → 100644
  View file @5520773
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +
  3 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  4 + android:layout_width="match_parent"
  5 + android:layout_height="wrap_content"
  6 + android:background="#000000">
  7 +
  8 + <RelativeLayout
  9 + android:layout_width="match_parent"
  10 + android:layout_height="@dimen/px380dp">
  11 +
  12 + <TextView
  13 + android:id="@+id/message"
  14 + android:layout_width="wrap_content"
  15 + android:layout_height="wrap_content"
  16 + android:layout_centerHorizontal="true"
  17 + android:layout_marginTop="@dimen/px80dp"
  18 + android:textColor="#fefefe"
  19 + android:textSize="@dimen/px60dp" />
  20 +
  21 + <TextView
  22 + android:id="@+id/confirm"
  23 + android:layout_width="@dimen/px240dp"
  24 + android:layout_height="@dimen/px80dp"
  25 + android:layout_alignParentBottom="true"
  26 + android:layout_centerHorizontal="true"
  27 + android:layout_marginBottom="@dimen/px80dp"
  28 + android:background="@drawable/modify_selector_new"
  29 + android:gravity="center"
  30 + android:text="确认"
  31 + android:textColor="#fefefe"
  32 + android:textSize="@dimen/px48dp" />
  33 + </RelativeLayout>
  34 +</LinearLayout>
0 35 \ No newline at end of file
... ...
C5/app/src/main/res/values/strings.xml
  View file @5520773
... ... @@ -28,9 +28,9 @@
28 28 <string name="open_wifi">正在开启 WiFi</string>
29 29 <string name="keypad_id">终端编号：</string>
30 30 <string name="version">版本</string>
31   - <string name="agree">赞&#160;&#160;成</string>
32   - <string name="oppose">反&#160;&#160;对</string>
33   - <string name="abstant">弃&#160;&#160;权</string>
  31 + <string name="agree">赞成</string>
  32 + <string name="oppose">反对</string>
  33 + <string name="abstant">弃权</string>
34 34 <string name="cant_modify_confirm">投票后不可以修改，是否确定提交?</string>
35 35 <string name="should_vote">当前应投</string>
36 36 <string name="demo_metting">演示会议</string>
... ...