diff --git a/popcorn/Assets/Joypac/Plugins/Android/libs/unitybridge.jar b/popcorn/Assets/Joypac/Plugins/Android/libs/unitybridge.jar index 28a9313f..0ac14a1e 100644 Binary files a/popcorn/Assets/Joypac/Plugins/Android/libs/unitybridge.jar and b/popcorn/Assets/Joypac/Plugins/Android/libs/unitybridge.jar differ diff --git a/popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacAdverManager.cs b/popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacAdverManager.cs index 08835ef2..e2dd456f 100644 --- a/popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacAdverManager.cs +++ b/popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacAdverManager.cs @@ -227,17 +227,17 @@ public class JoyPacAdverManager : MonoBehaviour if (onSetInterstitialListener_onAdOpened != null) onSetInterstitialListener_onAdOpened(json); - if (!string.IsNullOrEmpty(json) && !JoypacAdManager.IntersShow) - { - JoypacAdManager.IntersShow = true; - //Dictionary values = new Dictionary(); - Dictionary jsonTemp = new Dictionary(); + //if (!string.IsNullOrEmpty(json) && !JoypacAdManager.IntersShow) + //{ + // JoypacAdManager.IntersShow = true; + // //Dictionary values = new Dictionary(); + // Dictionary jsonTemp = new Dictionary(); - jsonTemp = JsonMapper.ToObject>(json);// + // jsonTemp = JsonMapper.ToObject>(json);// - JoypacAnalyticsManager.Instance.APPAdsShow(jsonTemp); + // JoypacAnalyticsManager.Instance.APPAdsShow(jsonTemp); - } + //} } @@ -261,17 +261,17 @@ public class JoyPacAdverManager : MonoBehaviour if (onSetInterstitialListener_onClick != null) onSetInterstitialListener_onClick(json); - if (!string.IsNullOrEmpty(json)) - { - Dictionary jsonTemp = new Dictionary(); + //if (!string.IsNullOrEmpty(json)) + //{ + // Dictionary jsonTemp = new Dictionary(); - jsonTemp = JsonMapper.ToObject>(json);// + // jsonTemp = JsonMapper.ToObject>(json);// - JoypacAnalyticsManager.Instance.APPAdsClick(jsonTemp); + // JoypacAnalyticsManager.Instance.APPAdsClick(jsonTemp); - } + //} } void setInterstitialListener_onRequestAd (string json) @@ -442,18 +442,18 @@ public class JoyPacAdverManager : MonoBehaviour if (onSetRewardListener_onRewardedVideoStarted != null) onSetRewardListener_onRewardedVideoStarted(json); - if (!string.IsNullOrEmpty(json) && !JoypacAdManager.VideoShow) - { - JoypacAdManager.VideoShow = true; - Dictionary jsonTemp = new Dictionary(); + //if (!string.IsNullOrEmpty(json) && !JoypacAdManager.VideoShow) + //{ + // JoypacAdManager.VideoShow = true; + // Dictionary jsonTemp = new Dictionary(); - jsonTemp = JsonMapper.ToObject>(json);// + // jsonTemp = JsonMapper.ToObject>(json);// - JoypacAnalyticsManager.Instance.APPAdsShow(jsonTemp); + // JoypacAnalyticsManager.Instance.APPAdsShow(jsonTemp); - } + //} } void setRewardListener_onRewardedVideoCompleted (string json) @@ -469,17 +469,17 @@ public class JoyPacAdverManager : MonoBehaviour if (onSetRewardListener_onRewardedVideoClickAd != null) onSetRewardListener_onRewardedVideoClickAd(json); - if (!string.IsNullOrEmpty(json)) - { + //if (!string.IsNullOrEmpty(json)) + //{ - Dictionary jsonTemp = new Dictionary(); + // Dictionary jsonTemp = new Dictionary(); - jsonTemp = JsonMapper.ToObject>(json);// + // jsonTemp = JsonMapper.ToObject>(json);// - JoypacAnalyticsManager.Instance.APPAdsClick(jsonTemp); + // JoypacAnalyticsManager.Instance.APPAdsClick(jsonTemp); - } + //} } void setRewardListener_onRewardedReadyAd (string json) diff --git a/popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacCurrentcyAdSingle.cs b/popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacCurrentcyAdSingle.cs index 4ef41093..66a8eb52 100644 --- a/popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacCurrentcyAdSingle.cs +++ b/popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacCurrentcyAdSingle.cs @@ -124,9 +124,9 @@ public class JoyPacCurrentcyAdSingle } - public void showInterstitial(string joypacUnitName) + public void showInterstitial(string joypacUnitName, string come, string adjustToken) { - _currentcyAdSinglePlugin.Call("showInterstitial", joypacUnitName); + _currentcyAdSinglePlugin.Call("showInterstitial", joypacUnitName, come, adjustToken); } public void closeInterstitial() @@ -142,9 +142,9 @@ public class JoyPacCurrentcyAdSingle - public void showReward(string joypacUnitName, string eventPosition) + public void showReward(string joypacUnitName, string eventPosition, string come, string adjustToken) { - _currentcyAdSinglePlugin.Call("showReward", joypacUnitName, eventPosition); + _currentcyAdSinglePlugin.Call("showReward", joypacUnitName, eventPosition, come, adjustToken); } public bool isReady(string joypacUnitName) diff --git a/popcorn/Assets/Joypac/Scripts/JPSDK/internal/JoypacSDKAdapter.cs b/popcorn/Assets/Joypac/Scripts/JPSDK/internal/JoypacSDKAdapter.cs index 1a2455cc..99f7c69a 100644 --- a/popcorn/Assets/Joypac/Scripts/JPSDK/internal/JoypacSDKAdapter.cs +++ b/popcorn/Assets/Joypac/Scripts/JPSDK/internal/JoypacSDKAdapter.cs @@ -243,7 +243,7 @@ public class JoypacSDKAdapter : IJoypacAdInterface return; } #endif - _currAdSigle.showInterstitial(interId); + _currAdSigle.showInterstitial(interId, JoypacAnalyticsManager.Instance.aPPAdsShowCome, ConstStringKey.Instance.IV_ECPM); #endif } #endregion @@ -255,7 +255,9 @@ public class JoypacSDKAdapter : IJoypacAdInterface JoypacAdClient.Instance.ShowVideo(ConstStringKey.JOYPAC_SDK_REWARDID, eventPosition); #elif UNITY_ANDROID Debug.Log("joypac showReward"); - _currAdSigle.showReward(ConstStringKey.JOYPAC_SDK_REWARDID, ""); + // _currAdSigle.showReward(ConstStringKey.JOYPAC_SDK_REWARDID, ""); + _currAdSigle.showReward(ConstStringKey.JOYPAC_SDK_REWARDID, "", JoypacAnalyticsManager.Instance.aPPAdsShowCome, ConstStringKey.Instance.RV_ECPM); + #endif }