Commit 0a1c7485af9b05ebebde06df5ac17eae47e88a49
1 parent
dd2b0221
bug修复
Showing
3 changed files
with
6 additions
and
14 deletions
C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionCustomFragment.java
| @@ -397,14 +397,10 @@ public class ElectionCustomFragment extends BaseFragment { | @@ -397,14 +397,10 @@ public class ElectionCustomFragment extends BaseFragment { | ||
| 397 | convertView.setBackgroundColor(position % 2 == 0 ? Color.WHITE : Color.parseColor("#E5E5E5")); | 397 | convertView.setBackgroundColor(position % 2 == 0 ? Color.WHITE : Color.parseColor("#E5E5E5")); |
| 398 | holder.tvNum.setText(String.valueOf(it.No)); | 398 | holder.tvNum.setText(String.valueOf(it.No)); |
| 399 | holder.tvName.setText(String.valueOf(it.title)); | 399 | holder.tvName.setText(String.valueOf(it.title)); |
| 400 | - if (it.result == 4) { | ||
| 401 | - holder.RG.clearCheck(); | ||
| 402 | - } else if (it.result == 1) { | 400 | + if (it.result == 1) { |
| 403 | holder.RG.check(R.id.list_election_item_oo); | 401 | holder.RG.check(R.id.list_election_item_oo); |
| 404 | - } else if (it.result == 2) { | ||
| 405 | - holder.RG.check(R.id.list_election_item_xx); | ||
| 406 | - }else if (it.result == 3) { | ||
| 407 | - holder.RG.check(R.id.list_election_item_abstain); | 402 | + } else{ |
| 403 | + holder.RG.clearCheck(); | ||
| 408 | } | 404 | } |
| 409 | 405 | ||
| 410 | if(it.modifyModel){ | 406 | if(it.modifyModel){ |
| @@ -417,11 +413,7 @@ public class ElectionCustomFragment extends BaseFragment { | @@ -417,11 +413,7 @@ public class ElectionCustomFragment extends BaseFragment { | ||
| 417 | holder.btnAbstain.setEnabled(true); | 413 | holder.btnAbstain.setEnabled(true); |
| 418 | } | 414 | } |
| 419 | 415 | ||
| 420 | - if(it.result == 1){ | ||
| 421 | - holder.btnO.setChecked(true); | ||
| 422 | - }else { | ||
| 423 | - holder.btnO.setChecked(false); | ||
| 424 | - } | 416 | + |
| 425 | 417 | ||
| 426 | holder.btnO.setOnClickListener(new OnClickListener() { | 418 | holder.btnO.setOnClickListener(new OnClickListener() { |
| 427 | @Override | 419 | @Override |
C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionFragment.java
| @@ -306,7 +306,7 @@ public class ElectionFragment extends BaseFragment { | @@ -306,7 +306,7 @@ public class ElectionFragment extends BaseFragment { | ||
| 306 | listview.setVisibility(View.VISIBLE); | 306 | listview.setVisibility(View.VISIBLE); |
| 307 | hideConfirm(); | 307 | hideConfirm(); |
| 308 | hideResult(); | 308 | hideResult(); |
| 309 | - showVote(); | 309 | +// showVote(); |
| 310 | } | 310 | } |
| 311 | }); | 311 | }); |
| 312 | 312 |
C5/app/src/main/res/layout/list_multi_vote_result_item.xml
| @@ -29,7 +29,7 @@ | @@ -29,7 +29,7 @@ | ||
| 29 | android:layout_gravity="center_vertical" | 29 | android:layout_gravity="center_vertical" |
| 30 | android:layout_marginLeft="10dp" | 30 | android:layout_marginLeft="10dp" |
| 31 | android:layout_weight="1" | 31 | android:layout_weight="1" |
| 32 | - android:gravity="center" | 32 | + android:gravity="left|center_vertical" |
| 33 | android:text="表决标题表决标题表决标题表决标题表决标题表决标题表决标题表决标题" | 33 | android:text="表决标题表决标题表决标题表决标题表决标题表决标题表决标题表决标题" |
| 34 | android:textColor="@color/white" | 34 | android:textColor="@color/white" |
| 35 | android:textSize="@dimen/px40dp" /> | 35 | android:textSize="@dimen/px40dp" /> |