孙向锦 / VoteC5

Commit 49b6752a0f05e10c7d1b15fc32a2f27a59c88e5d

Authored by 孙向锦
1 parent 74a0ade9

批次表决

Inline Side-by-side
Showing 8 changed files with 328 additions and 330 deletions
C5/app/src/main/java/com/sunvote/xpadapp/fragments/MultiTitleFragment.java
  View file @49b6752
... ... @@ -43,6 +43,7 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack
43 43 BillInfo bill;
44 44 private TextView tvTitle;
45 45 private ListView listview;
  46 + private View tvInfoLayout;
46 47 private TextView tvInfo;
47 48 private TextView tvPage;
48 49 private Button btnConfirm;
... ... @@ -109,39 +110,23 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack
109 110 tvTitle = (TextView) view.findViewById(R.id.multivote_title);
110 111 tvTitle.setText(replaceBlank(bill.title));
111 112  
  113 + tvInfoLayout = view.findViewById(R.id.multivote_info_layout);
112 114 tvInfo = (TextView) view.findViewById(R.id.multivote_info);
113 115 tvInfo.setText("");
114   - bottomLayout = (RelativeLayout) view.findViewById(R.id.multivote_pannal_bottom);
115   - confirmLayout = (RelativeLayout) view.findViewById(R.id.multivote_confirm_panel);
116   - tvConfirmText = (TextView) view.findViewById(R.id.multivote_confirm_text);
117   -
118   - // tvPage = (TextView) view.findViewById(R.id.multivote_page);
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);
122   -
123   - btnPageUp.setOnClickListener(new OnClickListener() {
124   -
  116 + tvInfo.setBackgroundResource(0);
  117 + tvInfoLayout.setVisibility(View.GONE);
  118 + tvInfoLayout.setOnClickListener(new OnClickListener() {
125 119 @Override
126 120 public void onClick(View v) {
127   - listview.smoothScrollByOffset(-2);
128   - }
129   - });
130 121  
131   - btnPageDown.setOnClickListener(new OnClickListener() {
132   -
133   - @Override
134   - public void onClick(View v) {
135   - listview.smoothScrollByOffset(2);
136 122 }
137 123 });
  124 + bottomLayout = (RelativeLayout) view.findViewById(R.id.multivote_pannal_bottom);
  125 + confirmLayout = (RelativeLayout) view.findViewById(R.id.multivote_confirm_panel);
  126 + tvConfirmText = (TextView) view.findViewById(R.id.multivote_confirm_text);
  127 +
  128 + // tvPage = (TextView) view.findViewById(R.id.multivote_page);
138 129  
139   - btnPageEnd.setOnClickListener(new OnClickListener() {
140   - @Override
141   - public void onClick(View v) {
142   - listview.setSelection(mAdapter.getCount() - 1);
143   - }
144   - });
145 130  
146 131 btnConfirm = (Button) view.findViewById(R.id.multivote_btn_submit);
147 132 btnConfirm.setOnClickListener(new OnClickListener() {
... ... @@ -246,6 +231,7 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack
246 231  
247 232 // tvPage.setText(page + "/" + totalPage);
248 233 tvInfo.setText("");
  234 + tvInfoLayout.setVisibility(View.GONE);
249 235 showVote(false);
250 236 checkIsVoted();
251 237 return view;
... ... @@ -271,6 +257,7 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack
271 257  
272 258 private void doSubmitAllOk() {
273 259 tvInfo.setText(getString(R.string.submiting));
  260 + tvInfo.setBackgroundResource(0);
274 261 btnConfirm.setEnabled(false);
275 262 disableVote();
276 263 mMainActivity.presenter.submitVoteAllOK();
... ... @@ -413,10 +400,15 @@ public class MultiTitleFragment extends BaseFragment implements TitleVoteOnBack
413 400 private void showModifyOrDisable() {
414 401 if (voteInfo.mode2_modify == 1) {
415 402 btnModify.setVisibility(View.VISIBLE);
416   - tvInfo.setText(getString(R.string.submited));
  403 +// tvInfo.setText(getString(R.string.submited));
  404 + tvInfo.setBackgroundResource(R.drawable.voted);
  405 + tvInfoLayout.setVisibility(View.VISIBLE);
417 406 } else {
418 407 disableVote();
419   - tvInfo.setText(getString(R.string.submited_no_modify));
  408 +// tvInfo.setText(getString(R.string.submited));
  409 + tvInfo.setBackgroundResource(R.drawable.voted);
  410 + tvInfoLayout.setVisibility(View.VISIBLE);
  411 +// tvInfo.setText(getString(R.string.submited_no_modify));
420 412 }
421 413 }
422 414  
... ...
C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultVoteFragment.java
  View file @49b6752
... ... @@ -8,6 +8,7 @@ import android.view.View;
8 8 import android.view.View.OnClickListener;
9 9 import android.view.ViewGroup;
10 10 import android.widget.LinearLayout;
  11 +import android.widget.RelativeLayout;
11 12 import android.widget.TextView;
12 13  
13 14 import com.sunvote.util.LogUtil;
... ... @@ -16,6 +17,8 @@ import com.sunvote.xpadapp.R;
16 17 import com.sunvote.xpadapp.base.BaseFragment;
17 18 import com.sunvote.xpadcomm.XPadApiInterface;
18 19  
  20 +import org.apache.tools.ant.Main;
  21 +
19 22 import java.text.DecimalFormat;
20 23  
21 24 public class ResultVoteFragment extends BaseFragment {
... ... @@ -28,9 +31,12 @@ public class ResultVoteFragment extends BaseFragment {
28 31 private TextView fragmentResultMemo;
29 32 private TextView fragmentMemo;
30 33 //
31   - private LinearLayout tResult;
32   - private LinearLayout dResult;
33   - private LinearLayout pResult;
  34 + private RelativeLayout dataTitleLayout1;
  35 + private RelativeLayout dataTitleLayout2;
  36 + private RelativeLayout dataTitleLayout3;
  37 + private RelativeLayout dataTitleLayout4;
  38 +// private LinearLayout dResult;
  39 +// private LinearLayout pResult;
34 40  
35 41 public static String formatDoubleToString(double value, Integer digits, boolean remove) {
36 42 if (value == 0 || value == 100) {
... ... @@ -75,6 +81,12 @@ public class ResultVoteFragment extends BaseFragment {
75 81 return tv1;
76 82 }
77 83  
  84 + @Override
  85 + public void onResume() {
  86 + super.onResume();
  87 + ((MainActivity)getActivity()).setBackgroundColor(Color.parseColor("#042148"));
  88 + }
  89 +
78 90 public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
79 91 View root = inflater.inflate(R.layout.fragment_result_vote, container, false);
80 92 root.setOnClickListener(new OnClickListener() {
... ... @@ -86,10 +98,12 @@ public class ResultVoteFragment extends BaseFragment {
86 98 shidaoresult = root.findViewById(R.id.shidaoresult);
87 99 fragmentResultMemo = root.findViewById(R.id.fragment_result_memo);
88 100 fragmentMemo = root.findViewById(R.id.fragment_memo);
89   - ((MainActivity)getActivity()).setBackgroundColor(Color.parseColor("#042160"));
90   - tResult = root.findViewById(R.id.t_result);
91   - dResult = root.findViewById(R.id.d_result);
92   - pResult = root.findViewById(R.id.p_result);
  101 +
  102 + dataTitleLayout1 = root.findViewById(R.id.data_title_layout1);
  103 + dataTitleLayout2 = root.findViewById(R.id.data_title_layout2);
  104 + dataTitleLayout3 = root.findViewById(R.id.data_title_layout3);
  105 + dataTitleLayout4 = root.findViewById(R.id.data_title_layout4);
  106 +
93 107 showResult();
94 108 return root;
95 109 }
... ... @@ -99,10 +113,6 @@ public class ResultVoteFragment extends BaseFragment {
99 113 int xiaoShuWei = (voteInfo.resultInfo.bits >> 4) & 0xF;
100 114 int fenmu = voteInfo.resultInfo.num0;
101 115 LogUtil.d(TAG, "xiaoshu:" + xiaoShuWei + " fenmu:" + fenmu);
102   - tResult.removeAllViews();
103   - dResult.removeAllViews();
104   - pResult.removeAllViews();
105   -
106 116 if (voteInfo.resultInfo.num1 != 0xffff) {
107 117 yingdaoresult.setText("" + voteInfo.resultInfo.num1);
108 118 }
... ... @@ -132,20 +142,31 @@ public class ResultVoteFragment extends BaseFragment {
132 142 swa = formatDoubleToString(pwa, xiaoShuWei, false);
133 143 }
134 144 if (voteInfo.resultInfo.num4 != 0xffff) {
135   - tResult.addView(createView(getString(R.string.agree),Color.YELLOW),lp);
136   - dResult.addView(createView("" + voteInfo.resultInfo.num4,Color.WHITE),lp);
137   - pResult.addView(createView( szc + "%",Color.WHITE),lp);
138   -
  145 + dataTitleLayout1.setVisibility(View.VISIBLE);
  146 + String text = "" + voteInfo.resultInfo.num4 ;
  147 + if(szc != null && !"".equals(szc)){
  148 + text += "(" + szc + "%)" ;
  149 + }
  150 + ((TextView)(dataTitleLayout1.findViewById(R.id.data_title_layout1_text1))).setText(getString(R.string.agree));
  151 + ((TextView)(dataTitleLayout1.findViewById(R.id.data_title_layout1_text2))).setText(text);
139 152 }
140 153 if (voteInfo.resultInfo.num5 != 0xffff) {
141   - tResult.addView(createView(getString(R.string.oppose),Color.YELLOW),lp);
142   - dResult.addView(createView("" + voteInfo.resultInfo.num5,Color.WHITE),lp);
143   - pResult.addView(createView( sfd + "%",Color.WHITE),lp);
  154 + dataTitleLayout2.setVisibility(View.VISIBLE);
  155 + String text = "" + voteInfo.resultInfo.num5 ;
  156 + if(sfd != null && !"".equals(sfd)){
  157 + text += "(" + sfd + "%)" ;
  158 + }
  159 + ((TextView)(dataTitleLayout2.findViewById(R.id.data_title_layout2_text1))).setText(getString(R.string.oppose));
  160 + ((TextView)(dataTitleLayout2.findViewById(R.id.data_title_layout2_text2))).setText(text);
144 161 }
145 162 if (voteInfo.resultInfo.num3 != 0xffff) {
146   - tResult.addView(createView(getString(R.string.weian),Color.YELLOW),lp);
147   - dResult.addView(createView("" + voteInfo.resultInfo.num3,Color.WHITE),lp);
148   - pResult.addView(createView( swa + "%",Color.WHITE),lp);
  163 + dataTitleLayout3.setVisibility(View.VISIBLE);
  164 + String text = "" + voteInfo.resultInfo.num3 ;
  165 + if(swa != null && !"".equals(swa)){
  166 + text += "(" + swa + "%)" ;
  167 + }
  168 + ((TextView)(dataTitleLayout3.findViewById(R.id.data_title_layout3_text1))).setText(getString(R.string.weian));
  169 + ((TextView)(dataTitleLayout3.findViewById(R.id.data_title_layout3_text2))).setText(text);
149 170 }
150 171 } else {
151 172 String szc = "";
... ... @@ -160,57 +181,83 @@ public class ResultVoteFragment extends BaseFragment {
160 181 swa = formatDoubleToString(pwa, xiaoShuWei, false);
161 182 }
162 183 if (voteInfo.resultInfo.num4 != 0xffff) {
163   - dResult.addView(createView("" + voteInfo.resultInfo.num4,Color.WHITE), lp);
164   - pResult.addView(createView(szc + "%",Color.WHITE), lp);
  184 +
  185 + dataTitleLayout1.setVisibility(View.VISIBLE);
  186 + String text = "" + voteInfo.resultInfo.num4 ;
  187 + if(szc != null && !"".equals(szc)){
  188 + text += "(" + szc + "%)" ;
  189 + }
  190 + ((TextView)(dataTitleLayout1.findViewById(R.id.data_title_layout1_text2))).setText(text);
165 191 }
166 192 if (voteInfo.resultInfo.num5 != 0xffff) {
167   - dResult.addView(createView("" + voteInfo.resultInfo.num5,Color.WHITE), lp);
168   - pResult.addView(createView(sfd + "%",Color.WHITE), lp);
  193 + dataTitleLayout2.setVisibility(View.VISIBLE);
  194 + String text = "" + voteInfo.resultInfo.num5 ;
  195 + if(szc != null && !"".equals(szc)){
  196 + text += "(" + szc + "%)" ;
  197 + }
  198 + ((TextView)(dataTitleLayout2.findViewById(R.id.data_title_layout2_text2))).setText(text);
169 199 }
170 200 if (voteInfo.resultInfo.num6 != 0xffff) {
171   - dResult.addView(createView("" + voteInfo.resultInfo.num6,Color.WHITE), lp);
172   - pResult.addView(createView(swa + "%",Color.WHITE), lp);
  201 + dataTitleLayout1.setVisibility(View.VISIBLE);
  202 + String text = "" + voteInfo.resultInfo.num6 ;
  203 + if(szc != null && !"".equals(szc)){
  204 + text += "(" + szc + "%)" ;
  205 + }
  206 + ((TextView)(dataTitleLayout3.findViewById(R.id.data_title_layout3_text2))).setText(text);
173 207 }
174 208 if (voteInfo.resultInfo.resultType == 2) {
175 209 fragmentMemo.setText(getString(R.string.biaojue_result));
176 210 if (voteInfo.resultInfo.num4 != 0xffff) {
177   - tResult.addView(createView(getString(R.string.agree),Color.YELLOW), lp);
  211 + dataTitleLayout1.setVisibility(View.VISIBLE);
  212 + ((TextView)(dataTitleLayout1.findViewById(R.id.data_title_layout1_text1))).setText(getString(R.string.agree));
178 213 }
179 214 if (voteInfo.resultInfo.num5 != 0xffff) {
180   - tResult.addView(createView(getString(R.string.oppose),Color.YELLOW), lp);
  215 + dataTitleLayout2.setVisibility(View.VISIBLE);
  216 + ((TextView)(dataTitleLayout2.findViewById(R.id.data_title_layout2_text1))).setText(getString(R.string.oppose));
181 217 }
182 218 if (voteInfo.resultInfo.num6 != 0xffff) {
183   - tResult.addView(createView(getString(R.string.abstant),Color.YELLOW), lp);
  219 + dataTitleLayout3.setVisibility(View.VISIBLE);
  220 + ((TextView)(dataTitleLayout3.findViewById(R.id.data_title_layout3_text1))).setText(getString(R.string.abstant));
184 221 }
185 222 } else if (voteInfo.resultInfo.resultType == 4) {
186 223 fragmentMemo.setText(getString(R.string.ceping_result));
187 224 if (voteInfo.resultInfo.num4 != 0xffff) {
188   - tResult.addView(createView(getString(R.string.manyi),Color.YELLOW), lp);
  225 + dataTitleLayout1.setVisibility(View.VISIBLE);
  226 + ((TextView)(dataTitleLayout1.findViewById(R.id.data_title_layout1_text1))).setText(getString(R.string.manyi));
189 227 }
190 228 if (voteInfo.resultInfo.num5 != 0xffff) {
191   - tResult.addView(createView(getString(R.string.jbmanyi),Color.YELLOW), lp);
  229 + dataTitleLayout2.setVisibility(View.VISIBLE);
  230 + ((TextView)(dataTitleLayout2.findViewById(R.id.data_title_layout2_text1))).setText(getString(R.string.jbmanyi));
192 231 }
193 232 if (voteInfo.resultInfo.num6 != 0xffff) {
194   - tResult.addView(createView(getString(R.string.bumanyi),Color.YELLOW), lp);
  233 + dataTitleLayout3.setVisibility(View.VISIBLE);
  234 + ((TextView)(dataTitleLayout3.findViewById(R.id.data_title_layout3_text1))).setText(getString(R.string.bumanyi));
195 235 }
196 236 } else if (voteInfo.resultInfo.resultType == 12) {
197 237 fragmentMemo.setText(getString(R.string.ceping_result));
198 238 if (voteInfo.resultInfo.num4 != 0xffff) {
199   - tResult.addView(createView(getString(R.string.manyi),Color.YELLOW), lp);
  239 + dataTitleLayout1.setVisibility(View.VISIBLE);
  240 + ((TextView)(dataTitleLayout1.findViewById(R.id.data_title_layout1_text1))).setText(getString(R.string.manyi));
200 241 }
201 242 if (voteInfo.resultInfo.num5 != 0xffff) {
202   - tResult.addView(createView(getString(R.string.bumanyi),Color.YELLOW), lp);
  243 + dataTitleLayout2.setVisibility(View.VISIBLE);
  244 + ((TextView)(dataTitleLayout2.findViewById(R.id.data_title_layout2_text1))).setText(getString(R.string.bumanyi));
203 245 }
204 246 if (voteInfo.resultInfo.num6 != 0xffff) {
205   - tResult.addView(createView(getString(R.string.fcbumanyi),Color.YELLOW), lp);
  247 + dataTitleLayout3.setVisibility(View.VISIBLE);
  248 + ((TextView)(dataTitleLayout3.findViewById(R.id.data_title_layout3_text1))).setText(getString(R.string.fcbumanyi));
206 249 }
207 250 }
208 251 if(voteInfo.resultInfo.num3 != 0xffff){
209 252 double opt4 = voteInfo.resultInfo.num3 * 1.0 / fenmu * 100;
210 253 String strOpt4 = formatDoubleToString(opt4, xiaoShuWei, false);
211   - tResult.addView(createView(getString(R.string.weian),Color.YELLOW),lp);
212   - dResult.addView(createView("" +voteInfo.resultInfo.num3 ,Color.WHITE),lp);
213   - pResult.addView(createView(strOpt4 + "%",Color.WHITE),lp);
  254 + dataTitleLayout4.setVisibility(View.VISIBLE);
  255 + ((TextView)(dataTitleLayout4.findViewById(R.id.data_title_layout4_text1))).setText(getString(R.string.weian));
  256 + String text = "" + voteInfo.resultInfo.num3 ;
  257 + if(strOpt4 != null && !"".equals(strOpt4)){
  258 + text += "(" + strOpt4 + "%)" ;
  259 + }
  260 + ((TextView)(dataTitleLayout4.findViewById(R.id.data_title_layout4_text2))).setText(text);
214 261 }
215 262 }
216 263 }
... ...
C5/app/src/main/java/com/sunvote/xpadapp/fragments/UserResultVoteFragment.java
  View file @49b6752
... ... @@ -37,9 +37,9 @@ public class UserResultVoteFragment extends BaseFragment {
37 37 private TextView fragmentResultMemo;
38 38 private TextView fragmentMemo;
39 39 //
40   - private LinearLayout tResult;
41   - private LinearLayout dResult;
42   - private LinearLayout pResult;
  40 +// private LinearLayout tResult;
  41 +// private LinearLayout dResult;
  42 +// private LinearLayout pResult;
43 43  
44 44 public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
45 45 View root = inflater.inflate(R.layout.fragment_result_vote, container, false);
... ... @@ -48,9 +48,9 @@ public class UserResultVoteFragment extends BaseFragment {
48 48 fragmentResultMemo = root.findViewById(R.id.fragment_result_memo);
49 49 fragmentMemo = root.findViewById(R.id.fragment_memo);
50 50  
51   - tResult = root.findViewById(R.id.t_result);
52   - dResult = root.findViewById(R.id.d_result);
53   - pResult = root.findViewById(R.id.p_result);
  51 +// tResult = root.findViewById(R.id.t_result);
  52 +// dResult = root.findViewById(R.id.d_result);
  53 +// pResult = root.findViewById(R.id.p_result);
54 54 showResult();
55 55 return root;
56 56 }
... ... @@ -130,9 +130,9 @@ public class UserResultVoteFragment extends BaseFragment {
130 130 }
131 131  
132 132 private void setView(int pos, int digiters, int bitNum, int type) {
133   - tResult.removeAllViews();
134   - dResult.removeAllViews();
135   - pResult.removeAllViews();
  133 +// tResult.removeAllViews();
  134 +// dResult.removeAllViews();
  135 +// pResult.removeAllViews();
136 136 LinearLayout.LayoutParams lp=new LinearLayout.LayoutParams(0,LinearLayout.LayoutParams.WRAP_CONTENT,1.0f);
137 137 for(int i = 1; i <= options.length ; i++) {
138 138 if (options.length >= i) {
... ... @@ -142,32 +142,32 @@ public class UserResultVoteFragment extends BaseFragment {
142 142 } else {
143 143 value1 = (data[pos++] << 8 | data[pos++]) & 0xffff;
144 144 }
145   - tResult.addView(createView(options[i - 1], Color.YELLOW), lp);
146   - dResult.addView(createView("" + value1, Color.WHITE), lp);
  145 +// tResult.addView(createView(options[i - 1], Color.YELLOW), lp);
  146 +// dResult.addView(createView("" + value1, Color.WHITE), lp);
147 147 if (type == 1) {
148 148 //分母
149 149 if ((fenmu > 0 && fenmu != 0xff)) {
150 150 double pzc = value1 * 1.0 / fenmu * 100;
151 151 String szc = formatDoubleToString(pzc, digiters, false);
152   - pResult.addView(createView(szc + "%", Color.WHITE), lp);
  152 +// pResult.addView(createView(szc + "%", Color.WHITE), lp);
153 153 }
154 154 } else {
155 155 //分母
156 156 if ((fenmu > 0 && fenmu != 0xffff)) {
157 157 double pzc = value1 * 1.0 / fenmu * 100;
158 158 String szc = formatDoubleToString(pzc, digiters, false);
159   - pResult.addView(createView(szc + "%", Color.WHITE), lp);
  159 +// pResult.addView(createView(szc + "%", Color.WHITE), lp);
160 160 }
161 161 }
162 162 }
163 163 }
164 164 if (notVote != 0xff) {
165   - tResult.addView(createView(getString(R.string.weian), Color.YELLOW), lp);
166   - dResult.addView(createView("" + notVote, Color.WHITE), lp);
  165 +// tResult.addView(createView(getString(R.string.weian), Color.YELLOW), lp);
  166 +// dResult.addView(createView("" + notVote, Color.WHITE), lp);
167 167 if ((fenmu > 0 && fenmu != 0xff)) {
168   - pResult.addView(createView("0%", Color.WHITE), lp);
  168 +// pResult.addView(createView("0%", Color.WHITE), lp);
169 169 }else{
170   - pResult.setVisibility(View.GONE);
  170 +// pResult.setVisibility(View.GONE);
171 171 }
172 172 }
173 173 }
... ...
C5/app/src/main/res/drawable/bh_cicle.xml
  View file @49b6752
... ... @@ -2,7 +2,7 @@
2 2 <shape xmlns:android="http://schemas.android.com/apk/res/android"
3 3 android:shape="oval"
4 4 android:useLevel="false">
5   - <solid android:color="#F00" />
  5 + <solid android:color="#d32d25" />
6 6 <size
7 7 android:width="48dp"
8 8 android:height="48dp" />
... ...
C5/app/src/main/res/layout/fragment_multi_title.xml
  View file @49b6752
... ... @@ -7,98 +7,90 @@
7 7 <LinearLayout
8 8 android:id="@+id/line_panel"
9 9 android:layout_width="match_parent"
10   - android:layout_height="wrap_content"
  10 + android:layout_height="@dimen/px152dp"
11 11 android:background="#AC1007"
12 12 android:orientation="horizontal"
13   - android:paddingBottom="20dp"
14   - android:paddingLeft="20dp"
15   - android:paddingRight="80dp"
16   - android:paddingTop="20dp">
  13 + android:paddingRight="@dimen/px120dp">
17 14  
18 15 <TextView
19 16 android:id="@+id/multivote_title"
20 17 android:layout_width="0dp"
21 18 android:layout_height="wrap_content"
22 19 android:layout_gravity="center_vertical"
  20 + android:layout_marginLeft="@dimen/px55dp"
23 21 android:layout_weight="1"
24 22 android:text="@string/sunvote_no_paper"
25 23 android:textColor="@color/white"
26   - android:textSize="@dimen/big_text_p4" />
  24 + android:textSize="@dimen/px60dp" />
27 25  
28 26 <TextView
29 27 android:id="@+id/multi_title_btn_agree_all"
30   - android:layout_width="@dimen/inner_button_width"
31   - android:layout_height="40dp"
32   - android:layout_marginLeft="30dp"
  28 + android:layout_width="@dimen/px300dp"
  29 + android:layout_height="@dimen/px90dp"
  30 + android:layout_gravity="center_vertical"
33 31 android:background="@drawable/agree_selector"
34 32 android:gravity="center"
35 33 android:text="@string/all_agree"
36 34 android:textColor="@color/white"
37   - android:textSize="@dimen/big_text_p4"
  35 + android:textSize="@dimen/px50dp"
38 36 android:textStyle="bold" />
39 37  
40 38 <TextView
41 39 android:id="@+id/multi_title_btn_oppose_all"
42   - android:layout_width="@dimen/inner_button_width"
43   - android:layout_height="40dp"
44   - android:layout_marginLeft="10dp"
  40 + android:layout_width="@dimen/px300dp"
  41 + android:layout_height="@dimen/px90dp"
  42 + android:layout_gravity="center_vertical"
  43 + android:layout_marginLeft="@dimen/px11dp"
45 44 android:background="@drawable/oppos_selector"
46 45 android:gravity="center"
47 46 android:text="@string/all_oppose"
48 47 android:textColor="@color/white"
49   - android:textSize="@dimen/big_text_p4"
  48 + android:textSize="@dimen/px50dp"
50 49 android:textStyle="bold" />
51 50  
52 51 <TextView
53 52 android:id="@+id/multi_title_btn_abstain_all"
54   - android:layout_width="@dimen/inner_button_width"
55   - android:layout_height="40dp"
56   - android:layout_marginLeft="@dimen/inner_button_margin"
  53 + android:layout_width="@dimen/px300dp"
  54 + android:layout_height="@dimen/px90dp"
  55 + android:layout_gravity="center_vertical"
  56 + android:layout_marginLeft="@dimen/px11dp"
57 57 android:background="@drawable/signin_selector"
58 58 android:gravity="center"
59 59 android:text="@string/all_abstant"
60 60 android:textColor="@color/white"
61   - android:textSize="@dimen/big_text_p4"
  61 + android:textSize="@dimen/px50dp"
62 62 android:textStyle="bold" />
63 63 </LinearLayout>
64 64  
  65 +
  66 +
65 67 <RelativeLayout
66 68 android:id="@+id/multivote_pannal_bottom"
67 69 android:layout_width="match_parent"
68   - android:layout_height="80dp"
  70 + android:layout_height="@dimen/px140dp"
69 71 android:layout_alignParentBottom="true"
70 72 android:alpha="0.9"
71 73 android:background="@drawable/gray_alpha">
72   -
73   - <TextView
74   - android:id="@+id/multivote_info"
75   - android:layout_width="wrap_content"
76   - android:layout_height="wrap_content"
77   - android:layout_centerVertical="true"
78   - android:layout_marginLeft="20dp"
79   - android:text="@string/should_vote"
80   - android:textSize="@dimen/big_text_p4" />
81   -
82 74 <Button
83 75 android:id="@+id/multivote_btn_submit"
84   - android:layout_width="wrap_content"
85   - android:layout_height="wrap_content"
  76 + android:layout_width="@dimen/px420dp"
  77 + android:layout_height="@dimen/px110dp"
86 78 android:layout_centerInParent="true"
87 79 android:background="@drawable/oppos_selector"
88 80 android:text="@string/confirm_submit"
89 81 android:textColor="@color/white"
90   - android:textSize="@dimen/big_text_p4"
  82 + android:textSize="@dimen/px60dp"
91 83 android:textStyle="bold" />
92 84  
93 85 <Button
94 86 android:id="@+id/multivote_btn_modify"
95   - android:layout_width="wrap_content"
96   - android:layout_height="wrap_content"
  87 + android:layout_width="@dimen/px420dp"
  88 + android:layout_height="@dimen/px110dp"
97 89 android:layout_centerInParent="true"
98 90 android:background="@drawable/signin_selector"
99 91 android:text="@string/modify"
100 92 android:textColor="@color/white"
101   - android:textSize="@dimen/big_text_p4"
  93 + android:textSize="@dimen/px60dp"
102 94 android:textStyle="bold"
103 95 android:visibility="invisible" />
104 96 </RelativeLayout>
... ... @@ -109,53 +101,34 @@
109 101 android:layout_height="fill_parent"
110 102 android:layout_above="@id/multivote_pannal_bottom"
111 103 android:layout_below="@id/line_panel"
112   - android:layout_marginTop="@dimen/content_margin"
113   - android:divider="@color/votebakground"
  104 + android:background="@color/white"
  105 + android:divider="#E5E5E5"
114 106 android:dividerHeight="8dp"
115 107 android:fastScrollEnabled="false"></ListView>
116 108  
117   - <LinearLayout
118   - android:layout_width="40dp"
119   - android:layout_height="150dp"
120   - android:layout_alignParentRight="true"
121   - android:layout_centerVertical="true"
122   - android:layout_marginBottom="50dp"
123   - android:layout_marginRight="20dp"
124   - android:layout_marginTop="50dp"
125   - android:background="@drawable/right_control"
126   - android:orientation="vertical">
127   -
128   - <ImageView
129   - android:id="@+id/multivote_pageup"
130   - android:layout_width="wrap_content"
131   - android:layout_height="0dp"
132   - android:padding="10dp"
133   - android:layout_weight="1"
134   - android:src="@drawable/page_up" />
135   -
136   - <ImageView
137   - android:id="@+id/multivote_pagedown"
138   - android:layout_width="wrap_content"
139   - android:layout_height="0dp"
140   - android:layout_weight="1"
141   - android:padding="10dp"
142   - android:src="@drawable/page_down" />
143   -
144   - <ImageView
145   - android:id="@+id/multivote_pageend"
146   - android:layout_width="wrap_content"
147   - android:layout_height="0dp"
148   - android:layout_weight="1"
149   - android:padding="10dp"
150   - android:src="@drawable/page_frist" />
151   -
152   - </LinearLayout>
  109 + <RelativeLayout
  110 + android:id="@+id/multivote_info_layout"
  111 + android:layout_above="@id/multivote_pannal_bottom"
  112 + android:layout_width="match_parent"
  113 + android:layout_height="match_parent"
  114 + android:background="#33000000"
  115 + android:visibility="gone">
  116 + <TextView
  117 + android:id="@+id/multivote_info"
  118 + android:layout_width="@dimen/px622dp"
  119 + android:layout_height="@dimen/px206dp"
  120 + android:layout_centerVertical="true"
  121 + android:text="@string/should_vote"
  122 + android:background="@drawable/voted_empty"
  123 + android:layout_centerInParent="true"
  124 + android:textSize="@dimen/big_text_p4" />
  125 + </RelativeLayout>
153 126  
154 127 <RelativeLayout
155 128 android:id="@+id/multivote_confirm_panel"
156 129 android:layout_width="match_parent"
157 130 android:layout_height="match_parent"
158   - android:background="@color/black"
  131 + android:background="#33000000"
159 132 android:visibility="gone">
160 133  
161 134 <TextView
... ... @@ -165,36 +138,38 @@
165 138 android:layout_centerHorizontal="true"
166 139 android:layout_marginLeft="@dimen/content_margin"
167 140 android:layout_marginRight="@dimen/content_margin"
168   - android:layout_marginTop="@dimen/button_to_content"
  141 + android:layout_marginTop="@dimen/px352dp"
  142 + android:text="@string/cant_modify_confirm"
169 143 android:textColor="@color/white"
170   - android:textSize="@dimen/big_text_p4" />
  144 + android:textSize="@dimen/px70dp"
  145 + android:textStyle="bold" />
171 146  
172 147 <Button
173 148 android:id="@+id/multivote_confirm_btn_cancel"
174   - android:layout_width="@dimen/button_width"
175   - android:layout_height="@dimen/button_heigh"
  149 + android:layout_width="@dimen/px360dp"
  150 + android:layout_height="@dimen/px110dp"
176 151 android:layout_alignParentLeft="true"
177 152 android:layout_below="@id/multivote_confirm_text"
178   - android:layout_marginLeft="@dimen/button_to_left"
  153 + android:layout_marginLeft="200dp"
179 154 android:layout_marginTop="@dimen/button_to_content"
180   - android:background="@drawable/btn_signin_d"
  155 + android:background="#FBBF16"
181 156 android:text="@string/cancel"
182 157 android:textColor="@color/white"
183   - android:textSize="@dimen/big_text_p5"
  158 + android:textSize="@dimen/px60dp"
184 159 android:textStyle="bold" />
185 160  
186 161 <Button
187 162 android:id="@+id/multivote_confirm_btn_ok"
188   - android:layout_width="@dimen/button_width"
189   - android:layout_height="@dimen/button_heigh"
  163 + android:layout_width="@dimen/px360dp"
  164 + android:layout_height="@dimen/px110dp"
190 165 android:layout_alignParentRight="true"
191 166 android:layout_below="@id/multivote_confirm_text"
192   - android:layout_marginRight="@dimen/button_to_right"
  167 + android:layout_marginRight="200dp"
193 168 android:layout_marginTop="@dimen/button_to_content"
194 169 android:background="@drawable/btn_agree"
195 170 android:text="@string/ok"
196 171 android:textColor="@color/white"
197   - android:textSize="@dimen/big_text_p5"
  172 + android:textSize="@dimen/px60dp"
198 173 android:textStyle="bold" />
199 174  
200 175 </RelativeLayout>
... ...
C5/app/src/main/res/layout/fragment_result_vote.xml
  View file @49b6752
... ... @@ -10,7 +10,7 @@
10 10 android:layout_height="wrap_content"
11 11 android:layout_alignParentTop="true"
12 12 android:layout_centerHorizontal="true"
13   - android:layout_marginTop="50dp"
  13 + android:layout_marginTop="@dimen/px60dp"
14 14 android:orientation="vertical">
15 15  
16 16 <TextView
... ... @@ -27,7 +27,7 @@
27 27 android:id="@+id/fragment_result_memo"
28 28 android:layout_width="fill_parent"
29 29 android:layout_height="wrap_content"
30   - android:layout_marginTop="@dimen/px52dp"
  30 + android:layout_marginTop="@dimen/px40dp"
31 31 android:gravity="center"
32 32 android:text="通过"
33 33 android:textColor="@color/white"
... ... @@ -36,245 +36,229 @@
36 36 </LinearLayout>
37 37  
38 38 <LinearLayout
39   - android:layout_width="800dp"
  39 + android:id="@+id/yingdao_layout"
  40 + android:layout_width="@dimen/px675dp"
40 41 android:layout_height="wrap_content"
41   - android:layout_centerHorizontal="true"
42 42 android:layout_below="@id/result_layout"
43   - android:layout_marginTop="@dimen/px65dp"
  43 + android:layout_centerHorizontal="true"
  44 + android:layout_marginTop="@dimen/px40dp"
44 45 android:orientation="horizontal">
45 46  
46 47 <TextView
47 48 android:layout_width="wrap_content"
48 49 android:layout_height="wrap_content"
49 50 android:layout_weight="1"
50   - android:gravity="right"
51 51 android:text="@string/yindao1"
52   - android:textColor="@color/yellow"
53   - android:textSize="@dimen/big_text_p3"
  52 + android:textColor="@color/white"
  53 + android:textSize="@dimen/px60dp"
54 54 android:textStyle="bold" />
55 55  
56 56 <TextView
57 57 android:id="@+id/yingdaoresult"
58 58 android:layout_width="wrap_content"
59 59 android:layout_height="wrap_content"
60   - android:layout_marginLeft="10dp"
61   - android:layout_marginRight="60dp"
62 60 android:layout_weight="1"
63   - android:gravity="left"
64 61 android:text="150"
65 62 android:textColor="@color/white"
66   - android:textSize="@dimen/big_text_p3" />
  63 + android:textSize="@dimen/px60dp" />
67 64  
68 65 <TextView
69 66 android:layout_width="wrap_content"
70 67 android:layout_height="wrap_content"
71   - android:layout_marginLeft="60dp"
72 68 android:layout_weight="1"
73   - android:gravity="right"
74 69 android:text="@string/shidao1"
75   - android:textColor="@color/yellow"
76   - android:textSize="@dimen/big_text_p3"
  70 + android:textColor="@color/white"
  71 + android:textSize="@dimen/px60dp"
  72 + android:gravity="center_vertical|right"
77 73 android:textStyle="bold" />
78 74  
79 75 <TextView
80 76 android:id="@+id/shidaoresult"
81 77 android:layout_width="wrap_content"
82 78 android:layout_height="wrap_content"
83   - android:layout_marginLeft="10dp"
84 79 android:layout_weight="1"
85   - android:gravity="left"
86 80 android:text="150"
  81 + android:gravity="center_vertical|right"
87 82 android:textColor="@color/white"
88   - android:textSize="@dimen/big_text_p3" />
  83 + android:textSize="@dimen/px60dp" />
89 84  
90 85 </LinearLayout>
91 86  
92   - <RelativeLayout
93   - android:id="@+id/data_title_layout"
  87 + <View
  88 + android:id="@+id/line0"
94 89 android:layout_width="match_parent"
95   - android:layout_height="wrap_content"
96   - android:layout_below="@id/result_layout"
97   - android:layout_marginTop="20dp">
  90 + android:layout_height="@dimen/px3dp"
  91 + android:layout_below="@id/yingdao_layout"
  92 + android:layout_marginTop="@dimen/px40dp"
  93 + android:background="#5386CB" />
98 94  
  95 + <RelativeLayout
  96 + android:id="@+id/data_title_layout1"
  97 + android:layout_width="match_parent"
  98 + android:layout_height="@dimen/px120dp"
  99 + android:background="#084aa3"
  100 + android:visibility="gone"
  101 + android:layout_below="@id/line0">
99 102 <LinearLayout
100   - android:id="@+id/t_result"
101   - android:layout_width="800dp"
102   - android:layout_height="wrap_content"
  103 + android:layout_width="@dimen/px675dp"
  104 + android:layout_height="@dimen/px120dp"
103 105 android:layout_centerHorizontal="true"
  106 + android:layout_gravity="center_vertical"
104 107 android:orientation="horizontal">
105   -
106 108 <TextView
107   - android:id="@+id/title1"
  109 + android:id="@+id/data_title_layout1_text1"
108 110 android:layout_width="wrap_content"
109   - android:layout_height="wrap_content"
  111 + android:layout_height="match_parent"
110 112 android:layout_weight="1"
111   - android:gravity="center"
112   - android:text="@string/agree"
113   - android:textColor="@color/yellow"
114   - android:textSize="@dimen/big_text_p3" />
  113 + android:text="@string/manyi"
  114 + android:gravity="center_vertical"
  115 + android:textColor="@color/white"
  116 + android:textSize="@dimen/px60dp"
  117 + android:textStyle="bold" />
115 118  
116 119 <TextView
  120 + android:id="@+id/data_title_layout1_text2"
117 121 android:layout_width="wrap_content"
118   - android:layout_height="wrap_content"
  122 + android:layout_height="match_parent"
  123 + android:text="150"
119 124 android:layout_weight="1"
120   - android:gravity="center"
121   - android:text="@string/oppose"
122   - android:textColor="@color/yellow"
123   - android:textSize="@dimen/big_text_p3" />
  125 + android:gravity="center_vertical|right"
  126 + android:textColor="@color/white"
  127 + android:textSize="@dimen/px60dp" />
124 128  
125   - <TextView
126   - android:layout_width="wrap_content"
127   - android:layout_height="wrap_content"
128   - android:layout_weight="1"
129   - android:gravity="center"
130   - android:text="@string/abstant"
131   - android:textColor="@color/yellow"
132   - android:textSize="@dimen/big_text_p3" />
133 129 </LinearLayout>
134 130 </RelativeLayout>
135 131  
136 132 <View
137   - android:id="@+id/line"
  133 + android:id="@+id/line1"
138 134 android:layout_width="match_parent"
139   - android:layout_height="1dp"
140   - android:layout_below="@id/data_title_layout"
141   - android:layout_marginTop="10dp"
142   - android:background="#B2FFFFFF" />
  135 + android:layout_height="@dimen/px3dp"
  136 + android:layout_below="@id/data_title_layout1"
  137 + android:background="#5386CB" />
143 138  
144 139 <RelativeLayout
145   - android:id="@+id/data_result_layout"
  140 + android:id="@+id/data_title_layout2"
146 141 android:layout_width="match_parent"
147   - android:layout_height="wrap_content"
148   - android:layout_below="@id/line"
149   - android:background="#064AA3">
150   -
  142 + android:layout_height="@dimen/px120dp"
  143 + android:visibility="gone"
  144 + android:layout_below="@id/line1">
151 145 <LinearLayout
152   - android:id="@+id/d_result"
153   - android:layout_width="800dp"
154   - android:layout_height="wrap_content"
  146 + android:layout_width="@dimen/px675dp"
  147 + android:layout_height="@dimen/px120dp"
155 148 android:layout_centerHorizontal="true"
156 149 android:orientation="horizontal">
157   -
158 150 <TextView
159   - android:id="@+id/result1"
  151 + android:id="@+id/data_title_layout2_text1"
160 152 android:layout_width="wrap_content"
161   - android:layout_height="wrap_content"
  153 + android:layout_height="match_parent"
162 154 android:layout_weight="1"
163   - android:gravity="center"
164   - android:text="150"
  155 + android:gravity="center_vertical"
  156 + android:text="@string/manyi"
165 157 android:textColor="@color/white"
166   - android:textSize="@dimen/big_text_p2"
  158 + android:textSize="@dimen/px60dp"
167 159 android:textStyle="bold" />
168 160  
169   -
170 161 <TextView
171   - android:id="@+id/result2"
  162 + android:id="@+id/data_title_layout2_text2"
172 163 android:layout_width="wrap_content"
173   - android:layout_height="wrap_content"
  164 + android:layout_height="match_parent"
  165 + android:gravity="center_vertical|right"
174 166 android:layout_weight="1"
175   - android:gravity="center"
176   - android:text="0"
  167 + android:text="150"
177 168 android:textColor="@color/white"
178   - android:textSize="@dimen/big_text_p2"
179   - android:textStyle="bold" />
180   -
  169 + android:textSize="@dimen/px60dp" />
181 170  
182   - <TextView
183   - android:id="@+id/result3"
184   - android:layout_width="wrap_content"
185   - android:layout_height="wrap_content"
186   - android:layout_weight="1"
187   - android:gravity="center"
188   - android:text="0"
189   - android:textColor="@color/white"
190   - android:textSize="@dimen/big_text_p2"
191   - android:textStyle="bold" />
192 171 </LinearLayout>
193   -
194 172 </RelativeLayout>
195 173  
196 174 <View
197 175 android:id="@+id/line2"
198 176 android:layout_width="match_parent"
199   - android:layout_height="1dp"
200   - android:layout_below="@id/data_result_layout"
201   - android:background="#B2FFFFFF" />
  177 + android:layout_height="@dimen/px3dp"
  178 + android:layout_below="@id/data_title_layout2"
  179 + android:background="#5386CB" />
202 180  
203 181 <RelativeLayout
204   - android:id="@+id/pesent_result_layout"
  182 + android:id="@+id/data_title_layout3"
205 183 android:layout_width="match_parent"
206   - android:layout_height="wrap_content"
  184 + android:layout_height="@dimen/px120dp"
  185 + android:background="#084aa3"
  186 + android:visibility="gone"
207 187 android:layout_below="@id/line2">
208   -
209 188 <LinearLayout
210   - android:id="@+id/p_result"
211   - android:layout_width="800dp"
212   - android:layout_height="wrap_content"
  189 + android:layout_width="@dimen/px675dp"
  190 + android:layout_height="@dimen/px120dp"
213 191 android:layout_centerHorizontal="true"
214 192 android:orientation="horizontal">
  193 + <TextView
  194 + android:id="@+id/data_title_layout3_text1"
  195 + android:layout_width="wrap_content"
  196 + android:layout_height="match_parent"
  197 + android:layout_weight="1"
  198 + android:gravity="center_vertical"
  199 + android:text="@string/manyi"
  200 + android:textColor="@color/white"
  201 + android:textSize="@dimen/px60dp"
  202 + android:textStyle="bold" />
215 203  
216 204 <TextView
217   - android:id="@+id/p1"
  205 + android:id="@+id/data_title_layout3_text2"
218 206 android:layout_width="wrap_content"
219 207 android:layout_height="wrap_content"
  208 + android:gravity="center_vertical|right"
220 209 android:layout_weight="1"
221   - android:gravity="center"
222   - android:text="100%"
  210 + android:text="150"
223 211 android:textColor="@color/white"
224   - android:textSize="@dimen/big_text_p2"
225   - android:textStyle="bold" />
  212 + android:textSize="@dimen/px60dp" />
  213 + </LinearLayout>
  214 + </RelativeLayout>
226 215  
  216 + <View
  217 + android:id="@+id/line3"
  218 + android:layout_width="match_parent"
  219 + android:layout_height="@dimen/px3dp"
  220 + android:layout_below="@id/data_title_layout3"
  221 + android:background="#5386CB" />
227 222  
  223 + <RelativeLayout
  224 + android:id="@+id/data_title_layout4"
  225 + android:layout_width="match_parent"
  226 + android:layout_height="@dimen/px120dp"
  227 + android:visibility="gone"
  228 + android:layout_below="@id/line3">
  229 + <LinearLayout
  230 + android:layout_width="@dimen/px675dp"
  231 + android:layout_height="@dimen/px120dp"
  232 + android:layout_centerHorizontal="true"
  233 + android:orientation="horizontal">
228 234 <TextView
229   - android:id="@+id/p2"
  235 + android:id="@+id/data_title_layout4_text1"
230 236 android:layout_width="wrap_content"
231   - android:layout_height="wrap_content"
  237 + android:layout_height="match_parent"
232 238 android:layout_weight="1"
233   - android:gravity="center"
234   - android:text="0%"
  239 + android:gravity="center_vertical"
  240 + android:text="@string/manyi"
235 241 android:textColor="@color/white"
236   - android:textSize="@dimen/big_text_p2"
  242 + android:textSize="@dimen/px60dp"
237 243 android:textStyle="bold" />
238 244  
239 245 <TextView
240   - android:id="@+id/p3"
  246 + android:id="@+id/data_title_layout4_text2"
241 247 android:layout_width="wrap_content"
242   - android:layout_height="wrap_content"
  248 + android:layout_height="match_parent"
  249 + android:gravity="center_vertical|right"
243 250 android:layout_weight="1"
244   - android:gravity="center"
245   - android:text="0%"
  251 + android:text="150"
246 252 android:textColor="@color/white"
247   - android:textSize="@dimen/big_text_p2"
248   - android:textStyle="bold" />
249   - </LinearLayout>
  253 + android:textSize="@dimen/px60dp" />
250 254  
  255 + </LinearLayout>
251 256 </RelativeLayout>
252 257  
253 258 <View
  259 + android:id="@+id/line4"
254 260 android:layout_width="match_parent"
255   - android:layout_height="1dp"
256   - android:layout_below="@id/pesent_result_layout"
257   - android:background="#B2FFFFFF" />
258   -
259   - <RelativeLayout
260   - android:id="@+id/fragment_result_vote_top_panel"
261   - android:layout_width="match_parent"
262   - android:layout_height="wrap_content"
263   - android:layout_alignParentBottom="true"
264   - android:layout_marginBottom="30dp">
265   -
266   -
267   -
268   - <TextView
269   - android:id="@+id/fragment_result_bill_title"
270   - android:layout_width="fill_parent"
271   - android:layout_height="wrap_content"
272   - android:layout_centerHorizontal="true"
273   - android:layout_marginLeft="80dp"
274   - android:layout_marginRight="80dp"
275   - android:gravity="center"
276   - android:textColor="@color/white"
277   - android:textStyle="bold"
278   - android:visibility="gone" />
279   - </RelativeLayout>
  261 + android:layout_height="@dimen/px3dp"
  262 + android:layout_below="@id/data_title_layout4"
  263 + android:background="#5386CB" />
280 264 </RelativeLayout>
281 265 \ No newline at end of file
... ...
C5/app/src/main/res/layout/list_multi_title_item.xml
  View file @49b6752
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 3 android:layout_width="fill_parent"
4   - android:layout_height="fill_parent"
  4 + android:layout_height="@dimen/px279dp"
5 5 android:layout_marginBottom="1dp"
6 6 android:layout_marginTop="1dp"
7   - android:paddingRight="70dp"
  7 + android:paddingRight="@dimen/px120dp"
8 8 android:background="@color/white">
9 9  
10 10 <LinearLayout
11 11 android:id="@+id/line_panel"
12 12 android:layout_width="match_parent"
13 13 android:layout_height="wrap_content"
  14 + android:layout_marginTop="@dimen/px32dp"
14 15 android:orientation="horizontal">
15 16  
16 17 <TextView
17 18 android:id="@+id/list_multivote_item_num"
18   - android:layout_width="40dp"
19   - android:layout_height="40dp"
20   - android:layout_marginLeft="15dp"
21   - android:layout_marginTop="5dp"
22   - android:layout_marginBottom="5dp"
  19 + android:layout_width="@dimen/px76dp"
  20 + android:layout_height="@dimen/px76dp"
  21 + android:layout_marginLeft="@dimen/px106dp"
23 22 android:background="@drawable/bh_cicle"
24 23 android:gravity="center"
25 24 android:lines="1"
... ... @@ -38,7 +37,7 @@
38 37 android:lines="2"
39 38 android:paddingBottom="10dp"
40 39 android:text="@string/content"
41   - android:textColor="@color/black"
  40 + android:textColor="#333333"
42 41 android:textSize="@dimen/big_text_p5" />
43 42 </LinearLayout>
44 43  
... ... @@ -52,54 +51,55 @@
52 51  
53 52 <TextView
54 53 android:id="@+id/list_multivote_item_btnvote1"
55   - android:layout_width="@dimen/inner_button_width"
56   - android:layout_height="40dp"
57   - android:layout_marginLeft="@dimen/inner_button_margin"
  54 + android:layout_width="@dimen/px300dp"
  55 + android:layout_height="@dimen/px90dp"
  56 + android:layout_marginLeft="@dimen/px11dp"
58 57 android:background="@drawable/agree_selector"
59 58 android:gravity="center"
60 59 android:text="@string/agree"
61 60 android:textColor="@color/white"
62   - android:textSize="@dimen/big_text_p4"
  61 + android:textSize="@dimen/px50dp"
63 62 android:textStyle="bold"
64 63 android:visibility="visible" />
65 64  
66 65 <TextView
67 66 android:id="@+id/list_multivote_item_btnvote2"
68   - android:layout_width="@dimen/inner_button_width"
69   - android:layout_height="40dp"
70   - android:layout_marginLeft="@dimen/inner_button_margin"
  67 + android:layout_width="@dimen/px300dp"
  68 + android:layout_height="@dimen/px90dp"
  69 + android:layout_marginLeft="@dimen/px11dp"
71 70 android:background="@drawable/oppos_selector"
72 71 android:gravity="center"
73 72 android:text="@string/oppose"
74 73 android:textColor="@color/white"
75   - android:textSize="@dimen/big_text_p4"
  74 + android:textSize="@dimen/px50dp"
76 75 android:textStyle="bold"
77 76 android:visibility="visible" />
78 77  
79 78 <TextView
80 79 android:id="@+id/list_multivote_item_btnvote3"
81   - android:layout_width="@dimen/inner_button_width"
82   - android:layout_height="40dp"
83   - android:layout_marginLeft="@dimen/inner_button_margin"
  80 + android:layout_width="@dimen/px300dp"
  81 + android:layout_height="@dimen/px90dp"
  82 + android:layout_marginLeft="@dimen/px11dp"
84 83 android:background="@drawable/signin_selector"
85 84 android:gravity="center"
86 85 android:text="@string/abstant"
87 86 android:textColor="@color/white"
88   - android:textSize="@dimen/big_text_p4"
  87 + android:textSize="@dimen/px50dp"
89 88 android:textStyle="bold" />
90 89 </LinearLayout>
91 90  
92 91 <TextView
93 92 android:id="@+id/list_multivote_item_tv_result"
94 93 android:layout_width="150dp"
95   - android:layout_centerInParent="true"
96 94 android:layout_height="60dp"
  95 + android:layout_marginTop="@dimen/px120dp"
  96 + android:layout_marginLeft="@dimen/px60dp"
97 97 android:alpha="0.9"
98 98 android:background="@drawable/voted_empty"
99 99 android:gravity="center"
100 100 android:rotation="-15"
101 101 android:src="@drawable/agree_small"
102   - android:textColor="#ddff9933"
  102 + android:textColor="#4b3b93"
103 103 android:textSize="@dimen/big_text_p4"
104 104 android:textStyle="bold" />
105 105 </RelativeLayout>
... ...
C5/app/src/main/res/values/strings.xml
  View file @49b6752
... ... @@ -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">赞成</string>
32   - <string name="oppose">反对</string>
33   - <string name="abstant">弃权</string>
  31 + <string name="agree">赞&#160;&#160;成</string>
  32 + <string name="oppose">反&#160;&#160;对</string>
  33 + <string name="abstant">弃&#160;&#160;权</string>
34 34 <string name="cant_modify_confirm">投票后不可以修改，是否确定提交?</string>
35 35 <string name="should_vote">当前应投</string>
36 36 <string name="demo_metting">演示会议</string>
... ...