diff --git a/Assets/EFSDK/EFSdk.cs b/Assets/EFSDK/EFSdk.cs index 139c845..1a66ea4 100755 --- a/Assets/EFSDK/EFSdk.cs +++ b/Assets/EFSDK/EFSdk.cs @@ -13,6 +13,7 @@ namespace EFSDK { private static EFSdk _mEfSdk; + private static string Unity_SDK_Ver = "0.0.17"; // 保持变量名不变 private static string mappingInfo = ""; @@ -145,6 +146,7 @@ namespace EFSDK public Action HdH5ImpressionAction; public Action mCanGobackAction; public Action mReqNotifyPermissionAction; + public Action mReqFloatPermissionAction; /// /// 在Init方法之后调用这个方法,设置SDK上报事件回调, 将SDK传过来的事件上报到Firebase,数数等 @@ -252,10 +254,11 @@ namespace EFSDK /// /// /// - /// - public void ShowToast(string message) + /// 消息文案 + /// 消息文本颜色,十六进制字符串 + public void ShowToast(string message,string textColor = "#FFFFFF") { - SDKCall("showToast", message); + SDKCall("showToast", message,textColor); } /// @@ -510,5 +513,29 @@ namespace EFSDK } #endregion + + #region 悬浮窗 + + /// + /// 判断是否有悬浮窗权限 + /// + /// + public bool HasFloatWindowPermission() + { + return SDKCall("hasFloatWindowPermission"); + } + + /// + /// 申请悬浮窗权限 + /// + /// 申请权限的位置 + /// bool 是否被授予权限 + public void RequestFloatWindowPermission(String position,Action callback) + { + mReqFloatPermissionAction = callback; + SDKCall("requestFloatWindowPermission",position); + } + + #endregion } } \ No newline at end of file diff --git a/Assets/EFSDK/EFSdkAndroid.cs b/Assets/EFSDK/EFSdkAndroid.cs index 585fc43..48d8a23 100755 --- a/Assets/EFSDK/EFSdkAndroid.cs +++ b/Assets/EFSDK/EFSdkAndroid.cs @@ -11,6 +11,7 @@ namespace EFSDK private string Can_Goback = "canGoback"; private string reqNotifyPermission = "reqNotifyPermission"; private string REQUEST_ADD_WIDGET_RESULT = "requestAddWidgetResult"; + private string REQUEST_FLOAT_WINDOW_PERMISSION = "requestFloatWindowPermission"; public void OnReceiverAnd(string message) { @@ -44,6 +45,11 @@ namespace EFSDK string[] flag = message.Split('#'); EFSdk.get().actionRequestAddWidgetResult?.Invoke(flag[2].Equals("true")); } + if (message.StartsWith(REQUEST_FLOAT_WINDOW_PERMISSION)) + { + string[] flag = message.Split('#'); + EFSdk.get().mReqFloatPermissionAction?.Invoke(flag[1].Equals("true")); + } if (message.StartsWith("Event#")) { diff --git a/Assets/EFSDK/Editor/AndroidResAarBuilder.cs b/Assets/EFSDK/Editor/AndroidResAarBuilder.cs index 19ec1d4..8cca933 100755 --- a/Assets/EFSDK/Editor/AndroidResAarBuilder.cs +++ b/Assets/EFSDK/Editor/AndroidResAarBuilder.cs @@ -15,12 +15,26 @@ namespace EFSDK private static readonly string TempDir = "Temp/AndroidResAar"; private static readonly string EFSdk_FILE = "Assets/EFSDK/EFSdk.cs"; - [MenuItem("EFSDK/构建当前包名的推送SDK")] + [MenuItem("EFSDK/!!提示:不需要悬浮窗功能的不要构建带悬浮窗的SDK!!")] + public static void Tips() + { + Debug.Log($"不需要悬浮窗功能的不要构建带悬浮窗的SDK"); + } + + [MenuItem("EFSDK/构建当前包名的推送SDK(小组件)")] public static void BuildPushSdk() { - Debug.Log($"当前包名: {Application.identifier}"); + Debug.Log($"构建当前包名的推送SDK(小组件) 当前包名: {Application.identifier}"); string result = SDKEditorNetworkTool.HttpGetText( - $"http://v4.9ms.co:58080/generic-webhook-trigger/invoke?token=pushsdk&target_package_name={Application.identifier}"); + $"http://v4.9ms.co:58080/generic-webhook-trigger/invoke?token=pushsdk&target_package_name={Application.identifier}&branch_name=dev-widget"); + Debug.Log($"{result}\n成功发起推送SDK构建请求,请稍等3分钟之后,重新打包即可"); + } + [MenuItem("EFSDK/构建当前包名的推送SDK(小组件+悬浮窗)")] + public static void BuildPushSdkWf() + { + Debug.Log($"构建当前包名的推送SDK(小组件+悬浮窗) 当前包名: {Application.identifier}"); + string result = SDKEditorNetworkTool.HttpGetText( + $"http://v4.9ms.co:58080/generic-webhook-trigger/invoke?token=pushsdk&target_package_name={Application.identifier}&branch_name=dev-alert-window"); Debug.Log($"{result}\n成功发起推送SDK构建请求,请稍等3分钟之后,重新打包即可"); }