From dd9a0f583371972e57d5362cddf31e891c942108 Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Fri, 22 Mar 2019 16:51:56 +0800
Subject: [PATCH] 修改投票过程显示结果的bug

---
 C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java | 17 ++++++++++-------
 C5/app/src/main/res/drawable/a.9.png                                        | Bin 0 -> 1433 bytes
 C5/app/src/main/res/drawable/voted_big.9.png                                | Bin 0 -> 7035 bytes
 C5/app/src/main/res/drawable/voted_empty.png                                | Bin 52507 -> 0 bytes
 C5/app/src/main/res/drawable/voted_empty_big.9.png                          | Bin 0 -> 3931 bytes
 C5/app/src/main/res/layout/fragment_singlevote.xml                          | 17 +++++++++--------
 6 files changed, 19 insertions(+), 15 deletions(-)
 create mode 100644 C5/app/src/main/res/drawable/a.9.png
 create mode 100644 C5/app/src/main/res/drawable/voted_big.9.png
 create mode 100644 C5/app/src/main/res/drawable/voted_empty_big.9.png

diff --git a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java
index 9c3eef2..06d2c66 100644
--- a/C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java
+++ b/C5/app/src/main/java/com/sunvote/xpadapp/fragments/SingleTitleFragment.java
@@ -467,13 +467,16 @@ public class SingleTitleFragment extends BaseFragment implements ContentVoteOnBa
 							ivReuslt.setText(options[voteValue - 1]);
 							ivReuslt.setBackgroundResource(R.drawable.voted_empty);
 							tvTitle.setTextColor(Color.parseColor("#B5B5B5"));
-						}
-					} else {
-						ivReuslt.setText("");
-						ivReuslt.setBackgroundResource(R.drawable.voted);
-						tvTitle.setTextColor(Color.parseColor("#B5B5B5"));
-					}
-					ivReuslt.setVisibility(View.VISIBLE);
+                            ivReuslt.setVisibility(View.VISIBLE);
+                        }
+                    } else {
+                        tvTips.setBackgroundResource(R.drawable.voted);
+                        tvTips.setVisibility(View.VISIBLE);
+                        tvTips.setText("");
+//                        ivReuslt.setText("");
+//                        ivReuslt.setBackgroundResource(R.drawable.voted);
+                        tvTitle.setTextColor(Color.parseColor("#B5B5B5"));
+                    }
 				}
 			},200);
 		} else {
diff --git a/C5/app/src/main/res/drawable/a.9.png b/C5/app/src/main/res/drawable/a.9.png
new file mode 100644
index 0000000..297536b
Binary files /dev/null and b/C5/app/src/main/res/drawable/a.9.png differ
diff --git a/C5/app/src/main/res/drawable/voted_big.9.png b/C5/app/src/main/res/drawable/voted_big.9.png
new file mode 100644
index 0000000..976adde
Binary files /dev/null and b/C5/app/src/main/res/drawable/voted_big.9.png differ
diff --git a/C5/app/src/main/res/drawable/voted_empty.png b/C5/app/src/main/res/drawable/voted_empty.png
index 7024ba7..336871c 100644
Binary files a/C5/app/src/main/res/drawable/voted_empty.png and b/C5/app/src/main/res/drawable/voted_empty.png differ
diff --git a/C5/app/src/main/res/drawable/voted_empty_big.9.png b/C5/app/src/main/res/drawable/voted_empty_big.9.png
new file mode 100644
index 0000000..62a2d38
Binary files /dev/null and b/C5/app/src/main/res/drawable/voted_empty_big.9.png differ
diff --git a/C5/app/src/main/res/layout/fragment_singlevote.xml b/C5/app/src/main/res/layout/fragment_singlevote.xml
index 8c2e79b..1c77193 100644
--- a/C5/app/src/main/res/layout/fragment_singlevote.xml
+++ b/C5/app/src/main/res/layout/fragment_singlevote.xml
@@ -148,26 +148,27 @@
 
             <TextView
                 android:id="@+id/singlevote_tv_tips"
-                android:layout_width="@dimen/px554dp"
-                android:layout_height="@dimen/px133dp"
+                android:layout_width="@dimen/px622dp"
+                android:layout_height="@dimen/px217dp"
                 android:layout_centerHorizontal="true"
                 android:gravity="center"
                 android:text="@string/submiting"
                 android:textColor="#AC1007"
-                android:textSize="@dimen/big_text_p1"
-                android:textStyle="bold" />
+                android:textSize="@dimen/px140dp"
+                android:textStyle="bold"
+                />
 
             <TextView
                 android:id="@+id/singlevote_tv_result"
-                android:layout_width="200dp"
-                android:layout_height="80dp"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/px217dp"
                 android:layout_centerHorizontal="true"
                 android:gravity="center"
                 android:textColor="#4b3b93"
                 android:background="@drawable/voted_empty"
-                android:textSize="@dimen/big_text_p1"
+                android:textSize="@dimen/px120dp"
                 android:textStyle="bold"
-                android:visibility="gone" />
+                />
         </RelativeLayout>
     </RelativeLayout>
 
--
libgit2 0.21.4