Merge branch 'C58寸' of http://120.78.57.84/Elvis/VoteC5 into C58寸

wutaian
2 parents 4801fa6f ab44099d
Showing 3 changed files with 7 additions and 6 deletions
C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultVoteFragment.java
C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java
C5/app/src/main/res/layout/fragment_singlevote.xml
@@ -192,16 +192,16 @@ public class ResultVoteFragment extends BaseFragment {
             if (voteInfo.resultInfo.num5 != 0xffff) {
                 dataTitleLayout2.setVisibility(View.VISIBLE);
                 String text = "" + voteInfo.resultInfo.num5 ;
-                if(szc != null && !"".equals(szc)){
-                    text += "(" + szc + "%)" ;
+                if(sfd != null && !"".equals(sfd)){
+                    text += "(" + sfd + "%)" ;
                 }
                 ((TextView)(dataTitleLayout2.findViewById(R.id.data_title_layout2_text2))).setText(text);
             }
             if (voteInfo.resultInfo.num6 != 0xffff) {
                 dataTitleLayout1.setVisibility(View.VISIBLE);
                 String text = "" + voteInfo.resultInfo.num6 ;
-                if(szc != null && !"".equals(szc)){
-                    text += "(" + szc + "%)" ;
+                if(swa != null && !"".equals(swa)){
+                    text += "(" + swa + "%)" ;
                 }
                 ((TextView)(dataTitleLayout3.findViewById(R.id.data_title_layout3_text2))).setText(text);
             }
@@ -458,6 +458,7 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
 	private void showResult() {
 		if (bill.voteResult > 0) {
 			ivReuslt.setVisibility(View.INVISIBLE);
+			singlevoteTvTipsLayout.setVisibility(View.GONE);
 			new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
 				@Override
 				public void run() {
@@ -148,8 +148,8 @@
             <TextView
                 android:id="@+id/singlevote_tv_tips"
-                android:layout_width="200dp"
-                android:layout_height="80dp"
+                android:layout_width="@dimen/px554dp"
+                android:layout_height="@dimen/px133dp"
                 android:layout_centerHorizontal="true"
                 android:gravity="center"
                 android:text="@string/submiting"