diff --git a/app/src/main/java/com/gamedog/vididin/beans/WatchAdNotifyBean.kt b/app/src/main/java/com/gamedog/vididin/beans/WatchAdNotifyBean.kt index 75f2644..44a7b02 100644 --- a/app/src/main/java/com/gamedog/vididin/beans/WatchAdNotifyBean.kt +++ b/app/src/main/java/com/gamedog/vididin/beans/WatchAdNotifyBean.kt @@ -4,7 +4,7 @@ package com.gamedog.vididin.beans data class WatchAdNotifyBean( - var earnMoneyNum: Float = 0F, + var earnMoneyNum: Double = 0.0, var extraData: T, ) diff --git a/app/src/main/java/com/gamedog/vididin/features/watchad/WatchAdActivity.kt b/app/src/main/java/com/gamedog/vididin/features/watchad/WatchAdActivity.kt index fda47a3..45b2e0e 100644 --- a/app/src/main/java/com/gamedog/vididin/features/watchad/WatchAdActivity.kt +++ b/app/src/main/java/com/gamedog/vididin/features/watchad/WatchAdActivity.kt @@ -28,7 +28,7 @@ import com.viddin.videos.free.databinding.ActivityWatchAdBinding as ViewBinding class WatchAdActivity : AppViewsEmptyViewModelActivity(), OnTabStyleListener { override fun inflateViewBinding(inflater: LayoutInflater) = ViewBinding.inflate(inflater) - private var mRewardedDollarNum: Float = 0F + private var mRewardedDollarNum: Double = 0.0 override var mEnableBannerAd = false private lateinit var mCountDownTimer: CountDownTimer diff --git a/app/src/main/java/com/gamedog/vididin/manager/WithdrawManager.kt b/app/src/main/java/com/gamedog/vididin/manager/WithdrawManager.kt index f3c87f4..5688156 100644 --- a/app/src/main/java/com/gamedog/vididin/manager/WithdrawManager.kt +++ b/app/src/main/java/com/gamedog/vididin/manager/WithdrawManager.kt @@ -119,15 +119,15 @@ class WithdrawManager private constructor() { private fun generateItemList(): MutableList { val itemList = mutableListOf() itemList.add(WithdrawItemBean(0, 0.1, isBigWithDraw = false)) - itemList.add(WithdrawItemBean(1, 10.0, AndroidUtil.randomInt(50, 70), generateSubItemList(10F))) - itemList.add(WithdrawItemBean(2, 20.0, AndroidUtil.randomInt(50, 70), generateSubItemList(20F))) - itemList.add(WithdrawItemBean(3, 50.0, AndroidUtil.randomInt(50, 70), generateSubItemList(50F))) - itemList.add(WithdrawItemBean(4, 100.0, AndroidUtil.randomInt(50, 70), generateSubItemList(100F))) - itemList.add(WithdrawItemBean(5, 300.0, AndroidUtil.randomInt(50, 70), generateSubItemList(300F))) + itemList.add(WithdrawItemBean(1, 10.0, AndroidUtil.randomInt(50, 70), generateSubItemList(10.0))) + itemList.add(WithdrawItemBean(2, 20.0, AndroidUtil.randomInt(50, 70), generateSubItemList(20.0))) + itemList.add(WithdrawItemBean(3, 50.0, AndroidUtil.randomInt(50, 70), generateSubItemList(50.0))) + itemList.add(WithdrawItemBean(4, 100.0, AndroidUtil.randomInt(50, 70), generateSubItemList(100.0))) + itemList.add(WithdrawItemBean(5, 300.0, AndroidUtil.randomInt(50, 70), generateSubItemList(300.0))) return itemList } - private fun generateSubItemList(totalCashInItem: Float): List { + private fun generateSubItemList(totalCashInItem: Double): List { val subItemList = mutableListOf() val subItemCount: Int = (totalCashInItem/EACH_SUB_ITEM_CASH_NUM).toInt() @@ -175,7 +175,7 @@ class WithdrawManager private constructor() { return count } - fun addAdEarnForSubBean(itemIndex: Int, selectedSubIndex: Int, earnMoneyNum: Float) : Boolean { + fun addAdEarnForSubBean(itemIndex: Int, selectedSubIndex: Int, earnMoneyNum: Double) : Boolean { if (itemIndex >= 0 && itemIndex < mItemList.size) { try { val subBean = mItemList[itemIndex].subItemList[selectedSubIndex] @@ -610,7 +610,11 @@ class WithdrawManager private constructor() { if (itemIndex in 0..mItemList.size-1) { val curItem = mItemList[itemIndex] val userCashTotal = AccountManager.getCash() - val restAvailableCashNum = userCashTotal - getStartedItemRestCashCount() + var restAvailableCashNum = userCashTotal - getStartedItemRestCashCount() + + if (restAvailableCashNum < 0.0) { + restAvailableCashNum = 0.0 + } if (curItem.hasStarted || restAvailableCashNum >= curItem.totalCashNum) { itemProgress = 1.0 diff --git a/bill/src/main/java/com/remax/bill/ads/RewardedAdController.kt b/bill/src/main/java/com/remax/bill/ads/RewardedAdController.kt index 87dea60..16079f1 100644 --- a/bill/src/main/java/com/remax/bill/ads/RewardedAdController.kt +++ b/bill/src/main/java/com/remax/bill/ads/RewardedAdController.kt @@ -507,7 +507,7 @@ class RewardedAdController private constructor() { ) // 调用外部回调 - onRewardEarned?.invoke(rewardItem, CommonRewardedData(currentAdValue?.valueMicros?.toFloat() ?: 0F)) + onRewardEarned?.invoke(rewardItem, CommonRewardedData(currentAdValue?.valueMicros?.toDouble() ?: 0.0)) } rewardedAd.show(activity, onUserEarnedRewardListener) diff --git a/bill/src/main/java/com/remax/bill/ads/ext/AdShowExt.kt b/bill/src/main/java/com/remax/bill/ads/ext/AdShowExt.kt index 24dfbfc..3d62d42 100644 --- a/bill/src/main/java/com/remax/bill/ads/ext/AdShowExt.kt +++ b/bill/src/main/java/com/remax/bill/ads/ext/AdShowExt.kt @@ -332,7 +332,7 @@ object AdShowExt { activity, BuildConfig.TOPON_REWARDED_ID, { _, _, revenueValue -> - val rewardedData = CommonRewardedData(revenueValue.toFloat()) + val rewardedData = CommonRewardedData(revenueValue.toDouble()) rewardCallback?.invoke(rewardedData) //xxxx AdLogger.e("TopOn激励视频奖励回调, 奖励值:$revenueValue") diff --git a/bill/src/main/java/com/remax/bill/ads/ext/CommonRewardedData.kt b/bill/src/main/java/com/remax/bill/ads/ext/CommonRewardedData.kt index 0407f20..7e1ec30 100644 --- a/bill/src/main/java/com/remax/bill/ads/ext/CommonRewardedData.kt +++ b/bill/src/main/java/com/remax/bill/ads/ext/CommonRewardedData.kt @@ -1,5 +1,5 @@ package com.remax.bill.ads.ext data class CommonRewardedData ( - val rewardNum: Float = 0F + val rewardNum: Double = 0.0 ) \ No newline at end of file diff --git a/bill/src/main/java/com/remax/bill/ads/pangle/PangleRewardedAdController.kt b/bill/src/main/java/com/remax/bill/ads/pangle/PangleRewardedAdController.kt index 99c33de..4cfdd88 100644 --- a/bill/src/main/java/com/remax/bill/ads/pangle/PangleRewardedAdController.kt +++ b/bill/src/main/java/com/remax/bill/ads/pangle/PangleRewardedAdController.kt @@ -376,7 +376,7 @@ class PangleRewardedAdController private constructor() { val ecpmInfo: PAGAdEcpmInfo? = pagRevenueInfo?.showEcpm // Pangle 的 revenue 本身就是美元,直接使用 val revenueUsd = ecpmInfo?.revenue?.toDoubleOrNull() ?: 0.0 - onRewardEarned?.invoke(rewardItem, CommonRewardedData(revenueUsd.toFloat())) + onRewardEarned?.invoke(rewardItem, CommonRewardedData(revenueUsd.toDouble())) } override fun onAdReturnRevenue(pagAdEcpmInfo: PAGAdEcpmInfo?) {