diff --git a/.gitignore b/.gitignore index 53d06e3..4377ffa 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,8 @@ /*.csproj /*.sln /*.user +/*.log /sds_BackUpThisFolder_ButDontShipItWithYourGame /sdss_BackUpThisFolder_ButDontShipItWithYourGame /Jjhda_BackUpThisFolder_ButDontShipItWithYourGame +/Assets/Plugins/Reporter diff --git a/Assets/EFSDK/EFSdk.cs b/Assets/EFSDK/EFSdk.cs index 77a7a22..9746c0b 100755 --- a/Assets/EFSDK/EFSdk.cs +++ b/Assets/EFSDK/EFSdk.cs @@ -32,6 +32,7 @@ namespace EFSDK public EFSdk() { Debug.Log($"GetNewSDKClass():{GetNewSDKClass()}"); + Debug.Log($"initSDK():{ GenerateAndroidName("initSDK")}"); // java interface class using (AndroidJavaClass jc = new AndroidJavaClass(GetNewSDKClass())) diff --git a/Assets/EFSDK/EFSdkAndroid.cs b/Assets/EFSDK/EFSdkAndroid.cs index 72159c9..cc6d2c3 100755 --- a/Assets/EFSDK/EFSdkAndroid.cs +++ b/Assets/EFSDK/EFSdkAndroid.cs @@ -6,7 +6,7 @@ namespace EFSDK public class EFSdkAndroid : MonoBehaviour { - private string H5_Load_Succ = "Gam_Load_Succ"; + private string H5_Load_Succ = "H5_Load_Succ"; private string On_Resume = "onResume"; private string Can_Goback = "canGoback"; diff --git a/Assets/Plugins/Android/settingsTemplate.gradle b/Assets/Plugins/Android/settingsTemplate.gradle index c5599a0..b2b8ea7 100644 --- a/Assets/Plugins/Android/settingsTemplate.gradle +++ b/Assets/Plugins/Android/settingsTemplate.gradle @@ -18,6 +18,12 @@ dependencyResolutionManagement { mavenCentral() // Android Resolver Repos Start def unityProjectPath = $/file:///**DIR_UNITYPROJECT**/$.replace("\\", "/") + maven { + url "https://jfrog.anythinktech.com/artifactory/debugger" // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/Editor/Dependencies.xml:5 + } + maven { + url "https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea" // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/gtm/Editor/Dependencies.xml:5, Assets/MaxSdk/Mediation/Mintegral/Editor/Dependencies.xml:8, Assets/EFSDK/Editor/Dependencies.xml:10 + } maven { url "https://artifact.bytedance.com/repository/pangle" // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/pangle/Editor/Dependencies.xml:5, Assets/MaxSdk/Mediation/ByteDance/Editor/Dependencies.xml:8 } @@ -33,9 +39,6 @@ dependencyResolutionManagement { maven { url "https://maven.google.com/" // Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:7, Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:12, Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:17, Assets/GoogleMobileAds/Editor/GoogleUmpDependencies.xml:7 } - maven { - url "https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea" // Assets/MaxSdk/Mediation/Mintegral/Editor/Dependencies.xml:8, Assets/EFSDK/Editor/Dependencies.xml:10 - } maven { url "https://android-sdk.is.com/" // Assets/EFSDK/Editor/Dependencies.xml:10 } diff --git a/Assets/Script/SDKManager/AdjustManager/AdjustManager.cs b/Assets/Script/SDKManager/AdjustManager/AdjustManager.cs index f938a69..3c53a40 100644 --- a/Assets/Script/SDKManager/AdjustManager/AdjustManager.cs +++ b/Assets/Script/SDKManager/AdjustManager/AdjustManager.cs @@ -56,13 +56,19 @@ public class AdjustManager : D_MonoSingleton AdjustNetwork.Instance.SetNetwork(attribution.Network); SaveProperties(attribution); - var properties = new Dictionary(); - properties.Add("ad_network", AdjustManager.GetAdNetwork()); - properties.Add("campaign", AdjustManager.GetCampaign()); - properties.Add("adgroup", AdjustManager.GetAdgroup()); - properties.Add("creative", AdjustManager.GetCreative()); - ShuShuEvent.Instance.UserSet(properties); - AppSDKManager.Instance.SetSuperProperties(properties); + var userProperties = new Dictionary(); + userProperties.Add("ad_network", AdjustManager.GetAdNetwork()); + userProperties.Add("campaign", AdjustManager.GetCampaign()); + userProperties.Add("adgroup", AdjustManager.GetAdgroup()); + userProperties.Add("creative", AdjustManager.GetCreative()); + ShuShuEvent.Instance.UserSet(userProperties); + + var publicProperties = new Dictionary(); + publicProperties.Add("user_ad_network", AdjustManager.GetAdNetwork()); + publicProperties.Add("user_campaign", AdjustManager.GetCampaign()); + publicProperties.Add("user_adgroup", AdjustManager.GetAdgroup()); + publicProperties.Add("user_creative", AdjustManager.GetCreative()); + AppSDKManager.Instance.SetSuperProperties(publicProperties); } private void SaveProperties(AdjustAttribution attribution) diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs b/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs index 39db4d5..75ef4bf 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs @@ -218,6 +218,7 @@ namespace WZ public void ShowSplashAd() { AdjustTrackEvent.Instance.TrackEventName("SP_Show", new Dictionary()); + AdPlayCountManager.IncrementAdPlayCount(AdsType.Splash); AdmobAdsManager.Instance.DisplaySplash(); } diff --git a/Assets/Script/SDKManager/AdsSDKManager/Events/AdsEvents/AdsActionEvents.cs b/Assets/Script/SDKManager/AdsSDKManager/Events/AdsEvents/AdsActionEvents.cs index 77756b0..33f11d0 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/Events/AdsEvents/AdsActionEvents.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/Events/AdsEvents/AdsActionEvents.cs @@ -24,7 +24,7 @@ namespace WZ }; FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic); ShuShuEvent.Instance.Track(eventName, dic); - LoggerUtils.Debug("[actionevent] TrackAdClicked"+JsonMapper.ToJson(dic)); + LoggerUtils.Debug("[actionevent] TrackAdClicked："+JsonMapper.ToJson(dic)); } public static void TrackAdClosed(PlatformType adPlatform, string adSource, string adUnitName, AdsType adFormat, string posotion, double value) @@ -43,7 +43,7 @@ namespace WZ }; FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic); ShuShuEvent.Instance.Track(eventName, dic); - LoggerUtils.Debug("[actionevent] TrackAdClosed"+JsonMapper.ToJson(dic)); + LoggerUtils.Debug("[actionevent] TrackAdClosed："+JsonMapper.ToJson(dic)); } public static void TrackAdStartLoad(PlatformType adPlatform, string adSource, string adUnitName, AdsType adFormat) @@ -56,7 +56,7 @@ namespace WZ }; FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic); ShuShuEvent.Instance.Track(eventName, dic); - LoggerUtils.Debug("[actionevent] TrackAdStartLoad"+JsonMapper.ToJson(dic)); + LoggerUtils.Debug("[actionevent] TrackAdStartLoad："+JsonMapper.ToJson(dic)); } public static void TrackAdLoaded(PlatformType adPlatform, string adSource, string adUnitName, AdsType adFormat, double loadTime) @@ -72,7 +72,7 @@ namespace WZ }; FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic); ShuShuEvent.Instance.Track(eventName, dic); - LoggerUtils.Debug("[actionevent] TrackAdLoaded"+JsonMapper.ToJson(dic)); + LoggerUtils.Debug("[actionevent] TrackAdLoaded："+JsonMapper.ToJson(dic)); } public static void TrackAdFailToLoad(PlatformType adPlatform, string adSource, string adUnitName, AdsType adFormat, double loadTime, string reason) { @@ -88,7 +88,7 @@ namespace WZ }; FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic); ShuShuEvent.Instance.Track(eventName, dic); - LoggerUtils.Debug("[actionevent] TrackAdFailToLoad"+JsonMapper.ToJson(dic)); + LoggerUtils.Debug("[actionevent] TrackAdFailToLoad："+JsonMapper.ToJson(dic)); } public static void TrackAdFailToShow(PlatformType adPlatform, AdsType adFormat, string reason, string pos) @@ -104,7 +104,7 @@ namespace WZ }; FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic); ShuShuEvent.Instance.Track(eventName, dic); - LoggerUtils.Debug("[actionevent] TrackAdFailToShow"+JsonMapper.ToJson(dic)); + LoggerUtils.Debug("[actionevent] TrackAdFailToShow："+JsonMapper.ToJson(dic)); } public static void TrackAdPosition(AdsType adFormat, string pos) @@ -117,7 +117,7 @@ namespace WZ }; FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic); ShuShuEvent.Instance.Track(eventName, dic); - LoggerUtils.Debug("[actionevent] TrackAdPosition"+JsonMapper.ToJson(dic)); + LoggerUtils.Debug("[actionevent] TrackAdPosition："+JsonMapper.ToJson(dic)); } public static void TrackAdImpression(PlatformType adPlatform, string adSource, string adUnitName, AdsType adFormat, string posotion, double value) @@ -135,7 +135,7 @@ namespace WZ }; FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic); ShuShuEvent.Instance.Track(eventName, dic); - LoggerUtils.Debug("[actionevent] TrackAdImpression"+JsonMapper.ToJson(dic)); + LoggerUtils.Debug("[actionevent] TrackAdImpression："+JsonMapper.ToJson(dic)); } } } \ No newline at end of file diff --git a/Assets/Script/SDKManager/AppSDKManager.cs b/Assets/Script/SDKManager/AppSDKManager.cs index e4ea7ad..2a6ac36 100644 --- a/Assets/Script/SDKManager/AppSDKManager.cs +++ b/Assets/Script/SDKManager/AppSDKManager.cs @@ -11,7 +11,7 @@ using UnityEngine; using WZ; public class AppSDKManager : D_MonoSingleton -{ +{ public void Init(Action action, bool showLog) { LoggerUtils.Enabled = showLog; @@ -655,6 +655,15 @@ public class AppSDKManager : D_MonoSingleton } + /// + /// Webview展示成功后回调 + /// + /// + public void WebviewShowSuccess(Action action) + { + EFSdkManager.Instance.SetWebviewShowSuccessAction(action); + } + #endregion /// diff --git a/Assets/Script/SDKManager/EFSdkManager/EFSdkManager.cs b/Assets/Script/SDKManager/EFSdkManager/EFSdkManager.cs index 77d543c..d90c3d5 100644 --- a/Assets/Script/SDKManager/EFSdkManager/EFSdkManager.cs +++ b/Assets/Script/SDKManager/EFSdkManager/EFSdkManager.cs @@ -1,4 +1,5 @@ -using EFSDK; +using System; +using EFSDK; using Firebase.Analytics; using UnityEngine; @@ -11,13 +12,22 @@ namespace WZ //互动广告位 private string okspinShowPos = ""; + private Action _webviewShowSuccessAction; + public void Init() { if (Application.isEditor) { return; } - EFSdk.get().Init((actionType, str) => { }); + EFSdk.get().Init((actionType, str) => + { + if (actionType == EFSdk.ActionType.H5_Load_Succ) + { + //webview展示成功 + _webviewShowSuccessAction?.Invoke(str); + } + }); SetSDKEventCallback(); SetHdH5ImpressionCallback(); @@ -46,12 +56,6 @@ namespace WZ return; } - //判断链接是互动广告 - if (!url.Contains("gamifyspace")) - { - return; - } - //展示次数 int count = PlayerPrefsUtils.GetPlayerPrefsInt(KEY_OKSPIN_SHOW_COUNT, 0); count++; @@ -73,5 +77,10 @@ namespace WZ { okspinShowPos = pos; } + + public void SetWebviewShowSuccessAction(Action action) + { + _webviewShowSuccessAction = action; + } } } \ No newline at end of file diff --git a/Assets/Script/SDKManager/ShuShuMangage/ShuShuMangage.cs b/Assets/Script/SDKManager/ShuShuMangage/ShuShuMangage.cs index 480bdd8..73dacc8 100644 --- a/Assets/Script/SDKManager/ShuShuMangage/ShuShuMangage.cs +++ b/Assets/Script/SDKManager/ShuShuMangage/ShuShuMangage.cs @@ -16,13 +16,19 @@ namespace WZ TDAnalytics.EnableAutoTrack(TDAutoTrackEventType.AppInstall | TDAutoTrackEventType.AppStart | TDAutoTrackEventType.AppEnd); //如果用户已登录，可以设置用户的账号ID作为身份唯一标识 // TDAnalytics.Login("TA"); - var properties = new Dictionary(); - properties.Add("ad_network", AdjustManager.GetAdNetwork()); - properties.Add("campaign", AdjustManager.GetCampaign()); - properties.Add("adgroup", AdjustManager.GetAdgroup()); - properties.Add("creative", AdjustManager.GetCreative()); - ShuShuEvent.Instance.UserSet(properties); - AppSDKManager.Instance.SetSuperProperties(properties); + var userProperties = new Dictionary(); + userProperties.Add("ad_network", AdjustManager.GetAdNetwork()); + userProperties.Add("campaign", AdjustManager.GetCampaign()); + userProperties.Add("adgroup", AdjustManager.GetAdgroup()); + userProperties.Add("creative", AdjustManager.GetCreative()); + ShuShuEvent.Instance.UserSet(userProperties); + + var publicProperties = new Dictionary(); + publicProperties.Add("user_ad_network", AdjustManager.GetAdNetwork()); + publicProperties.Add("user_campaign", AdjustManager.GetCampaign()); + publicProperties.Add("user_adgroup", AdjustManager.GetAdgroup()); + publicProperties.Add("user_creative", AdjustManager.GetCreative()); + AppSDKManager.Instance.SetSuperProperties(publicProperties); }