diff --git a/AndroidSDK/app/src/main/java/com/bluewhale/androidutils/AndroidDeviceInfo.java b/AndroidSDK/app/src/main/java/com/bluewhale/androidutils/AndroidDeviceInfo.java index df06128aad..7183798ff7 100644 --- a/AndroidSDK/app/src/main/java/com/bluewhale/androidutils/AndroidDeviceInfo.java +++ b/AndroidSDK/app/src/main/java/com/bluewhale/androidutils/AndroidDeviceInfo.java @@ -152,12 +152,12 @@ public class AndroidDeviceInfo { return result; } - public String GetIMEICode(Context context) { - return KTGameDeviceUtil.getIMEI(context); + public static String GetIMEICode() { + return KTGameDeviceUtil.getIMEI(mContext); } - public String GetDeviceID(Context context) { - return KTGameDeviceUtil.getDeviceID(context); + public static String GetDeviceID() { + return KTGameDeviceUtil.getDeviceID(mContext); } } diff --git a/Assets/LuaFramework/Scripts/SDK/Tools/AndroidDeviceInfo.cs b/Assets/LuaFramework/Scripts/SDK/Tools/AndroidDeviceInfo.cs index 3d5580ab89..d6d9ee101f 100644 --- a/Assets/LuaFramework/Scripts/SDK/Tools/AndroidDeviceInfo.cs +++ b/Assets/LuaFramework/Scripts/SDK/Tools/AndroidDeviceInfo.cs @@ -140,12 +140,12 @@ public class AndroidDeviceInfo //sdk 获取设备标识 public string GetDeviceID() { - return jo.Call("GetDeviceID"); + return jo.CallStatic("GetDeviceID"); } //sdk 获取IMEI public string GetIMEICode() { - return jo.Call("GetIMEICode"); + return jo.CallStatic("GetIMEICode"); } //暂时存放--复制粘贴功能(本不隶属于此) diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 0392294d17..9da5533996 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -199,7 +199,7 @@ function this.RefreshLoginStatus(loginResp) this.SetLoginPart(true) AppConst.SdkId = result[2] AppConst.OpenId = result[2] - AppConst.TokenStr = result[3] + AppConst.TokenStr = result[4] AppConst.SdkChannel = result[5] -- this.SetSDKExtensionParams(result[4]) Log(string.format("%sjl_loginserver/getServerList?openId=%s&channel=%s&plat=android&sub_channel=%s", LoginRoot_Url, AppConst.OpenId, LoginRoot_Channel, LoginRoot_SubChannel)) @@ -473,6 +473,15 @@ function this.OnConnect(network) end RequestPanel.Show(Language[11125]) if IsSDKLogin then + Log(LoginRoot_Url + .. "jl_loginserver/getUserInfo?openId=" .. AppConst.OpenId + .. "&serverId=" .. LoginManager.ServerId + .. "&token=" .. AppConst.TokenStr + .. "&platform=" .. 1 + .. "&sub_channel=" .. LoginRoot_SubChannel + .. "&pid=" .. AppConst.SdkChannel --LoginManager.pt_pId + .. "&gid=" .. "" --LoginManager.pt_gId + .. "&version=" .. LoginRoot_PackageVersion) networkMgr:SendGetHttp(LoginRoot_Url .. "jl_loginserver/getUserInfo?openId=" .. AppConst.OpenId .. "&serverId=" .. LoginManager.ServerId diff --git a/Assets/Plugins/Android/libs/main.jar b/Assets/Plugins/Android/libs/main.jar index 1c085537d2..96f2f10bec 100644 Binary files a/Assets/Plugins/Android/libs/main.jar and b/Assets/Plugins/Android/libs/main.jar differ