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 435dfd3..1a0b660 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 @@ -370,7 +370,7 @@ public class ElectionFragment extends BaseFragment { //tvInfo.setText(""); if(voteInfo!=null){ if(voteInfo!=null){ - tvTitle.setText(bill.title + String.format("(候选人%s人,应选%s人)",houxuan,voteInfo.select) ); + tvTitle.setText(bill.title); } showVote(); checkVoted(); diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultMultiVoteFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultMultiVoteFragment.java index a99282d..9b5abd2 100644 --- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultMultiVoteFragment.java +++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultMultiVoteFragment.java @@ -95,14 +95,14 @@ public class ResultMultiVoteFragment extends SuperBaseFragment { if (yindao == 0xff || yindao == 0xffff) { tvYindao.setVisibility(View.GONE); } else { - tvYindao.setText(getString(R.string.yindao) + getString(R.string.maohao) + yindao); + tvYindao.setText("" + + yindao); tvYindao.setVisibility(View.VISIBLE); } if (shidao == 0xff || shidao == 0xffff) { tvShidao.setVisibility(View.GONE); } else { - tvShidao.setText(getString(R.string.shidao) + getString(R.string.maohao) + shidao); + tvShidao.setText("" + shidao); tvShidao.setVisibility(View.VISIBLE); } diff --git a/C5/app/src/main/res/layout/fragment_election.xml b/C5/app/src/main/res/layout/fragment_election.xml index 79188a2..e5b7b1c 100644 --- a/C5/app/src/main/res/layout/fragment_election.xml +++ b/C5/app/src/main/res/layout/fragment_election.xml @@ -160,8 +160,6 @@ android:layout_below="@id/election_pannal_OX" android:layout_marginTop="@dimen/content_margin" android:layout_marginBottom="2dp" - android:layout_marginLeft="@dimen/content_margin" - android:layout_marginRight="@dimen/content_margin" android:divider="@color/votebakground" android:dividerHeight="2dp" > diff --git a/C5/app/src/main/res/layout/fragment_result_multi_vote.xml b/C5/app/src/main/res/layout/fragment_result_multi_vote.xml index 52fabf5..0c07cd8 100644 --- a/C5/app/src/main/res/layout/fragment_result_multi_vote.xml +++ b/C5/app/src/main/res/layout/fragment_result_multi_vote.xml @@ -2,8 +2,7 @@ + android:background="#ff004586"> @@ -61,8 +59,9 @@ android:layout_centerVertical="true" android:layout_weight="1" android:gravity="center" - android:textColor="@color/white" - android:textSize="@dimen/big_text_p6" + android:textColor="@color/yellow" + android:text="表决项" + android:textSize="@dimen/big_text_p4" android:textStyle="bold" /> @@ -84,7 +83,7 @@ android:layout_marginLeft="15dp" android:gravity="center" android:text="@string/oppose" - android:textColor="@color/white" + android:textColor="@color/yellow" android:textSize="@dimen/big_text_p4" android:textStyle="bold" /> @@ -95,7 +94,7 @@ android:layout_marginLeft="15dp" android:gravity="center" android:text="@string/abstant" - android:textColor="@color/white" + android:textColor="@color/yellow" android:textSize="@dimen/big_text_p4" android:textStyle="bold" /> @@ -106,7 +105,7 @@ android:layout_marginLeft="15dp" android:gravity="center" android:text="@string/unvote" - android:textColor="@color/white" + android:textColor="@color/yellow" android:textSize="@dimen/big_text_p4" android:textStyle="bold" /> @@ -118,37 +117,73 @@ android:layout_marginLeft="15dp" android:gravity="center" android:text="@string/result" - android:textColor="@color/white" + android:textColor="@color/yellow" android:textSize="@dimen/big_text_p4" android:textStyle="bold" /> - + android:layout_marginBottom="20dp"> - + android:layout_centerHorizontal="true" + android:orientation="horizontal"> + + + + + + + + + + + + - - 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 4d34d18..22fa9a3 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 @@ -1,7 +1,8 @@ + android:layout_height="match_parent" + android:paddingRight="80dp">