diff --git a/Assets/LuaFramework/Scripts/SDK/Proxy/iOSProxy.cs b/Assets/LuaFramework/Scripts/SDK/Proxy/iOSProxy.cs index 9362f88a11..4591132b32 100644 --- a/Assets/LuaFramework/Scripts/SDK/Proxy/iOSProxy.cs +++ b/Assets/LuaFramework/Scripts/SDK/Proxy/iOSProxy.cs @@ -10,65 +10,65 @@ namespace SDK { public class iOSProxy : Proxy { - // //初始化 - // [DllImport("__Internal")] - // private static extern void m_SDK_Init(); - // public override void Init() - // { - // m_SDK_Init(); - // } + //初始化 + [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_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_SDK_Logout(); + public override void Logout() + { + m_SDK_Logout(); + } - ////退出游戏 - //[DllImport("__Internal")] - //private static extern void m_SDK_Exit(); - //public override void Exit() - //{ - // m_SDK_Exit(); - //} + //退出游戏 + [DllImport("__Internal")] + private static extern void m_SDK_Exit(); + public override void Exit() + { + m_SDK_Exit(); + } - ////退出游戏 - //[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); - //} + //退出游戏 + [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); + } - //[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); - //} + [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); - //} + //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/Tools/NotchScreenUtil.cs b/Assets/LuaFramework/Scripts/SDK/Tools/NotchScreenUtil.cs index 5cb7cd21e3..60498368b4 100644 --- a/Assets/LuaFramework/Scripts/SDK/Tools/NotchScreenUtil.cs +++ b/Assets/LuaFramework/Scripts/SDK/Tools/NotchScreenUtil.cs @@ -47,15 +47,21 @@ public class NotchScreenUtil Debug.Log("设备信息初始化"); } + +#if UNITY_IOS + [DllImport("__Internal")] + private static extern float m_Notch_Height(); +#endif + + // 获取刘海屏高度 public int GetNotchHeight() - { + { int height = 0; - try { #if UNITY_IOS - + height = Math.Floor(m_Notch_Height()); #elif UNITY_ANDROID height = jo.CallStatic("getNotchHeight"); #endif @@ -66,6 +72,6 @@ public class NotchScreenUtil } return height; } - + } \ No newline at end of file