diff --git a/Assets/LuaFramework/Scripts/SDK/Proxy.cs b/Assets/LuaFramework/Scripts/SDK/Proxy.cs index 20f5e0d3b9..a028988501 100644 --- a/Assets/LuaFramework/Scripts/SDK/Proxy.cs +++ b/Assets/LuaFramework/Scripts/SDK/Proxy.cs @@ -15,6 +15,7 @@ namespace SDK public virtual string GetDeviceID() { return ""; } public virtual string GetIMEICode() { return ""; } public virtual string GetPayOrderID() { return ""; } + public virtual void CustomEvent(string eventName, string eventDesc) { } public virtual void ShotCapture() { } private Queue messages = new Queue(); public void PushMessage(Message msg) { lock (messages) { messages.Enqueue(msg); } } diff --git a/Assets/LuaFramework/Scripts/SDK/Proxy/iOSProxy.cs b/Assets/LuaFramework/Scripts/SDK/Proxy/iOSProxy.cs index 3da18e76bb..9362f88a11 100644 --- a/Assets/LuaFramework/Scripts/SDK/Proxy/iOSProxy.cs +++ b/Assets/LuaFramework/Scripts/SDK/Proxy/iOSProxy.cs @@ -10,80 +10,65 @@ namespace SDK { public class iOSProxy : Proxy { - ////初始化 - //[DllImport("__Internal")] - //private static extern void m_KTInit(string totalStr); - //public override void Init()//SDKInitArgs args) - //{ - // //StringBuilder sb = new StringBuilder(); - // //sb.AppendFormat("{0}#{1}", args.appid, args.appkey); - // //m_KTInit(sb.ToString()); - //} - - ////登录 - //[DllImport("__Internal")] - //private static extern void m_KTIogin(); - //public override void Login() - //{ - // m_KTIogin(); - //} + // //初始化 + // [DllImport("__Internal")] + // private static extern void m_SDK_Init(); + // public override void Init() + // { + // m_SDK_Init(); + // } + + ////登录 + //[DllImport("__Internal")] + //private static extern void m_SDK_Login(); + //public override void Login() + //{ + // m_SDK_Login(); + //} + + ////登录 + //[DllImport("__Internal")] + //private static extern void m_SDK_Logout(); + //public override void Logout() + //{ + // m_SDK_Logout(); + //} - ////退出游戏 - //[DllImport("__Internal")] - //private static extern void m_KTExit(); - //public override void Exit() - //{ - // m_KTExit(); - //} + ////退出游戏 + //[DllImport("__Internal")] + //private static extern void m_SDK_Exit(); + //public override void Exit() + //{ + // m_SDK_Exit(); + //} - //[DllImport("__Internal")] - //private static extern void m_KTPay(string totalStr); - //public override void Pay(SDKPayArgs args) - //{ - // StringBuilder sb = new StringBuilder(); - // sb.AppendFormat("{0}#{1}#{2}#{3}#{4}#{5}#{6}#{7}#{8}#{9}#{10}#{11}#{12}#{13}#{14}", - // AppConst.TokenStr, - // args.zoneId, - // args.serverID, - // args.serverName, - // args.roleID, - // args.roleName, - // args.roleLevel, - // args.productId, - // args.productName, - // args.roleID, - // "",//extendbox - // "",//gateway - // AppConst.OpenId, - // "",//payext - // args.price); - // m_KTPay(sb.ToString()); - //} - ////sdk 获取设备标识 - //[DllImport("__Internal")] - //private static extern string m_KTGetDeviceID(); - //public override string GetDeviceID() - //{ - // return m_KTGetDeviceID(); - //} + ////退出游戏 + //[DllImport("__Internal")] + //private static extern void m_SDK_SubmitExtraData(string areaName, string roleName, string roleGrade); + //public override void SubmitExtraData(SDKSubmitExtraDataArgs args) + //{ + // m_SDK_SubmitExtraData(args.zoneID, args.roleID, args.roleLevel); + //} - ////sdk 获取IMEI - //[DllImport("__Internal")] - //private static extern string m_KTGetIMEICode(); - //public override string GetIMEICode() - //{ - // return m_KTGetIMEICode(); - //} - ////sdk获取支付订单号 - //[DllImport("__Internal")] - //private static extern string m_KTGetPayOrderID(); - //public override string GetPayOrderID() - //{ - // return m_KTGetPayOrderID(); - //} + //[DllImport("__Internal")] + //private static extern void m_SDK_Pay(string money, string detail, string csId, string csName, string pid); + //public override void Pay(SDKPayArgs args) + //{ + // m_SDK_Pay(args.price.ToString(), args.productDesc, args.productId, args.productName, args.payNotifyUrl); + //} + + + + ////sdk获取支付订单号 + //[DllImport("__Internal")] + //private static extern string m_SDK_CustomEvent(string eventName); + //public override void CustomEvent(string eventName, string eventDesc) + //{ + // m_SDK_CustomEvent(eventName); + //} } } #endif diff --git a/Assets/LuaFramework/Scripts/SDK/SDKManager.cs b/Assets/LuaFramework/Scripts/SDK/SDKManager.cs index e3c38f9cd7..d3fe80f447 100644 --- a/Assets/LuaFramework/Scripts/SDK/SDKManager.cs +++ b/Assets/LuaFramework/Scripts/SDK/SDKManager.cs @@ -124,6 +124,11 @@ namespace SDK { proxy.Login(); } + //sdk 登录 + public void Logout() + { + proxy.Logout(); + } //sdk 数据上报 public void SubmitExtraData(SDKSubmitExtraDataArgs args) { diff --git a/Assets/LuaFramework/Scripts/SDK/Tools/AndroidDeviceInfo.cs b/Assets/LuaFramework/Scripts/SDK/Tools/AndroidDeviceInfo.cs index 0da2ca8231..ab6e5695a2 100644 --- a/Assets/LuaFramework/Scripts/SDK/Tools/AndroidDeviceInfo.cs +++ b/Assets/LuaFramework/Scripts/SDK/Tools/AndroidDeviceInfo.cs @@ -24,6 +24,10 @@ public class AndroidDeviceInfo private AndroidDeviceInfo() { + +#if UNITY_IOS + +#elif UNITY_ANDROID using (var up = new AndroidJavaClass("com.unity3d.player.UnityPlayer")) { context = up.GetStatic("currentActivity"); @@ -33,6 +37,7 @@ public class AndroidDeviceInfo jo.Call("Init", context); } } +#endif } public void DeviceInit() { @@ -44,7 +49,11 @@ public class AndroidDeviceInfo string type = ""; try { +#if UNITY_IOS + +#elif UNITY_ANDROID type = jo.CallStatic("GetDeviceBrand"); +#endif } catch (Exception e) { @@ -58,7 +67,11 @@ public class AndroidDeviceInfo string type = ""; try { +#if UNITY_IOS + +#elif UNITY_ANDROID type = jo.CallStatic("GetDeviceModel"); +#endif } catch (Exception e) { @@ -72,7 +85,11 @@ public class AndroidDeviceInfo string type = ""; try { +#if UNITY_IOS + +#elif UNITY_ANDROID type = jo.CallStatic("GetSystemVersion"); +#endif } catch (Exception e) { @@ -86,7 +103,11 @@ public class AndroidDeviceInfo string type = ""; try { +#if UNITY_IOS + +#elif UNITY_ANDROID type = jo.CallStatic("GetScreenRatio",context); +#endif } catch (Exception e) { @@ -100,7 +121,12 @@ public class AndroidDeviceInfo string type = ""; try { + +#if UNITY_IOS + +#elif UNITY_ANDROID type = jo.CallStatic("GetOperatorName", context); +#endif } catch (Exception e) { @@ -115,7 +141,11 @@ public class AndroidDeviceInfo string type = ""; try { +#if UNITY_IOS + +#elif UNITY_ANDROID type = jo.CallStatic("GetNetworkType", context); +#endif } catch (Exception e) { @@ -129,7 +159,11 @@ public class AndroidDeviceInfo string type = ""; try { +#if UNITY_IOS + +#elif UNITY_ANDROID type = jo.CallStatic("GetLocalIpAddress", context); +#endif } catch (Exception e) { @@ -140,35 +174,60 @@ public class AndroidDeviceInfo //sdk 获取设备标识 public string GetDeviceID() { +#if UNITY_IOS + return ""; +#elif UNITY_ANDROID return jo.CallStatic("GetDeviceID"); +#endif } //sdk 获取IMEI public string GetIMEICode() { +#if UNITY_IOS + return ""; +#elif UNITY_ANDROID return jo.CallStatic("GetIMEICode"); +#endif } //sdk 获取app名 public string GetAppName() { +#if UNITY_IOS + return ""; +#elif UNITY_ANDROID return jo.CallStatic("getAppName"); +#endif } //sdk 获取版本名称 public string GetVersionName() { +#if UNITY_IOS + return ""; +#elif UNITY_ANDROID return jo.CallStatic("getVersionName"); +#endif } //sdk 获取版本号 public int GetVersionCode() { +#if UNITY_IOS + return 0; +#elif UNITY_ANDROID return jo.CallStatic("getVersionCode"); +#endif } //sdk 获取包名 public string GetPackageName() { + +#if UNITY_IOS + return ""; +#elif UNITY_ANDROID return jo.CallStatic("getPackageName"); +#endif } @@ -178,12 +237,22 @@ public class AndroidDeviceInfo //暂时存放--复制粘贴功能(本不隶属于此) public void SetCopyValue(string str) { + +#if UNITY_IOS + +#elif UNITY_ANDROID jo.CallStatic("CopyToClipBoard", str); +#endif } public string GetPastValue() { string result = ""; + +#if UNITY_IOS + +#elif UNITY_ANDROID result = jo.CallStatic("PasteFromClipBoard", context); +#endif return result; } diff --git a/Assets/LuaFramework/Scripts/SDK/Tools/NotchScreenUtil.cs b/Assets/LuaFramework/Scripts/SDK/Tools/NotchScreenUtil.cs index 75230a14a0..5cb7cd21e3 100644 --- a/Assets/LuaFramework/Scripts/SDK/Tools/NotchScreenUtil.cs +++ b/Assets/LuaFramework/Scripts/SDK/Tools/NotchScreenUtil.cs @@ -26,6 +26,9 @@ public class NotchScreenUtil private NotchScreenUtil() { +#if UNITY_IOS + +#elif UNITY_ANDROID using (var up = new AndroidJavaClass("com.unity3d.player.UnityPlayer")) { context = up.GetStatic("currentActivity"); @@ -35,6 +38,7 @@ public class NotchScreenUtil jo.Call("Init", context); } } +#endif } @@ -47,15 +51,20 @@ public class NotchScreenUtil public int GetNotchHeight() { int height = 0; + try { +#if UNITY_IOS + +#elif UNITY_ANDROID height = jo.CallStatic("getNotchHeight"); +#endif } catch (Exception e) { Debug.LogError(e); } - return height; + return height; }