From e251550ffbf124f0ee3060ce481f7492f6781ec0 Mon Sep 17 00:00:00 2001
From: renhaoting <370797079@qq.com>
Date: Thu, 18 Dec 2025 15:51:15 +0800
Subject: [PATCH] =?UTF-8?q?admob=20revence=20=E5=9B=9E=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/remax/bill/ads/RewardedAdController.kt    |  7 ++++---
 bill/src/main/java/com/remax/bill/ads/ext/AdShowExt.kt | 10 +++-------
 2 files changed, 7 insertions(+), 10 deletions(-)

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 461707a..ff81cb0 100644
--- a/bill/src/main/java/com/remax/bill/ads/RewardedAdController.kt
+++ b/bill/src/main/java/com/remax/bill/ads/RewardedAdController.kt
@@ -24,6 +24,7 @@ import com.remax.base.ads.AdRevenueManager
 import com.remax.base.ads.RevenueInfo
 import com.remax.base.ext.KvIntDelegate
 import com.remax.base.report.DataReportManager
+import com.remax.bill.ads.ext.CommonRewardedData
 import com.remax.bill.ads.log.AdLogger
 import com.remax.bill.ads.util.PositionGet
 import com.remax.bill.ui.dialog.ADLoadingDialog
@@ -137,7 +138,7 @@ class RewardedAdController private constructor() {
     /**
      * 显示广告
      */
-    suspend fun showAd(activity: Activity, adUnitId: String? = null, onRewardEarned: ((RewardItem) -> Unit)? = null): AdResult<Unit> {
+    suspend fun showAd(activity: Activity, adUnitId: String? = null, onRewardEarned: ((RewardItem, CommonRewardedData) -> Unit)? = null): AdResult<Unit> {
         val finalAdUnitId = adUnitId ?: BuildConfig.ADMOB_REWARDED_ID
 
         // 累积触发统计
@@ -379,7 +380,7 @@ class RewardedAdController private constructor() {
         activity: Activity,
         rewardedAd: RewardedAd,
         adUnitId: String,
-        onRewardEarned: ((RewardItem) -> Unit)?
+        onRewardEarned: ((RewardItem, CommonRewardedData) -> Unit)?
     ): AdResult<Unit> {
         return suspendCancellableCoroutine { continuation ->
             var hasRewarded = false
@@ -504,7 +505,7 @@ class RewardedAdController private constructor() {
                 )
 
                 // 调用外部回调
-                onRewardEarned?.invoke(rewardItem)
+                onRewardEarned?.invoke(rewardItem, CommonRewardedData(currentAdValue?.valueMicros?.toFloat() ?: 0F))
             }
 
             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 dd4b2ae..9e95b5a 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
@@ -301,9 +301,6 @@ object AdShowExt {
         AdLogger.d("激励视频广告竞价结果: $winner")
 
 
-        //----------------------------------------------------
-
-
 
         return when (winner) {
             BiddingWinner.ADMOB -> {
@@ -311,10 +308,9 @@ object AdShowExt {
                 RewardedAdController.getInstance().showAd(
                     activity,
                     BuildConfig.ADMOB_REWARDED_ID,
-                    { rewardItem ->
-                        val rewardedData = CommonRewardedData(rewardItem.amount.toFloat())
-                        rewardCallback?.invoke(rewardedData)
-                        AdLogger.e("AdMob激励视频奖励回调, 奖励值：${rewardItem.amount}")
+                    { rewardItem, commonRewardedData ->
+                        rewardCallback?.invoke(commonRewardedData)
+                        AdLogger.e("AdMob激励视频奖励回调, 奖励值：${commonRewardedData.rewardNum}")
                     }
                 )
             }