Merge branch 'main' of http://v4.9ms.co:7777/yufeng/SDK_UnityMoney

Assets/Script/SDKManager/AppSDKManager.cs

@@ -11,8 +11,9 @@ public class AppSDKManager : D_MonoSingleton<AppSDKManager>
 {    
     //包名
     public const string PackageName = "com.rush.cash.earn.fast.real.money.game";
-    public void Init(Action action)
+    public void Init(Action action, bool showLog)
     {
+        LoggerUtils.Enabled = showLog;
         FileParse.Parse();
         // AdConfigParser.Parse();
         FireBaseSDKManager.Instance.Init();
@@ -22,6 +23,8 @@ public class AppSDKManager : D_MonoSingleton<AppSDKManager>
         ShuShuMangage.Instance.Init();
         AdsSDKManager.Instance.InitSDK(null);
         EFSdkManager.Instance.Init();
+        
+        action?.Invoke();
     }
     
 
@@ -40,7 +43,7 @@ public class AppSDKManager : D_MonoSingleton<AppSDKManager>
     /// 是否已缓存激励广告
     /// </summary>
     /// <returns></returns>
-    public bool IsRewardAdReady()
+    public bool IsRewardedAdReady()
     {
         return AdsSDKManager.Instance.IsRewardAdReady();;
     } 
@@ -108,16 +111,44 @@ public class AppSDKManager : D_MonoSingleton<AppSDKManager>
             }
             else
             { 
-                callback?.Invoke(0);
+                callback?.Invoke(-1);
             }
         }
         else
         {
-            callback?.Invoke(0);
+            callback?.Invoke(-1);
         }
     }
 
+    public void ShowBanner()
+    {
+        AdsSDKManager.Instance.ShowBanner();
+    }
     
+    public void HideBanner()
+    {
+        AdsSDKManager.Instance.HideBanner();
+    }
+
+    public bool IsNativeFullReady()
+    {
+        return false;
+    }
+    
+    public void ShowFullNative(string position, Action<bool, double> callback = null)
+    {
+        
+    }
+
+    public void ShowNative(RectTransform rectTransform, Camera camera = null, string position = "")
+    {
+        
+    }
+
+    public void HideNative()
+    {
+        
+    }
 
     #endregion
 
@@ -250,6 +281,11 @@ public class AppSDKManager : D_MonoSingleton<AppSDKManager>
         EFSdk.get().Refresh();
     }
 
+    public void CanGoback(Action<bool> canGobackAction)
+    {
+         EFSdk.get().CanGoback(canGobackAction);
+    }
+
     /// <summary>
     /// 回上一页
     /// </summary>
@@ -340,13 +376,12 @@ public class AppSDKManager : D_MonoSingleton<AppSDKManager>
     /// 消息类通知弹出间隔,SDK默认设置为60秒（在线参数控制）-Key: messagenotif  Value:60
     /// </summary>
     /// <param name="timeSeconds"></param>
-    public void SetPushMessagenotif()
+    public void SetPushMessagenotif(int timeSeconds)
     {
         if (Application.isEditor)
         {
             return;
         }
-        int timeSeconds = FireBaseRemoteConfigManager.Instance.GetRemoteConfigInt("messagenotif", 60);
         EFSdk.get().SetPushMessagenotif(timeSeconds);
     }
 
@@ -354,13 +389,12 @@ public class AppSDKManager : D_MonoSingleton<AppSDKManager>
     /// 持续性通知在进入游戏时弹出的时间间隔,SDK默认设置为300秒（在线参数控制 ）-Key:persistentnotif Value:300
     /// </summary>
     /// <param name="timeSeconds"></param>
-    public void SetPushPersistentnotif()
+    public void SetPushPersistentnotif(int timeSeconds)
     {
         if (Application.isEditor)
         {
             return;
         }
-        int timeSeconds = FireBaseRemoteConfigManager.Instance.GetRemoteConfigInt("persistentnotif", 300);
         EFSdk.get().SetPushPersistentnotif(timeSeconds);
     }
 
@@ -374,31 +408,15 @@ public class AppSDKManager : D_MonoSingleton<AppSDKManager>
     /// 3 进入对应小游戏1界面
     /// 4 进入对应小游戏2界面
     /// </returns>
-    public void GetJumpPage()
+    public int GetJumpPage()
     {
         if (Application.isEditor)
         {
-            return;
+            return 0;
         }
         int pageId = EFSdk.get().GetJumpPage();
-        switch (pageId)
+        return pageId;
-        {
+        
-            case 0:
-                // Nothing to do
-                break;
-            case 1:
-                // 回到游戏主页
-                break;
-            case 2:
-                // 进入游戏的金币提现界面
-                break;
-            case 3:
-                // 进入对应小游戏1界面
-                break;
-            case 4:
-                // 进入对应小游戏2界面
-                break;
-        }
     }
 
     /// <summary>
@@ -527,6 +545,14 @@ public class AppSDKManager : D_MonoSingleton<AppSDKManager>
         EFSdk.get().ShowToast(message);
     }
 
+    /// <summary>
+    /// 定时远程推送
+    /// </summary>
+    public void AutoLocalPush(bool isOpen)
+    {
+        
+    }
+    
     #endregion
 
     /// <summary>
@@ -537,4 +563,39 @@ public class AppSDKManager : D_MonoSingleton<AppSDKManager>
     {
         return AdjustNetwork.Instance.InOrganic();
     }
+
+    public string GetGaid()
+    {
+        return null;
+    }
+
+    public string GetAndroidId()
+    {
+        return null;
+    }
+
+    public string GetAdid()
+    {
+        return null;
+    }
+
+    public string GetUserAgent()
+    {
+        return null;
+    }
+
+    public string GetSSAccountId()
+    {
+        return null;
+    }
+
+    public string GetSSDistinctId()
+    {
+        return null;
+    }
+
+    public string GetSSSuperProperties()
+    {
+        return null;
+    }
 }

Assets/Script/SDKManager/EFSdkManager/EFSdkManager.cs

@@ -13,6 +13,10 @@ namespace WZ
         
         public void Init()
         {
+            if (Application.isEditor)
+            {
+                return;
+            }
             EFSdk.get().Init((actionType, str) => { });
 
             SetSDKEventCallback();

Assets/Script/SDKManager/FirebaseManager/FireBaseRemoteConfigManager.cs

@@ -10,10 +10,10 @@ namespace WZ
     {
         public void FetchRemoteConfig()
         {
-            // Firebase.FirebaseApp.CheckAndFixDependenciesAsync().ContinueWith(task =>
+            Firebase.FirebaseApp.CheckAndFixDependenciesAsync().ContinueWith(task =>
-            // {
+            {
-            //     if (task.Result == Firebase.DependencyStatus.Available)
+                if (task.Result == Firebase.DependencyStatus.Available)
-            //     {
+                {
                     Firebase.RemoteConfig.FirebaseRemoteConfig.DefaultInstance.FetchAsync(TimeSpan.Zero).ContinueWithOnMainThread(task =>
                     {
                         FirebaseRemoteConfig.DefaultInstance.ActivateAsync().ContinueWithOnMainThread(task =>
@@ -36,8 +36,8 @@ namespace WZ
                             // 检查Adjust归因                   
                         });
                     });
-                // }
+                }
-            // });
+            });
         }
 
         private void GroupSet()

Assets/Script/SDKManager/FirebaseManager/FireBaseSDKManager.cs

@@ -11,6 +11,10 @@ namespace WZ
     {
         public void Init()
         {
+            if (Application.isEditor)
+            {
+                return;
+            }
             InitSDK();
         }
 

Assets/Script/Test.cs

@@ -20,7 +20,7 @@ public class Test : MonoBehaviour
 
     public void OnShowAd()
     {
-        AppSDKManager.Instance.Init(null);
+        AppSDKManager.Instance.Init(null, true);
         // KwaiAdsManager.Instance.ShowRewardAd();
     }