孙向锦 / VoteC5

Commit f5d0062e6300e06ec6dacdf79fa22bb6699b7061

Authored by wutaian
2 parents 4801fa6f ab44099d

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

Inline Side-by-side
Showing 3 changed files with 7 additions and 6 deletions
C5/app/src/main/java/com/sunvote/xpadapp/fragments/ResultVoteFragment.java
  View file @f5d0062
... ... @@ -192,16 +192,16 @@ public class ResultVoteFragment extends BaseFragment {
192 192 if (voteInfo.resultInfo.num5 != 0xffff) {
193 193 dataTitleLayout2.setVisibility(View.VISIBLE);
194 194 String text = "" + voteInfo.resultInfo.num5 ;
195   - if(szc != null && !"".equals(szc)){
196   - text += "(" + szc + "%)" ;
  195 + if(sfd != null && !"".equals(sfd)){
  196 + text += "(" + sfd + "%)" ;
197 197 }
198 198 ((TextView)(dataTitleLayout2.findViewById(R.id.data_title_layout2_text2))).setText(text);
199 199 }
200 200 if (voteInfo.resultInfo.num6 != 0xffff) {
201 201 dataTitleLayout1.setVisibility(View.VISIBLE);
202 202 String text = "" + voteInfo.resultInfo.num6 ;
203   - if(szc != null && !"".equals(szc)){
204   - text += "(" + szc + "%)" ;
  203 + if(swa != null && !"".equals(swa)){
  204 + text += "(" + swa + "%)" ;
205 205 }
206 206 ((TextView)(dataTitleLayout3.findViewById(R.id.data_title_layout3_text2))).setText(text);
207 207 }
... ...
C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java
  View file @f5d0062
... ... @@ -458,6 +458,7 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
458 458 private void showResult() {
459 459 if (bill.voteResult > 0) {
460 460 ivReuslt.setVisibility(View.INVISIBLE);
  461 + singlevoteTvTipsLayout.setVisibility(View.GONE);
461 462 new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
462 463 @Override
463 464 public void run() {
... ...
C5/app/src/main/res/layout/fragment_singlevote.xml
  View file @f5d0062
... ... @@ -148,8 +148,8 @@
148 148  
149 149 <TextView
150 150 android:id="@+id/singlevote_tv_tips"
151   - android:layout_width="200dp"
152   - android:layout_height="80dp"
  151 + android:layout_width="@dimen/px554dp"
  152 + android:layout_height="@dimen/px133dp"
153 153 android:layout_centerHorizontal="true"
154 154 android:gravity="center"
155 155 android:text="@string/submiting"
... ...