2 Revize bf189e7b19 ... fe46b3ce96

Autor SHA1 Zpráva Datum
  liujiangyao fe46b3ce96 Merge remote-tracking branch 'origin/sheep_develop' into sheep_develop před 7 roky
  liujiangyao 0df4d0f0f4 游戏中心界面优化 před 7 roky

+ 7 - 3
app/src/main/java/com/sheep/gamegroup/absBase/BaseActivity.java

@@ -106,9 +106,13 @@ public abstract class BaseActivity extends AppCompatActivity {
 
     @Override
     protected void onDestroy() {
-        super.onDestroy();
-        if (this.unbinder != null) {
-            this.unbinder.unbind();
+        try {
+            super.onDestroy();
+            if (this.unbinder != null) {
+                this.unbinder.unbind();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 }

+ 2 - 2
app/src/main/res/layout/item_hot_welfare.xml

@@ -19,7 +19,7 @@
     <TextView
         android:id="@+id/item_hot_welfare_tv"
         android:layout_width="wrap_content"
-        android:maxWidth="90dp"
+        android:maxEms="5"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="12dp"
@@ -27,6 +27,6 @@
         android:textColor="#333333"
         android:textSize="12sp"
         android:gravity="center"
-        android:lines="1"
+        android:lines="2"
         android:text=""/>
 </LinearLayout>