diff --git a/Editor/GuruManager/Files/sdk_res/AndroidManifest.xml b/Editor/GuruManager/Files/sdk_res/AndroidManifest.xml index 533a08a..1944c2f 100644 --- a/Editor/GuruManager/Files/sdk_res/AndroidManifest.xml +++ b/Editor/GuruManager/Files/sdk_res/AndroidManifest.xml @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/Editor/GuruManager/Helper/AndroidResMod.cs b/Editor/GuruManager/Helper/AndroidResMod.cs index a9dbd72..82cdcfb 100644 --- a/Editor/GuruManager/Helper/AndroidResMod.cs +++ b/Editor/GuruManager/Helper/AndroidResMod.cs @@ -6,8 +6,9 @@ namespace Guru.Editor public class AndroidResMod { - private static readonly string ResName = "GuruSDKRes"; + private static readonly string ResName = "GuruNetworkSecurity"; private static string ResFullPath = Path.Combine(Application.dataPath, $"Plugins/Android/{ResName}.androidlib"); + private static string OldSecurityXml = Path.Combine(Application.dataPath, "Plugins/Android/res/xml/network_security_config.xml"); /// /// 应用补丁 @@ -20,6 +21,8 @@ namespace Guru.Editor private static void DeployAndroidRes() { + if(File.Exists(OldSecurityXml)) File.Delete(OldSecurityXml); + var spath = GuruEditorHelper.GetFilePath($"{nameof(AndroidResMod)} t:Script"); if (!string.IsNullOrEmpty(spath)) { @@ -31,7 +34,6 @@ namespace Guru.Editor { FileUtil.DeleteFileOrDirectory(ResFullPath); } - FileUtil.CopyFileOrDirectory(from, to); } } diff --git a/Editor/GuruManager/Manager/GuruSDKManager.cs b/Editor/GuruManager/Manager/GuruSDKManager.cs index 6f9ceec..feaa6b1 100644 --- a/Editor/GuruManager/Manager/GuruSDKManager.cs +++ b/Editor/GuruManager/Manager/GuruSDKManager.cs @@ -850,7 +850,7 @@ namespace Guru.Editor //-------- 部署 Android 相关的文件和资源 ---------- AndroidManifestMod.Apply(); AndroidProjectMod.Apply(); - // AndroidResMod.Apply(); // 部署 GuruSDKRes 资源文件, 目前部署在 guru.sdk.core 的 Plugins/Android/SDKRes.androidlib 中 + AndroidResMod.Apply(); // 部署 GuruSDKRes 资源文件, 目前部署在 guru.sdk.core 的 Plugins/Android/SDKRes.androidlib 中 // #endif AssetDatabase.Refresh(); diff --git a/Runtime/Code/SDK/GuruSDK.cs b/Runtime/Code/SDK/GuruSDK.cs index 3ddd35b..8aa71fa 100644 --- a/Runtime/Code/SDK/GuruSDK.cs +++ b/Runtime/Code/SDK/GuruSDK.cs @@ -8,7 +8,7 @@ namespace Guru public partial class GuruSDK: MonoBehaviour { - public const string Version = "1.0.5"; + public const string Version = "1.0.6"; public const string Tag = "[Guru]"; public const string ServicesConfigKey = "guru_services"; diff --git a/package.json b/package.json index ea4857e..47ec251 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "com.guru.unity.sdk", "displayName": "Guru SDK", - "version": "1.0.5", + "version": "1.0.6", "description": "Guru SDK for unity project", "unity": "2020.3", "author":{