Merge branch 'main' of http://v4.9ms.co:7777/yufeng/SDK_UnityMoney
This commit is contained in:
commit
c844ffcf29
|
@ -6,6 +6,8 @@
|
||||||
/*.csproj
|
/*.csproj
|
||||||
/*.sln
|
/*.sln
|
||||||
/*.user
|
/*.user
|
||||||
|
/*.log
|
||||||
/sds_BackUpThisFolder_ButDontShipItWithYourGame
|
/sds_BackUpThisFolder_ButDontShipItWithYourGame
|
||||||
/sdss_BackUpThisFolder_ButDontShipItWithYourGame
|
/sdss_BackUpThisFolder_ButDontShipItWithYourGame
|
||||||
/Jjhda_BackUpThisFolder_ButDontShipItWithYourGame
|
/Jjhda_BackUpThisFolder_ButDontShipItWithYourGame
|
||||||
|
/Assets/Plugins/Reporter
|
||||||
|
|
|
@ -32,6 +32,7 @@ namespace EFSDK
|
||||||
public EFSdk()
|
public EFSdk()
|
||||||
{
|
{
|
||||||
Debug.Log($"GetNewSDKClass():{GetNewSDKClass()}");
|
Debug.Log($"GetNewSDKClass():{GetNewSDKClass()}");
|
||||||
|
Debug.Log($"initSDK():{ GenerateAndroidName("initSDK")}");
|
||||||
|
|
||||||
// java interface class
|
// java interface class
|
||||||
using (AndroidJavaClass jc = new AndroidJavaClass(GetNewSDKClass()))
|
using (AndroidJavaClass jc = new AndroidJavaClass(GetNewSDKClass()))
|
||||||
|
|
|
@ -6,7 +6,7 @@ namespace EFSDK
|
||||||
|
|
||||||
public class EFSdkAndroid : MonoBehaviour
|
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 On_Resume = "onResume";
|
||||||
private string Can_Goback = "canGoback";
|
private string Can_Goback = "canGoback";
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,12 @@ dependencyResolutionManagement {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
// Android Resolver Repos Start
|
// Android Resolver Repos Start
|
||||||
def unityProjectPath = $/file:///**DIR_UNITYPROJECT**/$.replace("\\", "/")
|
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 {
|
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
|
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 {
|
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
|
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 {
|
maven {
|
||||||
url "https://android-sdk.is.com/" // Assets/EFSDK/Editor/Dependencies.xml:10
|
url "https://android-sdk.is.com/" // Assets/EFSDK/Editor/Dependencies.xml:10
|
||||||
}
|
}
|
||||||
|
|
|
@ -56,13 +56,19 @@ public class AdjustManager : D_MonoSingleton<AdjustManager>
|
||||||
AdjustNetwork.Instance.SetNetwork(attribution.Network);
|
AdjustNetwork.Instance.SetNetwork(attribution.Network);
|
||||||
SaveProperties(attribution);
|
SaveProperties(attribution);
|
||||||
|
|
||||||
var properties = new Dictionary<string, object>();
|
var userProperties = new Dictionary<string, object>();
|
||||||
properties.Add("ad_network", AdjustManager.GetAdNetwork());
|
userProperties.Add("ad_network", AdjustManager.GetAdNetwork());
|
||||||
properties.Add("campaign", AdjustManager.GetCampaign());
|
userProperties.Add("campaign", AdjustManager.GetCampaign());
|
||||||
properties.Add("adgroup", AdjustManager.GetAdgroup());
|
userProperties.Add("adgroup", AdjustManager.GetAdgroup());
|
||||||
properties.Add("creative", AdjustManager.GetCreative());
|
userProperties.Add("creative", AdjustManager.GetCreative());
|
||||||
ShuShuEvent.Instance.UserSet(properties);
|
ShuShuEvent.Instance.UserSet(userProperties);
|
||||||
AppSDKManager.Instance.SetSuperProperties(properties);
|
|
||||||
|
var publicProperties = new Dictionary<string, object>();
|
||||||
|
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)
|
private void SaveProperties(AdjustAttribution attribution)
|
||||||
|
|
|
@ -218,6 +218,7 @@ namespace WZ
|
||||||
public void ShowSplashAd()
|
public void ShowSplashAd()
|
||||||
{
|
{
|
||||||
AdjustTrackEvent.Instance.TrackEventName("SP_Show", new Dictionary<string, object>());
|
AdjustTrackEvent.Instance.TrackEventName("SP_Show", new Dictionary<string, object>());
|
||||||
|
AdPlayCountManager.IncrementAdPlayCount(AdsType.Splash);
|
||||||
AdmobAdsManager.Instance.DisplaySplash();
|
AdmobAdsManager.Instance.DisplaySplash();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ namespace WZ
|
||||||
};
|
};
|
||||||
FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic);
|
FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic);
|
||||||
ShuShuEvent.Instance.Track(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)
|
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);
|
FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic);
|
||||||
ShuShuEvent.Instance.Track(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)
|
public static void TrackAdStartLoad(PlatformType adPlatform, string adSource, string adUnitName, AdsType adFormat)
|
||||||
|
@ -56,7 +56,7 @@ namespace WZ
|
||||||
};
|
};
|
||||||
FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic);
|
FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic);
|
||||||
ShuShuEvent.Instance.Track(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)
|
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);
|
FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic);
|
||||||
ShuShuEvent.Instance.Track(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)
|
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);
|
FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic);
|
||||||
ShuShuEvent.Instance.Track(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)
|
public static void TrackAdFailToShow(PlatformType adPlatform, AdsType adFormat, string reason, string pos)
|
||||||
|
@ -104,7 +104,7 @@ namespace WZ
|
||||||
};
|
};
|
||||||
FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic);
|
FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic);
|
||||||
ShuShuEvent.Instance.Track(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)
|
public static void TrackAdPosition(AdsType adFormat, string pos)
|
||||||
|
@ -117,7 +117,7 @@ namespace WZ
|
||||||
};
|
};
|
||||||
FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic);
|
FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic);
|
||||||
ShuShuEvent.Instance.Track(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)
|
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);
|
FireBaseAnalyticsManager.Instance.LogEvent(eventName, dic);
|
||||||
ShuShuEvent.Instance.Track(eventName, dic);
|
ShuShuEvent.Instance.Track(eventName, dic);
|
||||||
LoggerUtils.Debug("[actionevent] TrackAdImpression"+JsonMapper.ToJson(dic));
|
LoggerUtils.Debug("[actionevent] TrackAdImpression:"+JsonMapper.ToJson(dic));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -11,7 +11,7 @@ using UnityEngine;
|
||||||
using WZ;
|
using WZ;
|
||||||
|
|
||||||
public class AppSDKManager : D_MonoSingleton<AppSDKManager>
|
public class AppSDKManager : D_MonoSingleton<AppSDKManager>
|
||||||
{
|
{
|
||||||
public void Init(Action action, bool showLog)
|
public void Init(Action action, bool showLog)
|
||||||
{
|
{
|
||||||
LoggerUtils.Enabled = showLog;
|
LoggerUtils.Enabled = showLog;
|
||||||
|
@ -655,6 +655,15 @@ public class AppSDKManager : D_MonoSingleton<AppSDKManager>
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Webview展示成功后回调
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="action"></param>
|
||||||
|
public void WebviewShowSuccess(Action<string> action)
|
||||||
|
{
|
||||||
|
EFSdkManager.Instance.SetWebviewShowSuccessAction(action);
|
||||||
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
using EFSDK;
|
using System;
|
||||||
|
using EFSDK;
|
||||||
using Firebase.Analytics;
|
using Firebase.Analytics;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
|
@ -11,13 +12,22 @@ namespace WZ
|
||||||
//互动广告位
|
//互动广告位
|
||||||
private string okspinShowPos = "";
|
private string okspinShowPos = "";
|
||||||
|
|
||||||
|
private Action<string> _webviewShowSuccessAction;
|
||||||
|
|
||||||
public void Init()
|
public void Init()
|
||||||
{
|
{
|
||||||
if (Application.isEditor)
|
if (Application.isEditor)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
EFSdk.get().Init((actionType, str) => { });
|
EFSdk.get().Init((actionType, str) =>
|
||||||
|
{
|
||||||
|
if (actionType == EFSdk.ActionType.H5_Load_Succ)
|
||||||
|
{
|
||||||
|
//webview展示成功
|
||||||
|
_webviewShowSuccessAction?.Invoke(str);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
SetSDKEventCallback();
|
SetSDKEventCallback();
|
||||||
SetHdH5ImpressionCallback();
|
SetHdH5ImpressionCallback();
|
||||||
|
@ -46,12 +56,6 @@ namespace WZ
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
//判断链接是互动广告
|
|
||||||
if (!url.Contains("gamifyspace"))
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
//展示次数
|
//展示次数
|
||||||
int count = PlayerPrefsUtils.GetPlayerPrefsInt(KEY_OKSPIN_SHOW_COUNT, 0);
|
int count = PlayerPrefsUtils.GetPlayerPrefsInt(KEY_OKSPIN_SHOW_COUNT, 0);
|
||||||
count++;
|
count++;
|
||||||
|
@ -73,5 +77,10 @@ namespace WZ
|
||||||
{
|
{
|
||||||
okspinShowPos = pos;
|
okspinShowPos = pos;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void SetWebviewShowSuccessAction(Action<string> action)
|
||||||
|
{
|
||||||
|
_webviewShowSuccessAction = action;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -16,13 +16,19 @@ namespace WZ
|
||||||
TDAnalytics.EnableAutoTrack(TDAutoTrackEventType.AppInstall | TDAutoTrackEventType.AppStart | TDAutoTrackEventType.AppEnd);
|
TDAnalytics.EnableAutoTrack(TDAutoTrackEventType.AppInstall | TDAutoTrackEventType.AppStart | TDAutoTrackEventType.AppEnd);
|
||||||
//如果用户已登录,可以设置用户的账号ID作为身份唯一标识
|
//如果用户已登录,可以设置用户的账号ID作为身份唯一标识
|
||||||
// TDAnalytics.Login("TA");
|
// TDAnalytics.Login("TA");
|
||||||
var properties = new Dictionary<string, object>();
|
var userProperties = new Dictionary<string, object>();
|
||||||
properties.Add("ad_network", AdjustManager.GetAdNetwork());
|
userProperties.Add("ad_network", AdjustManager.GetAdNetwork());
|
||||||
properties.Add("campaign", AdjustManager.GetCampaign());
|
userProperties.Add("campaign", AdjustManager.GetCampaign());
|
||||||
properties.Add("adgroup", AdjustManager.GetAdgroup());
|
userProperties.Add("adgroup", AdjustManager.GetAdgroup());
|
||||||
properties.Add("creative", AdjustManager.GetCreative());
|
userProperties.Add("creative", AdjustManager.GetCreative());
|
||||||
ShuShuEvent.Instance.UserSet(properties);
|
ShuShuEvent.Instance.UserSet(userProperties);
|
||||||
AppSDKManager.Instance.SetSuperProperties(properties);
|
|
||||||
|
var publicProperties = new Dictionary<string, object>();
|
||||||
|
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);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue