From ceba0d14cb9c1b35327468df96452f586464de5d Mon Sep 17 00:00:00 2001 From: liuchunguang <345080091@qq.com> Date: Fri, 20 Mar 2026 14:33:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=B8=A0=E9=81=93=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E6=B7=BB=E5=8A=A0devicehelper=20package?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MarketTest_Official/ChannelSetting.yaml | 1 + Tool/Channels/MarketTest_Tap/ChannelSetting.yaml | 1 + Tool/Channels/Official/ChannelSetting.yaml | 1 + Tool/Channels/OfficialDev/ChannelSetting.yaml | 1 + Tool/Channels/TapTap/ChannelSetting.yaml | 1 + Tool/Channels/TapTapDev/ChannelSetting.yaml | 1 + .../SDKHelper/Bilibili/BilibiliSdkHelper.Login.cs | 13 +++++++++++++ .../Phxh/SDKHelper/Bilibili/BilibiliSdkHelper.cs | 10 ++++++++++ .../Phxh/SDKHelper/Bilibili/GSCCallbackListerner.cs | 7 ++++++- 9 files changed, 35 insertions(+), 1 deletion(-) diff --git a/Tool/Channels/MarketTest_Official/ChannelSetting.yaml b/Tool/Channels/MarketTest_Official/ChannelSetting.yaml index d8c18fcc2ec..b2ab76e4713 100644 --- a/Tool/Channels/MarketTest_Official/ChannelSetting.yaml +++ b/Tool/Channels/MarketTest_Official/ChannelSetting.yaml @@ -57,6 +57,7 @@ Packages: - AliPay@0.0.1 - ThinkingData@1.0.0 - AIhelper@latest + - DeviceHelper@0.0.1 # 爱加密配置 Encryption: diff --git a/Tool/Channels/MarketTest_Tap/ChannelSetting.yaml b/Tool/Channels/MarketTest_Tap/ChannelSetting.yaml index ac2ebc5e2d9..904582544e7 100644 --- a/Tool/Channels/MarketTest_Tap/ChannelSetting.yaml +++ b/Tool/Channels/MarketTest_Tap/ChannelSetting.yaml @@ -58,6 +58,7 @@ Packages: - AliPay@0.0.1 - TapTap@latest - AIhelper@latest + - DeviceHelper@0.0.1 # 爱加密配置 Encryption: diff --git a/Tool/Channels/Official/ChannelSetting.yaml b/Tool/Channels/Official/ChannelSetting.yaml index 5c9bcd4bd75..2820948336f 100644 --- a/Tool/Channels/Official/ChannelSetting.yaml +++ b/Tool/Channels/Official/ChannelSetting.yaml @@ -61,6 +61,7 @@ Packages: - AliPay@0.0.1 - ThinkingData@1.0.0 - AIhelper@latest + - DeviceHelper@0.0.1 # 爱加密配置 Encryption: diff --git a/Tool/Channels/OfficialDev/ChannelSetting.yaml b/Tool/Channels/OfficialDev/ChannelSetting.yaml index 6b6b7c0705e..9d490fd7fa4 100644 --- a/Tool/Channels/OfficialDev/ChannelSetting.yaml +++ b/Tool/Channels/OfficialDev/ChannelSetting.yaml @@ -57,6 +57,7 @@ Packages: - AliPay@0.0.1 - ThinkingData@1.0.0 - AIhelper@latest + - DeviceHelper@0.0.1 # 爱加密配置 Encryption: diff --git a/Tool/Channels/TapTap/ChannelSetting.yaml b/Tool/Channels/TapTap/ChannelSetting.yaml index fde0fa0b2ec..11fdb5019f4 100644 --- a/Tool/Channels/TapTap/ChannelSetting.yaml +++ b/Tool/Channels/TapTap/ChannelSetting.yaml @@ -57,6 +57,7 @@ Packages: - AliPay@0.0.1 - TapTap@latest - AIhelper@latest + - DeviceHelper@0.0.1 # 爱加密配置 diff --git a/Tool/Channels/TapTapDev/ChannelSetting.yaml b/Tool/Channels/TapTapDev/ChannelSetting.yaml index 94ec9c00675..28091004998 100644 --- a/Tool/Channels/TapTapDev/ChannelSetting.yaml +++ b/Tool/Channels/TapTapDev/ChannelSetting.yaml @@ -58,6 +58,7 @@ Packages: - AliPay@0.0.1 - TapTap@latest - AIhelper@latest + - DeviceHelper@0.0.1 # 爱加密配置 Encryption: diff --git a/Tool/sdk_packages/Bilibili/1.0.0/Assets/PhxhSDK/Phxh/SDKHelper/Bilibili/BilibiliSdkHelper.Login.cs b/Tool/sdk_packages/Bilibili/1.0.0/Assets/PhxhSDK/Phxh/SDKHelper/Bilibili/BilibiliSdkHelper.Login.cs index ff5e07e3e89..83deed9079d 100644 --- a/Tool/sdk_packages/Bilibili/1.0.0/Assets/PhxhSDK/Phxh/SDKHelper/Bilibili/BilibiliSdkHelper.Login.cs +++ b/Tool/sdk_packages/Bilibili/1.0.0/Assets/PhxhSDK/Phxh/SDKHelper/Bilibili/BilibiliSdkHelper.Login.cs @@ -45,6 +45,19 @@ namespace PhxhSDK SdkHelper sdkHelper = SDKManager.Instance.GetSdkHelper(SDKManager.SdkName.Bilibili); BilibiliSdkHelper biliSdkHelper = sdkHelper as BilibiliSdkHelper; + if (biliSdkHelper == null) + { + DebugUtil.LogError("[BilibiliSdkHelper.Login] 获取 BilibiliSdkHelper 失败，sdkHelper=" + sdkHelper); + onLoginFail?.Invoke(-1, "BilibiliSdkHelper is null"); + return; + } + if (biliSdkHelper.BiliListerner == null) + { + DebugUtil.LogError("[BilibiliSdkHelper.Login] BiliListerner 为 null，无法注册登录回调"); + onLoginFail?.Invoke(-1, "BiliListerner is null"); + return; + } + DebugUtil.Log("[BilibiliSdkHelper.Login] 注册登录回调并调用 GSCSdkInterface.login()"); biliSdkHelper.BiliListerner.RegistLoginCallback(LoginSuccess, onLoginFail); GSCSdkInterface.login(); } diff --git a/Tool/sdk_packages/Bilibili/1.0.0/Assets/PhxhSDK/Phxh/SDKHelper/Bilibili/BilibiliSdkHelper.cs b/Tool/sdk_packages/Bilibili/1.0.0/Assets/PhxhSDK/Phxh/SDKHelper/Bilibili/BilibiliSdkHelper.cs index 16c56700d1e..d55a48e56a3 100644 --- a/Tool/sdk_packages/Bilibili/1.0.0/Assets/PhxhSDK/Phxh/SDKHelper/Bilibili/BilibiliSdkHelper.cs +++ b/Tool/sdk_packages/Bilibili/1.0.0/Assets/PhxhSDK/Phxh/SDKHelper/Bilibili/BilibiliSdkHelper.cs @@ -138,6 +138,7 @@ namespace PhxhSDK public override void EarlyInit() { + DebugUtil.Log("[BilibiliSdkHelper] EarlyInit 开始"); GameObject goBilibili = GameObject.Find("BiliBiliSDK"); if (null == goBilibili) { @@ -145,12 +146,21 @@ namespace PhxhSDK UnityEngine.Object.DontDestroyOnLoad(goBilibili); DebugUtil.Log("[BilibiliSdkHelper] 创建 BiliBiliSDK GameObject 并设置 DontDestroyOnLoad"); } + else + { + DebugUtil.Log("[BilibiliSdkHelper] 找到已有 BiliBiliSDK GameObject"); + } BiliListerner = goBilibili.GetComponent(); if (null == BiliListerner) { BiliListerner = goBilibili.AddComponent(); DebugUtil.Log("[BilibiliSdkHelper] 挂载 GSCCallbackListerner 组件"); } + else + { + DebugUtil.Log("[BilibiliSdkHelper] GSCCallbackListerner 已存在"); + } + DebugUtil.Log($"[BilibiliSdkHelper] 调用 GSCSdkInterface.init, MerchantID={MerchantID} AppID={AppID} ServerID={ServerID}"); GSCSdkInterface.init(); } diff --git a/Tool/sdk_packages/Bilibili/1.0.0/Assets/PhxhSDK/Phxh/SDKHelper/Bilibili/GSCCallbackListerner.cs b/Tool/sdk_packages/Bilibili/1.0.0/Assets/PhxhSDK/Phxh/SDKHelper/Bilibili/GSCCallbackListerner.cs index e6c71d9e035..0ca8fac663e 100644 --- a/Tool/sdk_packages/Bilibili/1.0.0/Assets/PhxhSDK/Phxh/SDKHelper/Bilibili/GSCCallbackListerner.cs +++ b/Tool/sdk_packages/Bilibili/1.0.0/Assets/PhxhSDK/Phxh/SDKHelper/Bilibili/GSCCallbackListerner.cs @@ -63,11 +63,12 @@ namespace PhxhSDK.AOT.Bilibili public void OnGSCSdkCallback(string jsonstr) { - Debug.Log("OnGSCSdkCallback message: jsonstr=" + jsonstr); + Debug.Log("[GSCCallbackListerner] OnGSCSdkCallback: " + jsonstr); JsonData json = JsonMapper.ToObject(jsonstr); string callbackType = (string)json["callbackType"]; int code = (int)json["code"]; JsonData data = json["data"]; + Debug.Log($"[GSCCallbackListerner] callbackType={callbackType}, code={code}"); switch (callbackType) { case CALLBACKTYPE_INIT: @@ -133,6 +134,7 @@ namespace PhxhSDK.AOT.Bilibili /// public virtual void OnInitCallback(int code, string data) { + Debug.Log($"[GSCCallbackListerner] OnInitCallback code={code}, data={data}"); if (code == StatusCode_Success) { Debug.Log($"初始化成功,code:{code},data:{data}"); @@ -271,12 +273,15 @@ namespace PhxhSDK.AOT.Bilibili /// public void OnLoginCallback(int code, string data) { + Debug.Log($"[GSCCallbackListerner] OnLoginCallback code={code}, data={data}"); if (code == StatusCode_Success) { JsonData json = JsonMapper.ToObject(data); string username = (string)json["username"]; string access_token = (string)json["access_token"]; string uid = (string)json["uid"]; + Debug.Log($"[GSCCallbackListerner] 登录成功 uid={uid}, username={username}"); + if (loginAction == null) Debug.LogError("[GSCCallbackListerner] loginAction 为 null！回调丢失"); loginAction?.Invoke(uid, username, access_token); Debug.Log($"登录成功，code:{code}，data:{data}"); }