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;