From d4e78afcab20530eefb9bc20531f2bef2fd9465e Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 27 Jul 2021 10:04:22 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90packID=E3=80=91=E6=95=B0=E6=95=B0?= =?UTF-8?q?=E6=89=93=E7=82=B9=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Framework/Manager/PackageManager.lua | 5 +++++ Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua | 6 ++++-- Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua | 4 +++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua index 6b7d832287..73e53dcb7d 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/PackageManager.lua @@ -32,6 +32,11 @@ end -- 获取包名 function PackageManager.GetPackageID() + -- 优先使用sdk自带的 + if LoginManager.SdkSubChannel then + return LoginManager.SdkSubChannel + end + -- 否则使用配置的 if this.StreamConfig then return this.StreamConfig.PackID end diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua index d5e60749fb..b552979825 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua @@ -1,4 +1,4 @@ -LoginManager = {}; +LoginManager = {}; local this = LoginManager this.sign = "d13b3e8ef74bf72d8aafce3a1c8672a0" this.openId = nil @@ -44,6 +44,7 @@ function this.Initialize() AppConst.SdkChannel = result[5] or "" this.extData = result[6] or "" this.p_appId = result[7] or "" + this.SdkSubChannel = result[8] AppConst.SdkPackageName = AndroidDeviceInfo.Instance:GetPackageName() end -- 判断是否是注册并登录 @@ -102,7 +103,8 @@ function this.TrackCreateAccount() account = AppConst.isSDK and tostring(AppConst.OpenId) or "", Bundle_id = AppConst.isSDK and AppConst.SdkPackageName or "", xx_id = AppConst.isSDK and AppConst.SdkChannel or "", - device_id = AppConst.isSDK and ThinkingAnalyticsManager.GetDeviceId() or "" + device_id = AppConst.isSDK and ThinkingAnalyticsManager.GetDeviceId() or "", + packId = PackageManager.GetPackageID() or "", }) ThinkingAnalyticsManager.Track("create_account") end diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 31b993bf2f..ac9d43d6b4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -45,7 +45,8 @@ function this.LoginRequest(openId, func) data.distinct_id = AppConst.isSDK and ThinkingAnalyticsManager.GetDistinctId() or "" data.openId = openId data.cc_id = PackageManager.GetCCCode() - data.channel_s = AppConst.isSDKLogin and AppConst.SdkChannel .. "#" .. AppConst.SdkPackageName or "" --pt_pid.."#"..pt_gid + local packId = PackageManager.GetPackageID() or "" + data.channel_s = AppConst.isSDKLogin and AppConst.SdkChannel .. "#" .. AppConst.SdkPackageName .."#".. packId or "" --pt_pid.."#"..pt_gid data.platform_s = AppConst.Platform --and "ADR" or "PC" local msg = data:SerializeToString() @@ -72,6 +73,7 @@ function this.LoginRequest(openId, func) account = AppConst.isSDK and tostring(AppConst.OpenId) or "", Bundle_id = AppConst.isSDK and AppConst.SdkPackageName or "", xx_id = AppConst.isSDK and AppConst.SdkChannel or "", + packId = PackageManager.GetPackageID() or "", -- test_list = "1,2,3#2", -- 数组 }) TapDBManager.SetServer(LoginManager.ServerId)