Commit 829e31021566bdcce180b0d890d5fcda277e25b7
Merge branch 'C58寸' of http://120.78.57.84/Elvis/VoteC5 into C58寸
Showing
6 changed files
with
19 additions
and
15 deletions
C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java
... | ... | @@ -467,13 +467,16 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa |
467 | 467 | ivReuslt.setText(options[voteValue - 1]); |
468 | 468 | ivReuslt.setBackgroundResource(R.drawable.voted_empty); |
469 | 469 | tvTitle.setTextColor(Color.parseColor("#B5B5B5")); |
470 | - } | |
471 | - } else { | |
472 | - ivReuslt.setText(""); | |
473 | - ivReuslt.setBackgroundResource(R.drawable.voted); | |
474 | - tvTitle.setTextColor(Color.parseColor("#B5B5B5")); | |
475 | - } | |
476 | - ivReuslt.setVisibility(View.VISIBLE); | |
470 | + ivReuslt.setVisibility(View.VISIBLE); | |
471 | + } | |
472 | + } else { | |
473 | + tvTips.setBackgroundResource(R.drawable.voted); | |
474 | + tvTips.setVisibility(View.VISIBLE); | |
475 | + tvTips.setText(""); | |
476 | +// ivReuslt.setText(""); | |
477 | +// ivReuslt.setBackgroundResource(R.drawable.voted); | |
478 | + tvTitle.setTextColor(Color.parseColor("#B5B5B5")); | |
479 | + } | |
477 | 480 | } |
478 | 481 | },200); |
479 | 482 | } else { | ... | ... |
C5/app/src/main/res/drawable/a.9.png
0 → 100644
1.4 KB
C5/app/src/main/res/drawable/voted_big.9.png
0 → 100644
6.87 KB
C5/app/src/main/res/drawable/voted_empty.png
C5/app/src/main/res/drawable/voted_empty_big.9.png
0 → 100644
3.84 KB
C5/app/src/main/res/layout/fragment_singlevote.xml
... | ... | @@ -148,26 +148,27 @@ |
148 | 148 | |
149 | 149 | <TextView |
150 | 150 | android:id="@+id/singlevote_tv_tips" |
151 | - android:layout_width="@dimen/px554dp" | |
152 | - android:layout_height="@dimen/px133dp" | |
151 | + android:layout_width="@dimen/px622dp" | |
152 | + android:layout_height="@dimen/px217dp" | |
153 | 153 | android:layout_centerHorizontal="true" |
154 | 154 | android:gravity="center" |
155 | 155 | android:text="@string/submiting" |
156 | 156 | android:textColor="#AC1007" |
157 | - android:textSize="@dimen/big_text_p1" | |
158 | - android:textStyle="bold" /> | |
157 | + android:textSize="@dimen/px140dp" | |
158 | + android:textStyle="bold" | |
159 | + /> | |
159 | 160 | |
160 | 161 | <TextView |
161 | 162 | android:id="@+id/singlevote_tv_result" |
162 | - android:layout_width="200dp" | |
163 | - android:layout_height="80dp" | |
163 | + android:layout_width="wrap_content" | |
164 | + android:layout_height="@dimen/px217dp" | |
164 | 165 | android:layout_centerHorizontal="true" |
165 | 166 | android:gravity="center" |
166 | 167 | android:textColor="#4b3b93" |
167 | 168 | android:background="@drawable/voted_empty" |
168 | - android:textSize="@dimen/big_text_p1" | |
169 | + android:textSize="@dimen/px120dp" | |
169 | 170 | android:textStyle="bold" |
170 | - android:visibility="gone" /> | |
171 | + /> | |
171 | 172 | </RelativeLayout> |
172 | 173 | </RelativeLayout> |
173 | 174 | ... | ... |