Browse Source

feat: reward dialog

tongmengxiao 2 months ago
parent
commit
1d9ff105eb

+ 17 - 0
baseswago/src/main/java/com/swago/baseswago/model/UserInfoModel.java

@@ -109,6 +109,11 @@ public class UserInfoModel {
      * */
      * */
     private boolean is_zhuanpan_every_day;
     private boolean is_zhuanpan_every_day;
 
 
+    /**
+     * 每日首充
+     * */
+    private boolean first_charge;
+
     private String android_join_special;
     private String android_join_special;
     private String android_head_special;
     private String android_head_special;
     private String android_badge_special;
     private String android_badge_special;
@@ -419,6 +424,18 @@ public class UserInfoModel {
         this.is_recharge = is_recharge;
         this.is_recharge = is_recharge;
     }
     }
 
 
+    public boolean isFirst_charge() {
+        return first_charge;
+    }
+
+    public void setFirst_charge(boolean first_charge) {
+        this.first_charge = first_charge;
+    }
+
+    public boolean isIs_zhuanpan_every_day() {
+        return is_zhuanpan_every_day;
+    }
+
     public boolean getIs_zhuanpan_every_day() {
     public boolean getIs_zhuanpan_every_day() {
         return is_zhuanpan_every_day;
         return is_zhuanpan_every_day;
     }
     }

+ 4 - 0
room/src/main/java/com/swago/room/reward/RewardView.kt

@@ -105,6 +105,10 @@ class RewardView : FrameLayout, IRoomActiveListener, RoomTimer.TimeTickListener
     }
     }
 
 
     override fun closeRoomed() {
     override fun closeRoomed() {
+        scaleXAnimator?.cancel()
+        scaleYAnimator?.cancel()
+        scaleXAnimator = null
+        scaleYAnimator = null
         RoomTimer.timeTickList.remove(this)
         RoomTimer.timeTickList.remove(this)
         SwagoRoomManager.removeListener(this)
         SwagoRoomManager.removeListener(this)
     }
     }