修复kwai收益上报unitid错误问题

Assets/Script/SDKManager/AdjustManager/AdjustTrackEvent.cs

@@ -99,6 +99,7 @@ public class AdjustTrackEvent : D_MonoSingleton<AdjustTrackEvent>
         adjustAdRevenue.AdRevenueUnit = adRevenueUnit;
         adjustAdRevenue.AdRevenuePlacement = adRevenuePlacement;
         Adjust.TrackAdRevenue(adjustAdRevenue);
+        LoggerUtils.Debug("TrackAdImpressionEvent"+revenue+" adRevenueNetwork:"+adRevenueNetwork+" adRevenueUnit:"+adRevenueUnit+" adRevenuePlacement:"+adRevenuePlacement);
     }
 
     /// <summary>

Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/KwaiAdsManager.cs

@@ -94,9 +94,8 @@ namespace WZ
             {
                 _rewardAdController.Destroy();
                 _rewardAdController = null;
-                _rewardAdRevenue = 0;
             }
-
+            _rewardAdRevenue = -1;
             _rewardAdController = KwaiAds.Scripts.Api.KwaiAdsSdk.SDK.getRewardAdController();
             KwaiRewardAdRequest kwaiRewardAdRequest = new KwaiRewardAdRequest(_rewardAdUnitId);
             _rewardAdController.Load(kwaiRewardAdRequest, new RewardAdListener(), new RewardAdLoadListener());
@@ -168,9 +167,9 @@ namespace WZ
             {
                 _interstitialAdController.Destroy();
                 _interstitialAdController = null;
-                _interstitiaAdRevenue = 0;
-            }
                 
+            }
+            _interstitiaAdRevenue = -1;
             _interstitialAdController = KwaiAds.Scripts.Api.KwaiAdsSdk.SDK.getInterstitialAdController();
             KwaiInterstitialAdRequest kwaiInterstitialAdRequest = new KwaiInterstitialAdRequest(_interstitialAdUnitId);
             _interstitialAdController.Load(kwaiInterstitialAdRequest, new InterstitialAdListener(), new InterstitialAdLoadListener());

Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/KwaiFloorIvManager.cs

@@ -56,6 +56,7 @@ namespace WZ
             _successfulFloor = null;
             _isRequestingFloors = true;
             _currentRequestId = GenerateRequestId();
+            KwaiAdsManager.Instance._interstitiaAdRevenue = -1;
 
             // 增加waterfall请求计数
             _waterfallRequestCount++;
@@ -168,6 +169,7 @@ namespace WZ
             // 暂停其他并行请求
             _successfulFloor = floor;
             _isRequestingFloors = false;
+            KwaiAdsManager.Instance._interstitiaAdRevenue = revenue;
 
             // 取消其他楼层的请求
             foreach (var kvp in _ivFloorAdControllers)
@@ -275,11 +277,6 @@ namespace WZ
         {
             return Guid.NewGuid().ToString("N");
         }
-        
-        public string GetSuccessfulFloorUnitId()
-        { 
-            return _successfulFloor != null ? _successfulFloor.unite_id : "";
-        }
     }
 }
 

Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/KwaiFloorRvManager.cs

@@ -55,6 +55,7 @@ namespace WZ
             _successfulFloor = null;
             _isRequestingFloors = true;
             _currentRequestId = GenerateRequestId();
+            KwaiAdsManager.Instance._rewardAdRevenue = -1;
 
             // 增加waterfall请求计数
             _waterfallRequestCount++;
@@ -164,6 +165,7 @@ namespace WZ
             // 暂停其他并行请求
             _successfulFloor = floor;
             _isRequestingFloors = false;
+            KwaiAdsManager.Instance._rewardAdRevenue = revenue;
 
             // 取消其他楼层的请求
             foreach (var kvp in _rvFloorAdControllers)
@@ -271,11 +273,6 @@ namespace WZ
         {
             return Guid.NewGuid().ToString("N");
         }
-
-        public string GetSuccessfulFloorUnitId()
-        { 
-            return _successfulFloor != null ? _successfulFloor.unite_id : "";
-        }
     }
 }
 

Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/Listener/Inter/Floor/FloorInterAdListener.cs

@@ -22,7 +22,7 @@ namespace WZ
         {
             AdsActionEvents.TrackAdClicked(KwaiAdsManager.Instance.Platfrom,
                 KwaiAdsManager.Instance.ClientName,
-                KwaiFloorIvManager.Instance.GetSuccessfulFloorUnitId(),
+                _floor.unite_id,
                 AdsType.Interstitial,
                 KwaiAdsManager.Instance._ivPos,
                 KwaiAdsManager.Instance._interstitiaAdRevenue);
@@ -33,7 +33,7 @@ namespace WZ
         {
             AdsActionEvents.TrackAdClosed(KwaiAdsManager.Instance.Platfrom,
                 KwaiAdsManager.Instance.ClientName,
-                KwaiFloorIvManager.Instance.GetSuccessfulFloorUnitId(),
+                _floor.unite_id,
                 AdsType.Interstitial,
                 KwaiAdsManager.Instance._ivPos,
                 KwaiAdsManager.Instance._interstitiaAdRevenue);
@@ -50,7 +50,7 @@ namespace WZ
 
         public void OnAdShow()
         {
-            KwaiAdsManager.Instance.TrackAdImpression(AdsType.Interstitial,KwaiFloorIvManager.Instance.GetSuccessfulFloorUnitId());
+            KwaiAdsManager.Instance.TrackAdImpression(AdsType.Interstitial,_floor.unite_id);
             LoggerUtils.Debug("[kwai] floor inter OnAdShow");
         }
 

Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/Listener/Inter/Floor/FloorInterAdLoadListener.cs

@@ -38,13 +38,12 @@ namespace WZ
         public void OnAdLoadSuccess(string trackId, string price)
         {
             AdsKeyEvents.Instance.LogAdFPUEvents(AdsType.Interstitial);
-            KwaiAdsManager.Instance._interstitiaAdRevenue = DataUtils.StringToDouble(price) / 1000;
             AdsActionEvents.TrackAdLoaded(KwaiAdsManager.Instance.Platfrom,
                 KwaiAdsManager.Instance.ClientName,
                 trackId,
                 AdsType.Interstitial,
                 Time.realtimeSinceStartup - KwaiFloorIvManager.Instance._ivStartLoadTime);
-            _manager.OnFloorAdLoaded(_floor, _manager._ivFloorAdControllers[_floor.id],KwaiAdsManager.Instance._interstitiaAdRevenue);
+            _manager.OnFloorAdLoaded(_floor, _manager._ivFloorAdControllers[_floor.id],DataUtils.StringToDouble(price) / 1000);
             LoggerUtils.Debug("[kwai] floor inter ad load success: "+trackId+" with price: "+price);
         }
     }

Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/Listener/Inter/Standard/InterstitialAdLoadListener.cs

@@ -33,9 +33,9 @@ namespace WZ
         {
             LoggerUtils.Debug($"[kwai] InterstitialAdLoadListener#OnAdLoadSuccess , trackId:{trackId}, price:{price}");
             AdsKeyEvents.Instance.LogAdFPUEvents(AdsType.Interstitial);
-                KwaiAdsManager.Instance._interRetryAttempt = 0;
+            KwaiAdsManager.Instance._interRetryAttempt = 0;
-                KwaiAdsManager.Instance._interstitiaAdRevenue = DataUtils.StringToDouble(price)/1000;
+            KwaiAdsManager.Instance._interstitiaAdRevenue = DataUtils.StringToDouble(price)/1000;
-                AdsActionEvents.TrackAdLoaded(KwaiAdsManager.Instance.Platfrom,
+            AdsActionEvents.TrackAdLoaded(KwaiAdsManager.Instance.Platfrom,
                 KwaiAdsManager.Instance.ClientName,
                 trackId,
                 AdsType.Interstitial,

Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/Listener/Reward/Floor/FloorRewardAdListener.cs

@@ -21,7 +21,7 @@ namespace WZ
         {
             AdsActionEvents.TrackAdClicked(KwaiAdsManager.Instance.Platfrom,
                 KwaiAdsManager.Instance.ClientName,
-                KwaiFloorRvManager.Instance.GetSuccessfulFloorUnitId(),
+                _floor.unite_id,
                 AdsType.Rewarded,
                 KwaiAdsManager.Instance._rvPos,
                 KwaiAdsManager.Instance._rewardAdRevenue);
@@ -34,7 +34,7 @@ namespace WZ
         {
             AdsActionEvents.TrackAdClosed(KwaiAdsManager.Instance.Platfrom,
                 KwaiAdsManager.Instance.ClientName,
-                KwaiFloorRvManager.Instance.GetSuccessfulFloorUnitId(),
+                _floor.unite_id,
                 AdsType.Rewarded,
                 KwaiAdsManager.Instance._rvPos,
                 KwaiAdsManager.Instance._rewardAdRevenue);
@@ -53,7 +53,7 @@ namespace WZ
 
         public void OnAdShow()
         {
-            KwaiAdsManager.Instance.TrackAdImpression(AdsType.Rewarded,KwaiFloorRvManager.Instance.GetSuccessfulFloorUnitId());
+            KwaiAdsManager.Instance.TrackAdImpression(AdsType.Rewarded,_floor.unite_id);
             LoggerUtils.Debug("[kwai] floor reward RewardAdListener#OnAdShow");
 
         }

Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/Listener/Reward/Floor/FloorRewardAdLoadListener.cs

@@ -35,13 +35,12 @@ namespace WZ
 
         public void OnAdLoadSuccess(string trackId, string price)
         {
-            KwaiAdsManager.Instance._rewardAdRevenue = DataUtils.StringToDouble(price)/1000;
             AdsActionEvents.TrackAdLoaded(KwaiAdsManager.Instance.Platfrom,
                 KwaiAdsManager.Instance.ClientName,
                 trackId,
                 AdsType.Rewarded,
                 Time.realtimeSinceStartup - KwaiFloorRvManager.Instance._rvStartLoadTime);
-            _manager.OnFloorAdLoaded(_floor, _manager._rvFloorAdControllers[_floor.id], KwaiAdsManager.Instance._rewardAdRevenue);
+            _manager.OnFloorAdLoaded(_floor, _manager._rvFloorAdControllers[_floor.id], DataUtils.StringToDouble(price)/1000);
             LoggerUtils.Debug("[kwai] floor reward ad load success: "+_floor.id+" "+_floor.unite_id+" with price: "+price);
         }
     }