From 52dd32c13847c49a864a2d541ec191921488fa48 Mon Sep 17 00:00:00 2001 From: eggmanQQQ <3671373519@qq.com> Date: Mon, 9 Dec 2024 11:15:25 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E5=9B=A0=E4=B8=BA=20=E7=BD=91=E7=BB=9C=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E6=8B=BF=E4=B8=8D=E5=88=B0=E9=92=B1=E5=8C=85=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=20=E5=AF=BC=E8=87=B4=E7=9A=84=E5=B4=A9=E6=BA=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/chwl/app/avroom/widget/CoinTipsView.kt | 4 ++-- .../main/java/com/chwl/core/pay/PayModel.java | 16 +++------------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/chwl/app/avroom/widget/CoinTipsView.kt b/app/src/main/java/com/chwl/app/avroom/widget/CoinTipsView.kt index b75747d24..cac0c39b7 100644 --- a/app/src/main/java/com/chwl/app/avroom/widget/CoinTipsView.kt +++ b/app/src/main/java/com/chwl/app/avroom/widget/CoinTipsView.kt @@ -35,7 +35,7 @@ class CoinTipsView : FrameLayout { private fun initView(context: Context) { mRootViewBinding = ViewCoinTipsBinding.inflate(LayoutInflater.from(context),this,true) - mCoin = PayModel.get().currentWalletInfo?.diamondNum?.toInt()?:0 + mCoin = (PayModel.get().currentWalletInfo?.diamondNum ?: 0.0).toInt() mRootViewBinding.price.text = mCoin?.toString()?:"" } @@ -120,7 +120,7 @@ class CoinTipsView : FrameLayout { * number != null ,表示 接收中奖消息, 这时展示增加 */ private fun setCoinText(number: String?,isAdd: Boolean) : String? { - val newCoin = PayModel.get().currentWalletInfo?.diamondNum?.toInt()?:0 + val newCoin = (PayModel.get().currentWalletInfo?.diamondNum ?: 0.0).toInt() val oldCoin = if (mCoin != null ) mCoin else newCoin val num = newCoin - oldCoin!! diff --git a/core/src/main/java/com/chwl/core/pay/PayModel.java b/core/src/main/java/com/chwl/core/pay/PayModel.java index a1d402095..330fbb2e6 100644 --- a/core/src/main/java/com/chwl/core/pay/PayModel.java +++ b/core/src/main/java/com/chwl/core/pay/PayModel.java @@ -2,25 +2,16 @@ package com.chwl.core.pay; import static com.chwl.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_ACCOUNT; -import android.content.Context; - import com.alibaba.fastjson.JSONObject; -import com.chwl.core.pay.bean.ChargeBean; -import com.google.gson.JsonObject; -import com.chwl.core.XConstants; import com.chwl.core.R; +import com.chwl.core.XConstants; import com.chwl.core.auth.AuthModel; import com.chwl.core.base.BaseModel; import com.chwl.core.bean.response.ServiceResult; import com.chwl.core.bean.response.result.ChargeListResult; -import com.chwl.core.bean.response.result.WalletInfoResult; import com.chwl.core.manager.IMNetEaseManager; import com.chwl.core.manager.RoomEvent; -import com.chwl.core.pay.bean.Banner; -import com.chwl.core.pay.bean.ChargeBannerInfo; -import com.chwl.core.pay.bean.ChargeChannelInfo; -import com.chwl.core.pay.bean.FirstChargeGoods; -import com.chwl.core.pay.bean.NewUserChargeInfo; +import com.chwl.core.pay.bean.ChargeBean; import com.chwl.core.pay.bean.PayRecordId; import com.chwl.core.pay.bean.WalletInfo; import com.chwl.core.pay.event.ChargeCustomNotificationEvent; @@ -31,7 +22,6 @@ import com.chwl.core.user.event.LoginUserInfoUpdateEvent; import com.chwl.core.utils.net.IgnoreException; import com.chwl.core.utils.net.RxHelper; import com.chwl.library.net.rxnet.RxNet; -import com.chwl.library.utils.NetworkUtils; import com.chwl.library.utils.ResUtil; import com.chwl.library.utils.codec.DESUtils; @@ -72,7 +62,7 @@ public class PayModel extends BaseModel implements IPayModel { */ public static final int RECHARGE_LIMIT = 50000; - protected WalletInfo walletInfo; + protected WalletInfo walletInfo = new WalletInfo(); private boolean firstChargeSuccess = false;