Browse Source

兼容master分支跟douyou分支的代码

hexiaojie 1 year ago
parent
commit
5500787501

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -295,7 +295,7 @@ namespace GFGGame
         {
             switch (LauncherConfig.ChannelId)
             {
-                case (int)ChannelID.DouYouTest:
+                case (int)ChannelID.DouYou:
                     QDDouYouManager.Instance.LoginOutBefore();
                     break;
                 default:

+ 2 - 1
GameClient/Assets/Game/HotUpdate/Game.HotUpdate.asmdef

@@ -8,7 +8,8 @@
         "GUID:b0a84d582f6a6fa4185f67ce934d99c2",
         "GUID:6e5063adab271564ba0098a06a8cebda",
         "GUID:d9a5d47c553a04a28a7d21a3f3fc8dc3",
-        "GUID:9b1c19877f4294a9cb33ff38fc9f1c83"
+        "GUID:9b1c19877f4294a9cb33ff38fc9f1c83",
+        "GUID:f22fac247a56d2d41b687bb0d900e54e"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

+ 2 - 6
GameClient/Assets/Game/HotUpdate/HotUpdateDriver.cs

@@ -1,8 +1,5 @@
-using GFGGame.Launcher;
-using System.Collections;
-using UniFramework.Pooling;
+using UniFramework.Pooling;
 using UnityEngine;
-using YooAsset;
 
 namespace GFGGame
 {
@@ -21,8 +18,7 @@ namespace GFGGame
             OperationSystem.Initialize();
             GameController.Start();
             Reporter reporter = GameObject.Find("Reporter").GetComponent<Reporter>();
-            if ((LauncherConfig.ChannelId != (int)ChannelID.Test &&
-                 LauncherConfig.ChannelId != (int)ChannelID.DouYouTest) && reporter != null)
+            if ((LauncherConfig.ChannelId != (int)ChannelID.Test) && reporter != null)
             {
                 reporter.numOfCircleToShow = 5;
             }

+ 50 - 27
GameClient/Assets/Game/HotUpdate/Platform/QDDouYouManager.cs

@@ -37,10 +37,21 @@ namespace GFGGame
 
         public void OnEnterGame()
         {
-            Debug.Log($"DouYou OnEnterGame");
             var zoneScene = GameGlobal.zoneScene;
+            if (zoneScene == null) return;
+            
+            if (zoneScene.GetComponent<RoleInfosComponent>() == null ||
+                zoneScene.GetComponent<RoleInfosComponent>().IsDisposed) return;
+            
             var roleInfo = zoneScene.GetComponent<RoleInfosComponent>().GetCurrentRole();
+            if (roleInfo == null) return;
+            
+            if (GameGlobal.myNumericComponent == null) return;
             int lvl = GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
+ 
+            if (zoneScene.GetComponent<ServerInfosComponent>() == null) return;
+            if (zoneScene.GetComponent<ServerInfosComponent>().recentlyServerInfo == null) return;
+
             string serverName = zoneScene.GetComponent<ServerInfosComponent>().recentlyServerInfo.ServerName;
 
             QDDouYouManagerInit.Instance.ReportRoleLogin(roleInfo.Id.ToString(), lvl.ToString(), roleInfo.Name,
@@ -81,8 +92,20 @@ namespace GFGGame
             }
 
             var zoneScene = GameGlobal.zoneScene;
-            int lvl = GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
+            if (zoneScene == null) return;
+            
+            if (zoneScene.GetComponent<RoleInfosComponent>() == null ||
+                zoneScene.GetComponent<RoleInfosComponent>().IsDisposed) return;
+            
             var roleInfo = zoneScene.GetComponent<RoleInfosComponent>().GetCurrentRole();
+            if (roleInfo == null) return;
+            
+            if (GameGlobal.myNumericComponent == null) return;
+            int lvl = GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
+ 
+            if (zoneScene.GetComponent<ServerInfosComponent>() == null) return;
+            if (zoneScene.GetComponent<ServerInfosComponent>().recentlyServerInfo == null) return;
+
             string serverName = zoneScene.GetComponent<ServerInfosComponent>().recentlyServerInfo.ServerName;
 
             //自定义参数
@@ -113,15 +136,14 @@ namespace GFGGame
         //     Debug.Log($"Game.HotUpdate ReceiveMessageAb:{message}");
         // }
 
-        // /// <summary>
-        // /// SDK实例化成功
-        // /// </summary>
-        // /// <param name="message">SDK 实例化成功</param>
-        // public void InitSuccessAb(string message)
-        // {
-        //     Debug.Log("Game.HotUpdate InitSuccessAb: " + message);
-        //     //UniEvent.SendMessage(new LauncherEvent.InitPlatformResult() { success = true });
-        // }
+        /// <summary>
+        /// SDK实例化成功
+        /// </summary>
+        /// <param name="message">SDK 实例化成功</param>
+        public void InitSuccessAb(string message)
+        {
+            Debug.Log("Game.HotUpdate InitSuccessAb: " + message);
+        }
 
         /// <summary>
         /// 登录成功 
@@ -168,6 +190,7 @@ namespace GFGGame
         {
             Debug.Log("Game.HotUpdate PaySuccessAb" + message);
             //改变临时订单状态为支付成功
+            QDManager.PushRoleAction(DouYouRoleLogReportType.Pay);
         }
 
         #region SDK 生命周期函数
@@ -177,15 +200,15 @@ namespace GFGGame
             Debug.Log($"Game.HotUpdate SdkOnStartAb:{message}");
         }
 
-        // public void SdkOnPauseAb(string message)
-        // {
-        //     Debug.Log($"Game.HotUpdate SdkOnPauseAb:{message}");
-        // }
+        public void SdkOnPauseAb(string message)
+        {
+            Debug.Log($"Game.HotUpdate SdkOnPauseAb:{message}");
+        }
 
-        // public void SdkOnResumeAb(string message)
-        // {
-        //     Debug.Log($"Game.HotUpdate SdkOnResumeAb:{message}");
-        // }
+        public void SdkOnResumeAb(string message)
+        {
+            Debug.Log($"Game.HotUpdate SdkOnResumeAb:{message}");
+        }
 
         public void SdkOnStopAb(string message)
         {
@@ -227,15 +250,15 @@ namespace GFGGame
             Debug.Log($"Game.HotUpdate SdkOnActivityResultAb:{message}");
         }
 
-        // public void SdkOnRequestPermissionResultAb(string message)
-        // {
-        //     Debug.Log($"Game.HotUpdate SdkOnRequestPermissionResultAb:{message}");
-        // }
+        public void SdkOnRequestPermissionResultAb(string message)
+        {
+            Debug.Log($"Game.HotUpdate SdkOnRequestPermissionResultAb:{message}");
+        }
 
-        // public void SdkOnWindowFocusChangedAb(string message)
-        // {
-        //     Debug.Log($"Game.HotUpdate SdkOnWindowFocusChangedAb:{message}");
-        // }
+        public void SdkOnWindowFocusChangedAb(string message)
+        {
+            Debug.Log($"Game.HotUpdate SdkOnWindowFocusChangedAb:{message}");
+        }
 
         #endregion
     }

+ 44 - 40
GameClient/Assets/Game/HotUpdate/Platform/QDManager.cs

@@ -1,4 +1,5 @@
 using ET;
+using GFGGame.Launcher;
 using UnityEngine;
 
 namespace GFGGame
@@ -12,10 +13,15 @@ namespace GFGGame
         {
             switch (LauncherConfig.ChannelId)
             {
-                default:
+                case (int)ChannelID.Test:
+                    QDShareManager.Instance.Init();
+                    break;
+                case (int)ChannelID.DouYou:
                     QDDouYouManager.Instance.Init();
                     QDShareManager.Instance.Init();
                     break;
+                default:
+                    break;
             }
         }
 
@@ -24,9 +30,6 @@ namespace GFGGame
             ViewManager.Show<ModalStatusView>("登录中...");
             switch (LauncherConfig.ChannelId)
             {
-                case (int)ChannelID.TapTap:
-
-                    break;
                 case (int)ChannelID.Test:
                     bool login = GameController.CheckLoginCache(true);
                     if (!login)
@@ -36,7 +39,7 @@ namespace GFGGame
                     }
 
                     break;
-                case (int)ChannelID.DouYouTest:
+                case (int)ChannelID.DouYou:
                     QDDouYouManager.Instance.Login();
                     break;
                 default:
@@ -48,13 +51,10 @@ namespace GFGGame
         {
             switch (LauncherConfig.ChannelId)
             {
-                case (int)ChannelID.TapTap:
-
-                    break;
                 case (int)ChannelID.Test:
 
                     break;
-                case (int)ChannelID.DouYouTest:
+                case (int)ChannelID.DouYou:
                     QDDouYouManager.Instance.OnCreateRole();
                     break;
                 default:
@@ -66,13 +66,10 @@ namespace GFGGame
         {
             switch (LauncherConfig.ChannelId)
             {
-                case (int)ChannelID.TapTap:
-
-                    break;
                 case (int)ChannelID.Test:
 
                     break;
-                case (int)ChannelID.DouYouTest:
+                case (int)ChannelID.DouYou:
                     QDDouYouManager.Instance.OnEnterGame();
                     break;
                 default:
@@ -85,13 +82,10 @@ namespace GFGGame
         {
             switch (LauncherConfig.ChannelId)
             {
-                case (int)ChannelID.TapTap:
-
-                    break;
                 case (int)ChannelID.Test:
 
                     break;
-                case (int)ChannelID.DouYouTest:
+                case (int)ChannelID.DouYou:
                     QDDouYouManager.Instance.OnQuitToLoginView();
                     break;
                 default:
@@ -103,13 +97,10 @@ namespace GFGGame
         {
             switch (LauncherConfig.ChannelId)
             {
-                case (int)ChannelID.TapTap:
-
-                    break;
                 case (int)ChannelID.Test:
 
                     break;
-                case (int)ChannelID.DouYouTest:
+                case (int)ChannelID.DouYou:
                     QDDouYouManager.Instance.Pay(buyID, count, orderID, price);
                     break;
                 default:
@@ -126,16 +117,13 @@ namespace GFGGame
             {
                 PlayerPrefs.DeleteKey(GameConst.PASSWORD_LAST_LOGIN_KEY);
             }
-            
+
             switch (LauncherConfig.ChannelId)
             {
-                case (int)ChannelID.TapTap:
-
-                    break;
                 case (int)ChannelID.Test:
 
                     break;
-                case (int)ChannelID.DouYouTest:
+                case (int)ChannelID.DouYou:
                     QDDouYouManager.Instance.Logout();
                     break;
                 default:
@@ -150,7 +138,7 @@ namespace GFGGame
                 case (int)ChannelID.Test:
                     GameController.ShowExitAlert();
                     break;
-                case (int)ChannelID.DouYouTest:
+                case (int)ChannelID.DouYou:
                     QDDouYouManager.Instance.Exit();
                     break;
                 default:
@@ -158,33 +146,49 @@ namespace GFGGame
             }
         }
 
+        //上报角色行为给sdk
+        public static void PushRoleAction(DouYouRoleLogReportType reportType)
+        {
+            //改名上报给sdk
+            var zoneScene = GameGlobal.zoneScene;
+            if (zoneScene == null) return;
+
+            if (zoneScene.GetComponent<RoleInfosComponent>() == null ||
+                zoneScene.GetComponent<RoleInfosComponent>().IsDisposed) return;
+
+            var roleInfo = zoneScene.GetComponent<RoleInfosComponent>().GetCurrentRole();
+            if (roleInfo == null) return;
+
+            if (GameGlobal.myNumericComponent == null) return;
+            int lvl = GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
+
+            if (zoneScene.GetComponent<ServerInfosComponent>() == null) return;
+            if (zoneScene.GetComponent<ServerInfosComponent>().recentlyServerInfo == null) return;
+
+            string serverName = zoneScene.GetComponent<ServerInfosComponent>().recentlyServerInfo.ServerName;
+            QDDouYouManagerInit.Instance.ReportRole((int)reportType,
+                roleInfo.Id.ToString(), lvl.ToString(), roleInfo.Name, roleInfo.ServerId.ToString(),
+                serverName);
+        }
+
         public static bool IsTaptap
         {
             get { return LauncherConfig.ChannelId == (int)ChannelID.TapTap; }
         }
-        
+
         public static bool IsHYKB
         {
-            get
-            {
-                return LauncherConfig.ChannelId == (int)ChannelID.HYKB;
-            }
+            get { return LauncherConfig.ChannelId == (int)ChannelID.HYKB; }
         }
 
         public static bool IsBiliBili
         {
-            get
-            {
-                return LauncherConfig.ChannelId == (int)ChannelID.BiliBili;
-            }
+            get { return LauncherConfig.ChannelId == (int)ChannelID.BiliBili; }
         }
 
         public static bool IsHuaWei
         {
-            get
-            {
-                return LauncherConfig.ChannelId == (int)ChannelID.HUAWEI;
-            }
+            get { return LauncherConfig.ChannelId == (int)ChannelID.HUAWEI; }
         }
     }
 }

+ 2 - 0
GameClient/Assets/Game/HotUpdate/ServerProxy/RoleInfoSProxy.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using ET;
+using GFGGame.Launcher;
 
 namespace GFGGame
 {
@@ -130,6 +131,7 @@ namespace GFGGame
                 {
                     GameGlobal.zoneScene.GetComponent<RoleInfosComponent>().GetCurrentRole().Name = response.Name;
                     EventAgent.DispatchEvent(ConstMessage.CHANGE_ROLE_NAME);
+                    QDManager.PushRoleAction(DouYouRoleLogReportType.LevelUp);
                     return true;
                 }
             }

+ 4 - 8
GameClient/Assets/Game/HotUpdate/Utils/LogUtil.cs

@@ -34,8 +34,7 @@ namespace GFGGame
 
         public static void LogDev(string content)
         {
-            if (LauncherConfig.onDebug > 0 || LauncherConfig.ChannelId == (int)ChannelID.Test ||
-                LauncherConfig.ChannelId == (int)ChannelID.DouYouTest)
+            if (LauncherConfig.onDebug > 0 || LauncherConfig.ChannelId == (int)ChannelID.Test)
             {
                 Debug.Log($"dev log : {content}");
             }
@@ -43,8 +42,7 @@ namespace GFGGame
 
         public static void LogFormatDev(string content, params object[] args)
         {
-            if (LauncherConfig.onDebug > 0 || LauncherConfig.ChannelId == (int)ChannelID.Test ||
-                LauncherConfig.ChannelId == (int)ChannelID.DouYouTest)
+            if (LauncherConfig.onDebug > 0 || LauncherConfig.ChannelId == (int)ChannelID.Test)
             {
                 Debug.LogFormat($"dev log : {content}", args);
             }
@@ -52,8 +50,7 @@ namespace GFGGame
 
         public static void LogWarningDev(string content)
         {
-            if (LauncherConfig.onDebug > 0 || LauncherConfig.ChannelId == (int)ChannelID.Test ||
-                LauncherConfig.ChannelId == (int)ChannelID.DouYouTest)
+            if (LauncherConfig.onDebug > 0 || LauncherConfig.ChannelId == (int)ChannelID.Test)
             {
                 Debug.LogWarning($"dev warning {content}");
             }
@@ -61,8 +58,7 @@ namespace GFGGame
 
         public static void LogWarningFormatDev(string content, params object[] args)
         {
-            if (LauncherConfig.onDebug > 0 || LauncherConfig.ChannelId == (int)ChannelID.Test ||
-                LauncherConfig.ChannelId == (int)ChannelID.DouYouTest)
+            if (LauncherConfig.onDebug > 0 || LauncherConfig.ChannelId == (int)ChannelID.Test)
             {
                 Debug.LogWarningFormat($"dev warning {content}", args);
             }

+ 1 - 4
GameClient/Assets/Game/HotUpdate/Views/Login/LoginView.cs

@@ -202,13 +202,10 @@ namespace GFGGame
 
             switch (LauncherConfig.ChannelId)
             {
-                case (int)ChannelID.TapTap:
-
-                    break;
                 case (int)ChannelID.Test:
 
                     break;
-                case (int)ChannelID.DouYouTest:
+                case (int)ChannelID.DouYou:
                     QDDouYouManager.Instance.LoginOutBefore();
                     break;
                 default:

+ 1 - 2
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryDialogView.cs

@@ -149,8 +149,7 @@ namespace GFGGame
             IsTeaParty = (bool)datas[4];
             _autoPlay = _lastStartAutoPlay;
 
-            if ((LauncherConfig.ChannelId != (int)ChannelID.Test &&
-                 LauncherConfig.ChannelId != (int)ChannelID.DouYouTest) &&
+            if ((LauncherConfig.ChannelId != (int)ChannelID.Test) &&
                 !InstanceZonesDataManager.CheckLevelPass(MainStoryDataManager.currentLevelCfgId))
             {
                 // 临时设置都可以跳过对话

+ 2 - 0
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using Assets.Game.HotUpdate.Data;
 using System.Collections;
 using System;
+using GFGGame.Launcher;
 
 namespace GFGGame
 {
@@ -876,6 +877,7 @@ namespace GFGGame
             {
                 UpdateRoleLvl();
                 CheckFunOpen();
+                QDManager.PushRoleAction(DouYouRoleLogReportType.LevelUp);
             }
             if (numericType == NumericType.FirstRechargeBonusStatus || numericType == NumericType.FirstRechargeTotal)
             {

+ 5 - 5
GameClient/Assets/Game/Launcher/Platform/IDouYouSDKListener.cs

@@ -4,7 +4,7 @@
     {
         //public void ReceiveMessageAb(string message);
 
-        //public void InitSuccessAb(string message);
+        public void InitSuccessAb(string message);
 
         public void LoginSuccessAb(string message);
 
@@ -16,9 +16,9 @@
 
         public void SdkOnStartAb(string message);
 
-        //public void SdkOnPauseAb(string message);
+        public void SdkOnPauseAb(string message);
 
-        //public void SdkOnResumeAb(string message);
+        public void SdkOnResumeAb(string message);
 
         public void SdkOnStopAb(string message);
 
@@ -36,8 +36,8 @@
 
         public void SdkOnActivityResultAb(string message);
 
-        //public void SdkOnRequestPermissionResultAb(string message);
+        public void SdkOnRequestPermissionResultAb(string message);
 
-        //public void SdkOnWindowFocusChangedAb(string message);
+        public void SdkOnWindowFocusChangedAb(string message);
     }
 }

+ 20 - 15
GameClient/Assets/Game/Launcher/Platform/QDDouYouManagerInit.cs

@@ -40,7 +40,7 @@ namespace GFGGame.Launcher
         {
             _douYouMainActivity.Call(functionName, args);
         }
-        
+
         /// <summary>
         /// 显示登录界面
         /// </summary>
@@ -139,8 +139,9 @@ namespace GFGGame.Launcher
             /// <param name="message">SDK 实例化成功</param>
             public override void InitSuccessAb(string message)
             {
-                Debug.Log("InitSuccessAb: " + message);
                 UniEvent.SendMessage(new LauncherEvent.InitPlatformResult() { success = true });
+                QDDouYouManagerInit.Instance.douYouSDKListener?.InitSuccessAb(message);
+                Debug.Log($"InitSuccess:{message}");
             }
 
             /// <summary>
@@ -150,7 +151,7 @@ namespace GFGGame.Launcher
             public override void LoginSuccessAb(string message)
             {
                 Debug.Log("LoginSuccessAb: " + message);
-                QDDouYouManagerInit.Instance.douYouSDKListener.LoginSuccessAb(message);
+                QDDouYouManagerInit.Instance.douYouSDKListener?.LoginSuccessAb(message);
             }
 
             /// <summary>
@@ -160,7 +161,7 @@ namespace GFGGame.Launcher
             public override void OutLoginSuccessAb(string message)
             {
                 Debug.Log("OutLoginSuccessAb: " + message);
-                QDDouYouManagerInit.Instance.douYouSDKListener.OutLoginSuccessAb(message);
+                QDDouYouManagerInit.Instance.douYouSDKListener?.OutLoginSuccessAb(message);
             }
 
             /// <summary>
@@ -170,7 +171,7 @@ namespace GFGGame.Launcher
             public override void PayFailAb(string message)
             {
                 Debug.Log("PayFailAb: " + message);
-                QDDouYouManagerInit.Instance.douYouSDKListener.PayFailAb(message);
+                QDDouYouManagerInit.Instance.douYouSDKListener?.PayFailAb(message);
             }
 
             /// <summary>
@@ -180,7 +181,7 @@ namespace GFGGame.Launcher
             public override void PaySuccessAb(string message)
             {
                 Debug.Log("PaySuccessAb" + message);
-                QDDouYouManagerInit.Instance.douYouSDKListener.PaySuccessAb(message);
+                QDDouYouManagerInit.Instance.douYouSDKListener?.PaySuccessAb(message);
             }
 
             #region SDK 生命周期函数
@@ -188,75 +189,79 @@ namespace GFGGame.Launcher
             public override void SdkOnStartAb(string message)
             {
                 Debug.Log($"SdkOnStartAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener.SdkOnStartAb(message);
+                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnStartAb(message);
             }
 
             public override void SdkOnPauseAb(string message)
             {
                 Debug.Log($"SdkOnPauseAb:{message}");
+                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnPauseAb(message);
             }
 
             public override void SdkOnResumeAb(string message)
             {
                 Debug.Log($"SdkOnResumeAb:{message}");
+                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnResumeAb(message);
             }
 
             public override void SdkOnStopAb(string message)
             {
                 Debug.Log($"SdkOnStopAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener.SdkOnStopAb(message);
+                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnStopAb(message);
             }
 
             public override void SdkOnDestroyAb(string message)
             {
                 Debug.Log($"SdkOnDestroyAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener.SdkOnDestroyAb(message);
+                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnDestroyAb(message);
             }
 
             public override void SdkOnRestartAb(string message)
             {
                 Debug.Log($"SdkOnRestartAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener.SdkOnRestartAb(message);
+                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnRestartAb(message);
             }
 
             public override void SdkOnBackPressedAb(string message)
             {
                 Debug.Log($"SdkOnBackPressedAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener.SdkOnBackPressedAb(message);
+                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnBackPressedAb(message);
             }
 
             public override void SdkOnNewIntentAb(string message)
             {
                 Debug.Log($"SdkOnNewIntentAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener.SdkOnNewIntentAb(message);
+                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnNewIntentAb(message);
             }
 
             public override void SdkOnConfigurationChangedAb(string message)
             {
                 Debug.Log($"SdkOnConfigurationChangedAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener.SdkOnConfigurationChangedAb(message);
+                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnConfigurationChangedAb(message);
             }
 
             public override void SdkOnSaveInstanceStateAb(string message)
             {
                 Debug.Log($"SdkOnSaveInstanceStateAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener.SdkOnSaveInstanceStateAb(message);
+                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnSaveInstanceStateAb(message);
             }
 
             public override void SdkOnActivityResultAb(string message)
             {
                 Debug.Log($"SdkOnActivityResultAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener.SdkOnActivityResultAb(message);
+                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnActivityResultAb(message);
             }
 
             public override void SdkOnRequestPermissionResultAb(string message)
             {
                 Debug.Log($"SdkOnRequestPermissionResultAb:{message}");
+                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnRequestPermissionResultAb(message);
             }
 
             public override void SdkOnWindowFocusChangedAb(string message)
             {
                 Debug.Log($"SdkOnWindowFocusChangedAb:{message}");
+                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnWindowFocusChangedAb(message);
             }
 
             #endregion

+ 2 - 2
GameClient/Assets/Game/Launcher/Platform/QDManagerInit.cs

@@ -9,8 +9,8 @@ namespace GFGGame.Launcher
         {
             switch (LauncherConfig.ChannelId)
             {
-                case (int)ChannelID.DouYouTest:
-                    QDDouYouManagerInit.Instance.InitSDK(QDDouYouManagerInit.Instance.GetAdId());
+                case (int)ChannelID.DouYou:
+                    QDDouYouManagerInit.Instance.InitSDK(LauncherConfig.douYouAdId);
                     QDShareManagerInit.Instance.InitSDK();
                     break;
                 default: