From 42aea570b3616a8055deef84d3a089d659d755bc Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Tue, 10 Jan 2023 16:44:53 +0800
Subject: [PATCH] =?UTF-8?q?bugfix:=E4=BF=AE=E5=A4=8D=E7=B3=96=E6=9E=9C?=
 =?UTF-8?q?=E6=A0=91=E8=B4=AD=E4=B9=B0=E7=B3=96=E6=9E=9C=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E4=B8=8D=E5=88=B7=E6=96=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../moshen/treasure_box/activity/TreasureBoxActivity.java | 8 ++++++--
 .../treasure_box/activity/TreasureBoxHonourActivity.java  | 8 ++++++--
 core/src/main/java/com/mango/core/pay/PayModel.java       | 7 +------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/activity/TreasureBoxActivity.java b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/activity/TreasureBoxActivity.java
index e77b03923..835bccd77 100644
--- a/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/activity/TreasureBoxActivity.java
+++ b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/activity/TreasureBoxActivity.java
@@ -118,11 +118,16 @@ public class TreasureBoxActivity extends BaseBindingActivity<ActivityTreasureBox
             }
         });
 
-        loadKeyInfo();
         looperPrize();
         looperHintPrize();
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+        loadKeyInfo();
+    }
+
     @SuppressLint("CheckResult")
     private void loadKeyInfo() {
         BoxModel.get()
@@ -313,7 +318,6 @@ public class TreasureBoxActivity extends BaseBindingActivity<ActivityTreasureBox
                 .subscribe(roomEvent -> {
                     switch (roomEvent.getEvent()) {
                         case RoomEvent.WALLET_UPDATE:
-                            loadKeyInfo();
                             setGold(roomEvent.getWalletInfo().getDiamondNum());
                             break;
                         case RoomEvent.KICK_OUT_ROOM:
diff --git a/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/activity/TreasureBoxHonourActivity.java b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/activity/TreasureBoxHonourActivity.java
index c6553bfef..abe5d4993 100644
--- a/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/activity/TreasureBoxHonourActivity.java
+++ b/app/src/module_treasure_box/java/com/mango/moshen/treasure_box/activity/TreasureBoxHonourActivity.java
@@ -104,11 +104,16 @@ public class TreasureBoxHonourActivity extends BaseBindingActivity<ActivityTreas
                 mBinding.tvContinuousNum.setText("消耗" + num * 10);
             }
         });
-        loadKeyInfo();
         looperPrize();
         looperHintPrize();
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+        loadKeyInfo();
+    }
+
     @SuppressLint("CheckResult")
     private void loadKeyInfo() {
         BoxModel.get()
@@ -289,7 +294,6 @@ public class TreasureBoxHonourActivity extends BaseBindingActivity<ActivityTreas
                 .subscribe(roomEvent -> {
                     switch (roomEvent.getEvent()) {
                         case RoomEvent.WALLET_UPDATE:
-                            loadKeyInfo();
                             setGold(roomEvent.getWalletInfo().getDiamondNum());
                             break;
                         case RoomEvent.KICK_OUT_ROOM:
diff --git a/core/src/main/java/com/mango/core/pay/PayModel.java b/core/src/main/java/com/mango/core/pay/PayModel.java
index 24f4f28a3..6eaf20a7c 100644
--- a/core/src/main/java/com/mango/core/pay/PayModel.java
+++ b/core/src/main/java/com/mango/core/pay/PayModel.java
@@ -119,12 +119,7 @@ public class PayModel extends BaseModel implements IPayModel {
                 if (jsonObject == null) return;
                 WalletInfo walletInfo = new WalletInfo();
                 walletInfo.setUid(jsonObject.getLong("uid"));
-                walletInfo.setDepositNum(jsonObject.getIntValue("depositNum"));
-                walletInfo.setDiamondNum(jsonObject.getLong("diamonds"));
-                walletInfo.setGoldNum(jsonObject.getIntValue("golds"));
-                walletInfo.setCrystals(jsonObject.getDoubleValue("crystals"));
-                walletInfo.nobleGoldNum = jsonObject.getDoubleValue("nobleGoldNum");
-                walletInfo.chargeGoldNum = jsonObject.getDoubleValue("chargeGoldNum");
+                walletInfo.setDiamondNum(jsonObject.getDoubleValue("diamonds"));
                 this.walletInfo = walletInfo;
                 // 兼容新版
                 setWalletInfo(walletInfo);