diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionCustomFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionCustomFragment.java index 90b1ef0..1ae1712 100644 --- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionCustomFragment.java +++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionCustomFragment.java @@ -397,14 +397,10 @@ public class ElectionCustomFragment extends BaseFragment { convertView.setBackgroundColor(position % 2 == 0 ? Color.WHITE : Color.parseColor("#E5E5E5")); holder.tvNum.setText(String.valueOf(it.No)); holder.tvName.setText(String.valueOf(it.title)); - if (it.result == 4) { - holder.RG.clearCheck(); - } else if (it.result == 1) { + if (it.result == 1) { holder.RG.check(R.id.list_election_item_oo); - } else if (it.result == 2) { - holder.RG.check(R.id.list_election_item_xx); - }else if (it.result == 3) { - holder.RG.check(R.id.list_election_item_abstain); + } else{ + holder.RG.clearCheck(); } if(it.modifyModel){ @@ -417,11 +413,7 @@ public class ElectionCustomFragment extends BaseFragment { holder.btnAbstain.setEnabled(true); } - if(it.result == 1){ - holder.btnO.setChecked(true); - }else { - holder.btnO.setChecked(false); - } + holder.btnO.setOnClickListener(new OnClickListener() { @Override diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionFragment.java index 9fc87bc..16a9af1 100644 --- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionFragment.java +++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ElectionFragment.java @@ -306,7 +306,7 @@ public class ElectionFragment extends BaseFragment { listview.setVisibility(View.VISIBLE); hideConfirm(); hideResult(); - showVote(); +// showVote(); } }); diff --git a/C5/app/src/main/res/layout/list_multi_vote_result_item.xml b/C5/app/src/main/res/layout/list_multi_vote_result_item.xml index 6a6603b..798afd0 100644 --- a/C5/app/src/main/res/layout/list_multi_vote_result_item.xml +++ b/C5/app/src/main/res/layout/list_multi_vote_result_item.xml @@ -29,7 +29,7 @@ android:layout_gravity="center_vertical" android:layout_marginLeft="10dp" android:layout_weight="1" - android:gravity="center" + android:gravity="left|center_vertical" android:text="表决标题表决标题表决标题表决标题表决标题表决标题表决标题表决标题" android:textColor="@color/white" android:textSize="@dimen/px40dp" />