diff --git a/Assets/Script/SDKManager/AdjustManager/AdjustManager.cs b/Assets/Script/SDKManager/AdjustManager/AdjustManager.cs index 76400ab..533b9df 100644 --- a/Assets/Script/SDKManager/AdjustManager/AdjustManager.cs +++ b/Assets/Script/SDKManager/AdjustManager/AdjustManager.cs @@ -41,11 +41,17 @@ public class AdjustManager : D_MonoSingleton ShuShuEvent.Instance.Track("adjust_init"); FireBaseAnalyticsManager.Instance.LogEvent("adjust_init"); - Adjust.GetAdid((id)=> + Adjust.GetAdid((id) => { ShuShuEvent.Instance.SetSuperProperties(new Dictionary() { { "adid", id } }); ShuShuEvent.Instance.UserSet(new Dictionary() { { "adid", id } }); }); + + var network = AdjustNetwork.GetNetwork(); + if (!string.IsNullOrEmpty(network)) + { + RushSDKManager.Instance.OnUserSourceListener?.Invoke(IsOrganic(network), network); + } } @@ -128,7 +134,7 @@ public class AdjustManager : D_MonoSingleton campaign = attribution.Campaign; adgroup = attribution.Adgroup; creative = attribution.Creative; - + if (!string.IsNullOrEmpty(attribution.Network)) { network = attribution.Network; @@ -139,7 +145,7 @@ public class AdjustManager : D_MonoSingleton } } else - { + { network = "Organic"; } @@ -160,6 +166,8 @@ public class AdjustManager : D_MonoSingleton { "adgroup", adgroup ?? "" }, { "creative", creative ?? "" }, }); + + RushSDKManager.Instance.OnUserSourceListener?.Invoke(IsOrganic(network), network); } diff --git a/Assets/Script/SDKManager/AdjustManager/AdjustNetwork.cs b/Assets/Script/SDKManager/AdjustManager/AdjustNetwork.cs index d2d7130..ff9e633 100644 --- a/Assets/Script/SDKManager/AdjustManager/AdjustNetwork.cs +++ b/Assets/Script/SDKManager/AdjustManager/AdjustNetwork.cs @@ -29,10 +29,14 @@ public class AdjustNetwork : D_MonoSingleton } } + public static string GetNetwork() + { + return PlayerPrefs.GetString(KEY_USER_NETWORK); + } /// /// 是否是自然量用户 - /// 默认买量用户 + /// 默认自然量用户 /// /// public bool InOrganic() @@ -42,7 +46,7 @@ public class AdjustNetwork : D_MonoSingleton { return true; } - + if (network.ToLower().Replace(" ", "") == "Organic".ToLower().Replace(" ", "")) { return true; diff --git a/Assets/Script/SDKManager/RushSDKManager.cs b/Assets/Script/SDKManager/RushSDKManager.cs index bf881f6..5fdd404 100644 --- a/Assets/Script/SDKManager/RushSDKManager.cs +++ b/Assets/Script/SDKManager/RushSDKManager.cs @@ -30,7 +30,23 @@ public class RushSDKManager : D_MonoSingleton AdsSDKManager.Instance.InitSDK(action); EFSdkManager.Instance.Init(); } + + #region 买量用户回调 + public Action OnUserSourceListener; + + /// Adjust归因回调 + /// + /// 是否为买量用户 + /// adjust 返回的network字段 + /// + public void SetUserSourceListener(Action _action) + { + OnUserSourceListener = _action; + } + + #endregion + #region ad @@ -49,15 +65,15 @@ public class RushSDKManager : D_MonoSingleton /// public bool IsRewardedAdReady() { - return AdsSDKManager.Instance.IsRewardAdReady();; - } - + return AdsSDKManager.Instance.IsRewardAdReady(); ; + } + /// /// 展示激励广告 /// /// /// - public void ShowRewardAd(string position, Action callback = null) + public void ShowRewardAd(string position, Action callback = null) { AdsActionEvents.TrackAdPosition(AdsType.Rewarded, position); bool isRewardAdReady = AdsSDKManager.Instance.IsRewardAdReady(); @@ -83,8 +99,8 @@ public class RushSDKManager : D_MonoSingleton callback?.Invoke(false, 0); } } - - + + /// /// 是否已缓存插屏 @@ -93,7 +109,7 @@ public class RushSDKManager : D_MonoSingleton { return AdsSDKManager.Instance.IsInterstitialReady(); } - + /// /// 展示插屏广告 /// @@ -122,7 +138,7 @@ public class RushSDKManager : D_MonoSingleton }); } else - { + { AdsActionEvents.TrackAdFailToShow(AdsType.Interstitial, position, AdsShowFailType.NoFill); callback?.Invoke(-1); } @@ -143,7 +159,7 @@ public class RushSDKManager : D_MonoSingleton }); } else - { + { AdsActionEvents.TrackAdFailToShow(AdsType.Interstitial, position, AdsShowFailType.NoFill); callback?.Invoke(-1); } @@ -154,7 +170,7 @@ public class RushSDKManager : D_MonoSingleton callback?.Invoke(-1); } } - + public void ShowBanner() { AdsActionEvents.TrackAdPosition(AdsType.Banner, ""); @@ -163,12 +179,12 @@ public class RushSDKManager : D_MonoSingleton AdsSDKManager.Instance.ShowBanner(); } else - { + { AdsActionEvents.TrackAdFailToShow(AdsType.Banner, "", AdsShowFailType.NoFill); } - + } - + public void HideBanner() { AdsSDKManager.Instance.HideBanner(); @@ -179,7 +195,7 @@ public class RushSDKManager : D_MonoSingleton var adUnitId = StaticValue.AdmobFullNativeId; return AdsSDKManager.Instance.IsNativeAdReady(adUnitId); } - + public void ShowFullNative(RectTransform rectTransform, Camera pCom = null, string position = "") { AdsActionEvents.TrackAdPosition(AdsType.Native, position); @@ -188,18 +204,18 @@ public class RushSDKManager : D_MonoSingleton AdsActionEvents.TrackAdFailToShow(AdsType.Native, position, AdsShowFailType.NoFill); return; } - + var adUnitId = StaticValue.AdmobFullNativeId; var nativeAdPosition = NativeAdPosition.Create(new NativeTemplateStyle { TemplateId = NativeTemplateId.Medium, MainBackgroundColor = Color.white }, rectTransform, pCom); - + AdsSDKManager.Instance.ShowNativeAd(position, adUnitId, nativeAdPosition); } - - + + /// /// 获取全屏Native广告价值 /// @@ -234,14 +250,14 @@ public class RushSDKManager : D_MonoSingleton AdsActionEvents.TrackAdFailToShow(AdsType.Native, position, AdsShowFailType.NoFill); return; } - + var adUnitId = StaticValue.AdmobNativeId; var nativeAdPosition = NativeAdPosition.Create(new NativeTemplateStyle { TemplateId = NativeTemplateId.Small, MainBackgroundColor = Color.white }, rectTransform, pCom); - + AdsSDKManager.Instance.ShowNativeAd(position, adUnitId, nativeAdPosition); } @@ -250,7 +266,7 @@ public class RushSDKManager : D_MonoSingleton var adUnitId = StaticValue.AdmobNativeId; AdsSDKManager.Instance.RemoveNativeAd(adUnitId); } - + public bool IsSmallNativeReady() { var adUnitId = StaticValue.AdmobSmallNativeId; @@ -265,14 +281,14 @@ public class RushSDKManager : D_MonoSingleton AdsActionEvents.TrackAdFailToShow(AdsType.Native, position, AdsShowFailType.NoFill); return; } - + var adUnitId = StaticValue.AdmobSmallNativeId; var nativeAdPosition = NativeAdPosition.Create(new NativeTemplateStyle { TemplateId = NativeTemplateId.Small, MainBackgroundColor = Color.white }, rectTransform, pCom); - + AdsSDKManager.Instance.ShowNativeAd(position, adUnitId, nativeAdPosition); } @@ -281,7 +297,7 @@ public class RushSDKManager : D_MonoSingleton var adUnitId = StaticValue.AdmobSmallNativeId; AdsSDKManager.Instance.RemoveNativeAd(adUnitId); } - + public bool IsMinddleNativeReady() { var adUnitId = StaticValue.AdmobMinddleNativeId; @@ -296,14 +312,14 @@ public class RushSDKManager : D_MonoSingleton AdsActionEvents.TrackAdFailToShow(AdsType.Native, position, AdsShowFailType.NoFill); return; } - + var adUnitId = StaticValue.AdmobMinddleNativeId; var nativeAdPosition = NativeAdPosition.Create(new NativeTemplateStyle { TemplateId = NativeTemplateId.Small, MainBackgroundColor = Color.white }, rectTransform, pCom); - + AdsSDKManager.Instance.ShowNativeAd(position, adUnitId, nativeAdPosition); } @@ -332,7 +348,7 @@ public class RushSDKManager : D_MonoSingleton { [key1] = value1 }); - + } public void LogEvent(string eventName, Dictionary extraInfo) @@ -341,7 +357,7 @@ public class RushSDKManager : D_MonoSingleton FireBaseAnalyticsManager.Instance.LogEvent(eventName, extraInfo); AdjustTrackEvent.Instance.TrackEventName(eventName, extraInfo); } - + /// /// 公共事件属性 /// @@ -351,7 +367,7 @@ public class RushSDKManager : D_MonoSingleton ShuShuEvent.Instance.SetSuperProperties(args); FireBaseAnalyticsManager.Instance.SetSuperProperties(args); } - + /// /// 用户属性 /// @@ -363,7 +379,7 @@ public class RushSDKManager : D_MonoSingleton } #endregion - + #region 在线参数 public bool GetRemoteConfigBool(string key, bool defaultValue = false) @@ -374,7 +390,7 @@ public class RushSDKManager : D_MonoSingleton } return FireBaseRemoteConfigManager.Instance.GetRemoteConfigBool(key, defaultValue); } - + public int GetRemoteConfigInt(string key, int defaultValue = 0) { if (Application.isEditor) @@ -383,7 +399,7 @@ public class RushSDKManager : D_MonoSingleton } return FireBaseRemoteConfigManager.Instance.GetRemoteConfigInt(key, defaultValue); } - + public string GetRemoteConfigStr(string key, string defaultValue = "") { if (Application.isEditor) @@ -392,7 +408,7 @@ public class RushSDKManager : D_MonoSingleton } return FireBaseRemoteConfigManager.Instance.GetRemoteConfigString(key, defaultValue); } - + public float GetRemoteConfigFloat(string key, float defaultValue = 0) { if (Application.isEditor) @@ -455,7 +471,7 @@ public class RushSDKManager : D_MonoSingleton public void CanGoback(Action canGobackAction) { - EFSdk.get().CanGoback(canGobackAction); + EFSdk.get().CanGoback(canGobackAction); } /// @@ -476,8 +492,8 @@ public class RushSDKManager : D_MonoSingleton } }); } - - + + /// /// 设置推送开关, SDK默认关闭通知 /// @@ -588,7 +604,7 @@ public class RushSDKManager : D_MonoSingleton } int pageId = EFSdk.get().GetJumpPage(); return pageId; - + } /// @@ -614,7 +630,7 @@ public class RushSDKManager : D_MonoSingleton return; } // 如果没有通知权限就尝试申请通知权限 - if(!HasNotifyPermission()) + if (!HasNotifyPermission()) { EFSdk.get().ReqNotifyPermission(isgGranted => { @@ -654,7 +670,7 @@ public class RushSDKManager : D_MonoSingleton } EFSdk.get().UnSubscribeUnclaimed01(); } - + /// // 满足条件: 在排队中 且 当日R$1 未领取 的买量用户, 调用这个方法 /// @@ -703,7 +719,7 @@ public class RushSDKManager : D_MonoSingleton } EFSdk.get().UnSubscribeToTopic(topic); } - + /// /// 可覆盖广告的Toast /// @@ -722,9 +738,9 @@ public class RushSDKManager : D_MonoSingleton /// public void AutoLocalPush(bool isOpen) { - + } - + /// /// Webview展示成功后回调 /// @@ -733,7 +749,7 @@ public class RushSDKManager : D_MonoSingleton { EFSdkManager.Instance.SetWebviewShowSuccessAction(action); } - + #endregion /// @@ -745,7 +761,7 @@ public class RushSDKManager : D_MonoSingleton return AdjustNetwork.Instance.InOrganic(); } - public string GetGaid() + public string GetGaid() { if (Application.isEditor) { @@ -829,7 +845,7 @@ public class RushSDKManager : D_MonoSingleton { return "GetSSDistinctId"; } - LoggerUtils.Debug("GetSSDistinctId:"+TDAnalytics.GetDistinctId()); + LoggerUtils.Debug("GetSSDistinctId:" + TDAnalytics.GetDistinctId()); return TDAnalytics.GetDistinctId(); } @@ -844,4 +860,9 @@ public class RushSDKManager : D_MonoSingleton LoggerUtils.Debug("GetSSDistinctId:" + JsonMapper.ToJson(superProperties)); return superProperties == null ? "" : superProperties.ToString(); } + + public void OpenPrivacy() + { + Application.OpenURL(StaticValue.PrivacyUrl); + } }