com.typhoon.unitysdk 1.0.93 → 1.0.95

package/CHANGELOG.md

@@ -1,7 +1,13 @@
 # 更新日志
+## [1.0.94] - 2024-01-25
+
+### 新增
+* 更新vivo app sdk
+
+
 ## [1.0.93] - 2024-01-23
 
-### 修复
+### 修复
 * 抖音快捷发布GUIbug
 
 

package/Editor/ApplyTool.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 using UnityEditor;
 using UnityEngine;
 
@@ -38,11 +40,26 @@ namespace TyphoonUnitySDK
         /// </summary>
         public static void SaveAllChannelConfig()
         {
+            // var classTypes = UniEditor.GetSubClassTypes(typeof(ISaveConfigPipeline));
+            // foreach (var classType in classTypes)
+            // {
+            //     var guids = AssetDatabase.FindAssets($"t:{classType.FullName}", new[] { "Assets" });
+            //     foreach (var guid in guids)
+            //     {
+            //         var path = AssetDatabase.GUIDToAssetPath(guid);
+            //         if (!string.IsNullOrEmpty(path))
+            //         {
+            //             var asset = AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(path);
+            //             (asset as ISaveConfigPipeline)?.SaveConfig();
+            //         }
+            //     }
+            // }
             VivoMiniConfig.Default.Save();
             WxMiniConfig.Default.Save();
             DouyinConfig.Default.Save();
             VariablePreset.Default.Save();
             OppoMiniConfig.Default.Save();
+            ChinaAndroidConfig.Default.Save();
         }
 
         /// <summary>

package/Editor/ChinaAndroidConfig.cs

@@ -0,0 +1,128 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using UnityEditor;
+using UnityEngine;
+
+namespace TyphoonUnitySDK
+{
+    public static class ChinaAndroidConfigGUIDrawer
+    {
+        public static Dictionary<string, Func<ChinaAndroidConfig, bool>> OverrideDrawGUIFunc =
+            new Dictionary<string, Func<ChinaAndroidConfig, bool>>()
+            {
+                { "m_Script", DrawProperty_m_Script },
+                { $"{nameof(Orientation)}", DrawProperty_Orientation },
+            };
+
+        private static bool DrawProperty_Orientation(ChinaAndroidConfig arg)
+        {
+            var txt = arg.Orientation == ChinaAndroidConfig.ScreenOrientation.Portrait ? "竖屏" : "横屏";
+            GUILayout.Label("横竖屏模式", Styles.BoldLabel);
+            if (GUILayout.Button(txt, "PopUp"))
+            {
+                var menu = new GenericMenu();
+                menu.AddItem(new GUIContent("竖屏"), arg.Orientation == ChinaAndroidConfig.ScreenOrientation.Portrait,
+                    () =>
+                    {
+                        arg.Orientation = ChinaAndroidConfig.ScreenOrientation.Portrait;
+                        arg.Save();
+                    });
+                menu.AddItem(new GUIContent("横屏"), arg.Orientation == ChinaAndroidConfig.ScreenOrientation.Landscape,
+                    () =>
+                    {
+                        arg.Orientation = ChinaAndroidConfig.ScreenOrientation.Landscape;
+                        arg.Save();
+                    });
+                menu.ShowAsContext();
+            }
+
+            return true;
+        }
+
+        private static bool DrawProperty_m_Script(ChinaAndroidConfig arg)
+        {
+            var tmpEnable = GUI.enabled;
+            GUI.enabled = true;
+            GUILayout.Space(6);
+            GUIDrawer.DrawKeynotes("①需要Unity 2019.3+ 或以上，即新版 android 目录结构");
+            GUIDrawer.DrawKeynotes("②剔除第三方SDK,避免与渠道冲突或不兼容");
+            GUILayout.Space(6);
+            GUI.enabled = tmpEnable;
+            return true;
+        }
+
+
+        /*绘制GUI*/
+        public static void DrawGUI()
+        {
+            var config = ChinaAndroidConfig.Default;
+            GUIDrawer.DrawProperty(config, (property) =>
+            {
+                if (OverrideDrawGUIFunc.TryGetValue(property, out var match))
+                {
+                    return match.Invoke(config);
+                }
+
+                return false;
+            });
+        }
+    }
+
+    public class ChinaAndroidConfig : ScriptableObject
+    {
+        private static string ConfigPath = "Assets/Typhoon_Gen/TyphoonSDK/Editor/ChinaAndroidConfig.asset";
+
+        private static ChinaAndroidConfig _instance = null;
+
+        public static ChinaAndroidConfig Default
+        {
+            get
+            {
+                if (_instance == null)
+                {
+                    _instance = AssetDatabase.LoadAssetAtPath<ChinaAndroidConfig>(ConfigPath);
+                }
+
+                if (_instance == null)
+                {
+                    _instance = CreateInstance<ChinaAndroidConfig>();
+                    var folder = Path.GetDirectoryName(ConfigPath);
+                    if (!Directory.Exists(folder))
+                    {
+                        Directory.CreateDirectory(folder);
+                        AssetDatabase.Refresh();
+                    }
+
+                    AssetDatabase.CreateAsset(_instance, ConfigPath);
+                }
+
+                return _instance;
+            }
+        }
+
+        /// <summary>
+        /// 横竖屏模式
+        /// </summary>
+        public enum ScreenOrientation
+        {
+            Portrait,
+            Landscape,
+        }
+
+        [Header("横竖屏模式")] public ScreenOrientation Orientation = ScreenOrientation.Portrait;
+
+        [LabelOverride("保留导出工程")] public bool KeepProj = false;
+
+        public void Save()
+        {
+            EditorUtility.SetDirty(this);
+            AssetDatabase.SaveAssets();
+        }
+
+        public void SaveConfig()
+        {
+            Save();
+        }
+    }
+}

package/Editor/ChinaAndroidConfig.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0926d67246403c84087b96d1964271b8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/DouyinConfig.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using UnityEditor;
 using UnityEngine;
-using UnityEngine.Serialization;
 
 namespace TyphoonUnitySDK
 {
@@ -95,7 +94,7 @@ namespace TyphoonUnitySDK
     /// <summary>
     /// 抖音小游戏配置
     /// </summary>
-    public class DouyinConfig : ScriptableObject
+    public class DouyinConfig : ScriptableObject, ISaveConfigPipeline
     {
         private static string ConfigPath = "Assets/Typhoon_Gen/TyphoonSDK/Editor/DouyinConfig.asset";
         public static string INIPath = ".typhoon/unitysdk/douyin.ini";
@@ -139,5 +138,10 @@ namespace TyphoonUnitySDK
             EditorUtility.SetDirty(this);
             AssetDatabase.SaveAssets();
         }
+
+        public void SaveConfig()
+        {
+            Save();
+        }
     }
 }

package/Editor/ExportModule.cs

@@ -18,9 +18,9 @@ namespace TyphoonUnitySDK
         {
             var manifest = new List<string>()
             {
-                "Assets/Plugins/Android/libs/sdk_plug-release.aar",
-                "Assets/Plugins/Android/libs/unity_app-release.aar",
-                "Assets/Plugins/Android/libs/unity_launcher-release.aar",
+                // "Assets/Plugins/Android/libs/sdk_plug-release.aar",
+                // "Assets/Plugins/Android/libs/unity_app-release.aar",
+                "Assets/Plugins/Android/libs/lib-union-sdk.aar",
                 "Assets/Plugins/Android/AndroidManifest.xml",
                 "Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid",
             };

package/Editor/ISaveConfigPipeline.cs

@@ -0,0 +1,14 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace TyphoonUnitySDK
+{
+    /// <summary>
+    /// 配置保存管线
+    /// </summary>
+    public interface ISaveConfigPipeline
+    {
+        void SaveConfig();
+    }
+}

package/Editor/ISaveConfigPipeline.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6be6fd7dd9cac534cb2deb7cd2fb5f15
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/OppoMiniConfig.cs

@@ -470,7 +470,7 @@ namespace TyphoonUnitySDK
     /// <summary>
     /// oppo mini 参数
     /// </summary>
-    public class OppoMiniConfig : ScriptableObject
+    public class OppoMiniConfig : ScriptableObject, ISaveConfigPipeline
     {
         private static string ConfigPath = "Assets/Typhoon_Gen/TyphoonSDK/Editor/OppoMiniConfig.asset";
 
@@ -539,5 +539,10 @@ namespace TyphoonUnitySDK
             EditorUtility.SetDirty(this);
             AssetDatabase.SaveAssets();
         }
+
+        public void SaveConfig()
+        {
+            Save();
+        }
     }
 }

package/Editor/PublishResult.cs

@@ -1,7 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
 namespace TyphoonUnitySDK
 {
     /// <summary>
@@ -9,6 +5,11 @@ namespace TyphoonUnitySDK
     /// </summary>
     public class PublishResult
     {
+        /// <summary>
+        /// 是否成功
+        /// </summary>
+        public bool IsSuccess = false;
+
         /// <summary>
         /// 发布设置
         /// </summary>
@@ -19,6 +20,12 @@ namespace TyphoonUnitySDK
         /// </summary>
         public string AndroidProj;
 
+        /// <summary>
+        /// 导出的AndroidAPK
+        /// </summary>
+        public string AndroidApk;
+
+
         /// <summary>
         /// 导出的微信工程
         /// </summary>

package/Editor/PublishSetting.cs

@@ -105,6 +105,10 @@ public AndroidSdkVersions MinApiVersion = AndroidSdkVersions.AndroidApiLevel22;
 
         /*oppo小游戏拓展配置*/
         public bool OppoMiniGUIFoldout = true;
+        
+        //国内安卓拓展配置
+        public bool ChinaAndroidGUIFoldout = true;
+        
 
 
         //使用配置

package/Editor/PublishSettingGUIDrawer.cs

@@ -54,8 +54,27 @@ namespace TyphoonUnitySDK
                 { nameof(PublishSetting.DouyinGUIFoldout), DrawProperty_DouyinGUIFoldout },
                 { nameof(PublishSetting.VivoMiniGUIFoldout), DrawProperty_VivoMiniGUIFoldout },
                 { nameof(PublishSetting.OppoMiniGUIFoldout), DrawProperty_OppoMiniGUIFoldout },
+                { nameof(PublishSetting.ChinaAndroidGUIFoldout), DrawProperty_ChinaAndroidGUIFoldout },
             };
 
+        private static bool DrawProperty_ChinaAndroidGUIFoldout(PublishSetting arg)
+        {
+            if (arg.Channel != AppChannel.ChinaAndroid)
+            {
+                return true;
+            }
+
+            GUILayout.Space(10);
+            arg.ChinaAndroidGUIFoldout =
+                GUIDrawer.DrawFoldout("国内Android", arg.ChinaAndroidGUIFoldout, GUILayout.Height(26));
+            if (arg.ChinaAndroidGUIFoldout)
+            {
+                ChinaAndroidConfigGUIDrawer.DrawGUI();
+            }
+
+            return true;
+        }
+
         private static bool DrawProperty_WebglDataCaching(PublishSetting arg)
         {
             if (arg.BuildTarget != BuildTarget.WebGL)

package/Editor/TempPublish/PublishVivoBatSettingInspector.cs

@@ -13,68 +13,49 @@ namespace TyphoonUnitySDK
     {
         public PublishVivoBatSetting Setting => target as PublishVivoBatSetting;
 
-        /*Config.java*/
-        public string GetConfigJavaPath()
-        {
-            return $@"{Setting.AndroidPublishProj}\vivo_union\src\main\java\com\typhoon\vivo_union\Config.java";
-        }
-
         /*build gradle*/
         public string GetBuildGradle()
         {
-            return $@"{Setting.AndroidPublishProj}\vivo_union\build.gradle";
+            return $@"{Setting.AndroidPublishProj}\proj\launcher_vivo\build.gradle";
         }
 
         /*AndroidManifest.xml*/
         public string GetAndroidManifestXml()
         {
-            return $@"{Setting.AndroidPublishProj}\vivo_union\src\main\AndroidManifest.xml";
+            return $@"{Setting.AndroidPublishProj}\proj\launcher_vivo\src\main\AndroidManifest.xml";
         }
 
         /*supplierconfig.json*/
         public string GetSupplierConfigJson()
         {
-            return $@"{Setting.AndroidPublishProj}\vivo_union\src\main\assets\supplierconfig.json";
+            return $@"{Setting.AndroidPublishProj}\proj\launcher_vivo\src\main\assets\supplierconfig.json";
         }
 
 
         /*strings.xml*/
         public string GetStringsXml()
         {
-            return $@"{Setting.AndroidPublishProj}\vivo_union\src\main\res\values\strings.xml";
-        }
-
-
-        /*unitylibrary*/
-        public string GetUnityLibrary()
-        {
-            return $@"{Setting.AndroidPublishProj}\unityLibrary";
-        }
-
-        /*unitylibrary AndroidManifest.xml*/
-        public string GetUnityLibraryAndroidManifestXml()
-        {
-            return $@"{Setting.AndroidPublishProj}\unityLibrary\src\main\AndroidManifest.xml";
+            return $@"{Setting.AndroidPublishProj}\proj\launcher_vivo\src\main\res\values\strings.xml";
         }
 
 
         /*icon*/
         public string GetIconPath()
         {
-            return $@"{Setting.AndroidPublishProj}\vivo_union\src\main\res\mipmap-mdpi\app_icon.png";
+            return $@"{Setting.AndroidPublishProj}\proj\launcher_vivo\src\main\res\mipmap-mdpi\app_icon.png";
         }
 
+        public string GetLauncherVivoPath() => $@"{Setting.AndroidPublishProj}\proj\launcher_vivo";
+
+        public string GetBeeUnionSdkConfigJsonPath() =>
+            @$"{Setting.AndroidPublishProj}\proj\launcher_vivo\src\main\assets\bee_union_sdk_config.json";
+
 
         public PublishVivoBatSetting Target => target as PublishVivoBatSetting;
 
         public override void OnInspectorGUI()
         {
             base.OnInspectorGUI();
-            // if (GUILayout.Button("自动版本号", GUILayout.Height(32)))
-            // {
-            //     Target.Version = AutoVersionSting(Target.Version);
-            //     Target.Save();
-            // }
 
             var publish = GUILayout.Button("发布vivo", GUILayout.Height(32));
 
@@ -95,222 +76,46 @@ namespace TyphoonUnitySDK
                 throw new Exception($"找不到{setting.AndroidPublishProj}");
             }
 
-            WriteUnityLibrary();
+            WriteUnityLibraryAAR();
             WriteIcon();
             WriteBuildGradle();
             WriteStringsXml();
-            WriteConfigJava();
             WriteAndroidManifestXml();
             WriteSupplierConfigJson();
-
-            // {
-            //     Debug.Log("修改unity manifest");
-            //
-            //     var manifest = $"{unityProj}/unityLibrary/src/main/AndroidManifest.xml";
-            //     var xml = File.ReadAllText(manifest);
-            //     // string pattern = @"(?s)<intent-filter\b[^>]*>(.*?)<\/intent-filter>";
-            //     // string result = Regex.Replace(xml, pattern, "");f
-            //     xml = xml.Replace("<intent-filter>", "");
-            //     xml = xml.Replace("<action android:name=\"android.intent.action.MAIN\" />", "");
-            //     xml = xml.Replace("<category android:name=\"android.intent.category.LAUNCHER\" />", "");
-            //     xml = xml.Replace("</intent-filter>", "");
-            //     File.WriteAllText(manifest, xml);
-            //
-            //     //复制unitylib
-            //     Debug.Log("复制unitylib");
-            //     var from = $"{unityProj}/unityLibrary";
-            //     var to = $"{publishProj}/unityLibrary";
-            //     UniEditor.TryDeleteFolder(to);
-            //     UniEditor.CopyFolder(from, to);
-            // }
+            WriteBeeUnionSdkConfigJson();
             Debug.Log("处理完毕！");
         }
 
-
-        /*修改config.java*/
-        public void WriteConfigJava()
-        
+        private void WriteBeeUnionSdkConfigJson()
         {
-            var config =
-                $@"package com.typhoon.vivo_union;
-
-/*打包配置*/
-public class Config {{
-
-    /*启动进入demo测试页/游戏场景*/
-    public static  boolean LAUNCHER_DEMO=false;
-
-    /*Debug 模式开关*/
-    public static boolean DEBUG_MODE = {Setting.DebugMode.ToString().ToLower()};
-
-    /*竖屏模式为true,横屏模式为false*/
-    public static boolean ORIENTATION_PORTRAIT = {Setting.Portrait.ToString().ToLower()};
-
-    /*隐藏政策URL*/
-    public static String PRIVACY_POLICY_URL = ""{Setting.PrivacyPolicyYNoteUrl}"";
-    /*VIVO-联运 参数*/
-    public static String APP_ID = ""{Setting.AppId}"";//appid(看后台）
-    /*VIVO-广告联盟 参数*/
-    public static String MEDIA_ID = ""{Setting.MediaID}"";//Media ID
-    public static String VIDEO_UNIT_ID = ""{Setting.VideoID}""; //视频广告
-    public static String SPLASH_UNIT_ID = ""{Setting.SplashID}"";//开屏广告
-    public static String INTER_IMAGE_UNIT_ID = ""{Setting.IntersID}""; //图片类插页广告
-    public static String INTER_VIDEO_UNIT_ID = """"; //视频类插页广告
-    public static String FLOAT_ICON_UNIT_ID = ""{Setting.FloatIconID}""; //悬浮icon
-    public static String NATIVE_UNIT_ID = ""{Setting.NativeID}"";//原生广告
-    public static String BANNER_UNIT_ID = ""{Setting.BannerID}"";//banner广告
-    public static String WX_APP_ID = """";//后台申请的媒体微信APPID
-    public static int SPLASH_FETCH_TIMEOUT = 3000;//开屏广告拉取最大超时时间，单位毫秒
-    public static int SPLASH_FLOOR_PRICE=-1;//开屏广告底价，-1为不设定
-    public static int INTERS_IMAGE_FLOOR_PRICE=-1;//图片类插屏广告底价，-1为不设定
-    public static int INTERS_VIDEO_FLOOR_PRICE=-1;//视频类插屏广告底价，-1为不设定
-
-    /*友盟统计*/
-    public static  String UM_APP_KEY=""{Setting.UMAppKey}"";//app-key
-    public static  String UM_APP_CHANNEL=""vivo_union"";//渠道名，unknown为保留，不能使用，不管大小写
-
-
-
-
-
-}}
-";
-            //写到目标路径
-            var path = GetConfigJavaPath();
-            File.WriteAllText(path, config);
-            Debug.Log($"写入:{path}");
+            var path = GetBeeUnionSdkConfigJsonPath();
+            var jsonObj = new
+            {
+                privacyUrl = $"{Setting.PrivacyPolicyYNoteUrl}",
+                orientation = Setting.Portrait ? 1 : 2,
+                appId = Setting.AppId,
+                debug = 1,
+            };
+            var json = jsonObj.ToXJson();
+            File.WriteAllText(path, json);
+            Debug.Log($"写入：{path}");
         }
 
-        /*写入build.gradle*/
+
+        //写入build.gradle
         public void WriteBuildGradle()
         {
-            var gradle = $@"import java.text.SimpleDateFormat
-
-apply plugin: 'com.android.application'
-
-android {{
-    compileSdkVersion 30
-    buildToolsVersion '30.0.3'
-
-
-    compileOptions {{
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }}
-
-    /*签名配置*/
-    signingConfigs {{
-        release {{
-            def signDir = rootProject.file('sign')
-            keyAlias 'xiqi'
-            keyPassword '1314woaini'
-            storeFile file(signDir.getAbsolutePath() + '/xiqi.jks')
-            storePassword '1314woaini'
-        }}
-
-        debug {{
-            def signDir = rootProject.file('sign')
-            keyAlias 'xiqi'
-            keyPassword '1314woaini'
-            storeFile file(signDir.getAbsolutePath() + '/xiqi.jks')
-            storePassword '1314woaini'
-        }}
-    }}
-
-
-    defaultConfig {{
-        minSdkVersion 21
-        targetSdkVersion {Setting.TargetSdkVersion}
-        versionCode {Setting.VersionCode}
-        versionName '{Setting.Version}'
-        applicationId '{Setting.PackageName}'
-        consumerProguardFiles ""consumer-rules.pro""
-        ndk {{
-            abiFilters 'armeabi-v7a', 'arm64-v8a'
-        }}
-    }}
-
-
-    //发布的包名
-    applicationVariants.all {{ variant ->
-        variant.outputs.all {{
-            def formattedDate = new SimpleDateFormat(""yyyyMMdd_HHmmss"").format(new Date())
-            def versionName = variant.versionName
-            def buildType = variant.buildType.name
-            def appName = variant.applicationId
-            outputFileName = ""${{appName}}_v${{versionName}}_${{buildType}}_${{formattedDate}}.apk""
-        }}
-    }}
-
-
-
-    sourceSets {{
-        main {{
-            jniLibs.srcDirs = ['libs']
-        }}
-    }}
-
-    aaptOptions {{
-        noCompress = ['.unity3d', '.ress', '.resource', '.obb', 'aa/catalog.json', 'aa/settings.json', 'aa/AddressablesLink/link.xml', '.bundle']
-        ignoreAssetsPattern = ""!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~""
-    }}
-
-    lintOptions {{
-        abortOnError false
-    }}
-
-    buildTypes {{
-        debug {{
-            minifyEnabled false
-            useProguard false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro',getDefaultProguardFile('proguard-android-optimize.txt')
-            signingConfig signingConfigs.debug
-            jniDebuggable true
-        }}
-        release {{
-            minifyEnabled false
-            useProguard false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro',getDefaultProguardFile('proguard-android-optimize.txt')
-            signingConfig signingConfigs.release
-
-        }}
-    }}
-
-    packagingOptions {{
-        doNotStrip '*/armeabi-v7a/*.so'
-        doNotStrip '*/arm64-v8a/*.so'
-    }}
-    packagingOptions {{ doNotStrip ""*/armeabi/libvsecbox.so"" }}
-    packagingOptions {{ doNotStrip ""*/armeabi-v7a/libvsecbox.so"" }}
-    packagingOptions {{ doNotStrip ""*/arm64-v8a/libvsecbox.so"" }}
-
-    bundle {{
-        language {{
-            enableSplit = false
-        }}
-        density {{
-            enableSplit = false
-        }}
-        abi {{
-            enableSplit = true
-        }}
-    }}
-
-}}
-
-dependencies {{
-    api ""com.android.support:support-v4:28.0.0""
-    api ""com.android.support:recyclerview-v7:28.0.0""
-    api ""com.android.support:appcompat-v7:28.0.0""
-    api fileTree(includes: ['*.jar', '*.aar'], dir: 'libs')
-    api project(':sdk_plug')
-    api project(':unity_app')
-    api project(':umeng_support')
-
-
-
-}}";
             var path = GetBuildGradle();
+            var gradle = File.ReadAllText(path);
+            //替换包名，替换版本号
+            var pattern = "versionCode[\\s]*[0-9]*";
+            gradle = Regex.Replace(gradle, pattern, $"versionCode {Setting.VersionCode}");
+            pattern = "versionName[\\s]*'[0-9\\.]*'";
+            gradle = Regex.Replace(gradle, pattern, $"versionName '{Setting.Version}'");
+            pattern = "applicationId[\\s]*\\'[\\w\\.0-9]*\\'";
+            gradle = Regex.Replace(gradle, pattern, $"applicationId '{Setting.PackageName}'");
+            pattern = "targetSdkVersion[\\s]*[0-9]*";
+            gradle = Regex.Replace(gradle, pattern, $"targetSdkVersion {Setting.TargetSdkVersion}");
             File.WriteAllText(path, gradle);
             Debug.Log($"写入:{path}");
         }
@@ -319,96 +124,11 @@ dependencies {{
         private void WriteAndroidManifestXml()
         {
             var orientation = Setting.Portrait ? "portrait" : "landscape";
-            var xml = $@"<?xml version=""1.0"" encoding=""utf-8""?>
-<manifest xmlns:android=""http://schemas.android.com/apk/res/android""
-    package=""com.typhoon.vivo_union"">
-    <supports-screens
-        android:anyDensity=""true""
-        android:largeScreens=""true""
-        android:normalScreens=""true""
-        android:smallScreens=""true""
-        android:xlargeScreens=""true"" />
-    <!-- 联运SDK跳转游戏中心 -->
-    <uses-permission android:name=""vivo.game.permission.OPEN_JUMP_INTENTS"" /> <!-- 联运SDK监听网络状态变化，在支付登录过程中做一些异常处理 -->
-    <uses-permission android:name=""android.permission.CHANGE_NETWORK_STATE"" /> <!-- 允许程序访问Wi-Fi网络状态信息 -->
-    <uses-permission android:name=""android.permission.ACCESS_WIFI_STATE"" /> <!-- 允许程序打开网络套接字 -->
-    <uses-permission android:name=""android.permission.INTERNET"" /> <!-- 允许程序访问有关GSM网络信息 -->
-    <uses-permission android:name=""android.permission.ACCESS_NETWORK_STATE"" /> <!-- 判断游戏是否是在主进程初始化，避免初始化进程错误导致功能不可用 -->
-    <uses-permission android:name=""android.permission.GET_TASKS"" /> <!-- 获取安装权限，更新安装vivo服务安全插件apk -->
-    <uses-permission android:name=""android.permission.REQUEST_INSTALL_PACKAGES"" /> <!-- android11及以上必须添加此权限才能获取vivo服务安全插件安装包的状态 -->
-    <uses-permission android:name=""android.permission.QUERY_ALL_PACKAGES"" />
-    <!-- SDK 必须的权限 -->
-    <uses-permission android:name=""android.permission.INTERNET"" />
-    <uses-permission android:name=""android.permission.ACCESS_NETWORK_STATE"" />
-    <uses-permission android:name=""android.permission.ACCESS_WIFI_STATE"" />
-    <uses-permission android:name=""android.permission.READ_PHONE_STATE"" />
-    <uses-permission android:name=""android.permission.WRITE_EXTERNAL_STORAGE"" />
-    <!-- 此权限一定要加，否则下载类广告不会进入安装流程，影响后向体验 -->
-    <uses-permission android:name=""android.permission.REQUEST_INSTALL_PACKAGES"" />
-    <!-- 如果接入了视频相关的广告, 请务必添加否则黑屏 -->
-    <uses-permission android:name=""android.permission.WAKE_LOCK"" />
-    <uses-permission android:name=""android.permission.MANAGE_EXTERNAL_STORAGE"" />
-
-
-    <application
-        android:name="".App""
-        android:icon=""@mipmap/app_icon""
-        android:label=""@string/app_name""
-        android:hardwareAccelerated=""true""
-        >
-
-        <activity
-            android:name="".LauncherActivity""
-            android:exported=""true""
-            android:configChanges=""orientation|keyboardHidden|screenSize""
-            android:theme=""@android:style/Theme.Translucent.NoTitleBar""
-            >
-            <intent-filter>
-                <action android:name=""android.intent.action.MAIN"" />
-                <category android:name=""android.intent.category.LAUNCHER"" />
-                <!--友盟埋点验证,实时查看可开启-->
-<!--                <action android:name=""android.intent.action.VIEW"" />-->
-<!--                <category android:name=""android.intent.category.DEFAULT"" />-->
-<!--                <category android:name=""android.intent.category.BROWSABLE"" />-->
-<!--                <data android:scheme=""um.5fe03633345b8b53f5745d30"" />-->
-            </intent-filter>
-        </activity>
-
-        <meta-data
-            android:name=""vivo_union_sdk""
-            android:value=""4.7.4.1"" /> <!-- vivo sdk componets start -->
-        <!-- vivo sdk的Activity -->
-        <activity
-            android:name=""com.vivo.unionsdk.ui.UnionActivity""
-            android:configChanges=""orientation|keyboardHidden|navigation|screenSize""
-            android:exported=""true""
-            android:screenOrientation=""{orientation}""
-            android:theme=""@android:style/Theme.Dialog"">
-            <intent-filter>
-                <action android:name=""android.intent.action.VIEW"" />
-
-                <category android:name=""android.intent.category.DEFAULT"" />
-                <category android:name=""android.intent.category.BROWSABLE"" />
-
-                <data
-                    android:host=""union.vivo.com""
-                    android:path=""/openjump""
-                    android:scheme=""vivounion"" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name="".SplashAdActivity""
-            android:hardwareAccelerated=""true""
-            android:exported=""false""
-            android:launchMode=""singleTask""
-            android:configChanges=""orientation|keyboardHidden|navigation|screenSize""
-            android:theme=""@android:style/Theme.Translucent.NoTitleBar"" />
-    </application>
-
-</manifest>";
-
             var path = GetAndroidManifestXml();
+            var xml = File.ReadAllText(path);
+            var pattern = "<meta-data[\\s]*android:name=\"vivoUnionAppId\"[\\s]*.*/>";
+            xml = Regex.Replace(xml, pattern,
+                $"<meta-data android:name=\"vivoUnionAppId\" android:value=\"{Setting.AppId}\"/>");
             File.WriteAllText(path, xml);
             Debug.Log($"写入:{path}");
         }
@@ -444,55 +164,34 @@ dependencies {{
         private void WriteStringsXml()
         {
             var path = GetStringsXml();
-            var xml = $@"<?xml version=""1.0"" encoding=""utf-8""?>
-<resources>
-  <string name=""app_name"">{Setting.GameName}</string>
-  <string name=""game_view_content_description"">Game view</string>
-</resources>";
+            var xml = File.ReadAllText(path);
+            var pattern = "<string[\\s]*name=\"app_name\">.*</string>";
+            xml = Regex.Replace(xml, pattern, $"<string name=\"app_name\">{Setting.GameName}</string>");
             File.WriteAllText(path, xml);
             Debug.Log($"写入:{path}");
         }
 
-        /*写入untiylibrary.xml*/
-        private void WriteUnityLibrary()
+        //写入unityLibrary-release.aar
+        private void WriteUnityLibraryAAR()
         {
-            var android = GetUnityLibrary();
             var unityProj = GetMatchChinaAndroidProj();
             if (unityProj == null)
             {
                 throw new Exception($"找不到unity导出工程");
             }
 
-            var unityLib = $"{unityProj}/unityLibrary";
-            var map = new (string androidPath, string unityPath)[]
-            {
-                //{unityProj}\unityLibrary
-                ($"{android}/libs", $"{unityLib}/libs"),
-                ($"{android}/src/main/assets", $"{unityLib}/src/main/assets"),
-                ($"{android}/src/main/java", $"{unityLib}/src/main/java"),
-                ($"{android}/src/main/jniLibs", $"{unityLib}/src/main/jniLibs"),
-            };
+            //尝试获取unitylibrary.aar
+            var aar = $"{unityProj}/unityLibrary/build/outputs/aar/unityLibrary-release.aar";
 
-            var xmlAndroid = $"{android}/src/main/AndroidManifest.xml";
-            var xmlUnity = $"{unityLib}/src/main/AndroidManifest.xml";
-            foreach (var e in map)
+            if (!File.Exists(aar))
             {
-                UniEditor.TryDeleteFolder(e.androidPath);
-                UniEditor.CopyFolder(e.unityPath, e.androidPath);
-                Debug.Log($"写入:{e.androidPath} ");
+                throw new Exception($"找不到{aar}");
             }
 
-            File.Copy(xmlUnity, xmlAndroid, true);
-            Debug.Log($"复制:{xmlUnity}-->{xmlAndroid} ");
-
-            var xmlPath = GetUnityLibraryAndroidManifestXml();
-            var xml = File.ReadAllText(xmlPath);
-            xml = xml.Replace("<intent-filter>", "");
-            xml = xml.Replace("<action android:name=\"android.intent.action.MAIN\" />", "");
-            xml = xml.Replace("<category android:name=\"android.intent.category.LAUNCHER\" />", "");
-            xml = xml.Replace("</intent-filter>", "");
-            File.WriteAllText(xmlPath, xml);
-            Debug.Log($"写入:{xmlPath}");
+            //复制aar到指定目录
+            var to = @$"{Setting.AndroidPublishProj}\proj\unionsdk\libs\{Path.GetFileName(aar)}";
+            Debug.Log($"复制{aar}->{to}");
+            File.Copy(aar, to, true);
         }
 
         /*写入icon*/

package/Editor/VariablePreset.cs

@@ -10,7 +10,7 @@ namespace TyphoonUnitySDK
     /// 变量预设
     /// 用于自定义工具内的变量名
     /// </summary>
-    public class VariablePreset : ScriptableObject
+    public class VariablePreset : ScriptableObject, ISaveConfigPipeline
     {
         private static string ConfigPath = "Assets/Typhoon_Gen/TyphoonSDK/Editor/VariablePreset.asset";
 
@@ -148,7 +148,6 @@ namespace TyphoonUnitySDK
             {
                 Presets[index].VariableValue = value;
             }
-
         }
 
         public void Save()
@@ -156,5 +155,10 @@ namespace TyphoonUnitySDK
             EditorUtility.SetDirty(this);
             AssetDatabase.SaveAssets();
         }
+
+        public void SaveConfig()
+        {
+            Save();
+        }
     }
 }

package/Editor/VivoMiniConfig.cs

@@ -429,7 +429,7 @@ namespace TyphoonUnitySDK
     /// <summary>
     /// vivo mini 参数
     /// </summary>
-    public class VivoMiniConfig : ScriptableObject
+    public class VivoMiniConfig : ScriptableObject, ISaveConfigPipeline
     {
         private static string ConfigPath = "Assets/Typhoon_Gen/TyphoonSDK/Editor/VivoMiniConfig.asset";
 
@@ -500,5 +500,10 @@ namespace TyphoonUnitySDK
             EditorUtility.SetDirty(this);
             AssetDatabase.SaveAssets();
         }
+
+        public void SaveConfig()
+        {
+            Save();
+        }
     }
 }

package/Editor/WxMiniConfig.cs

@@ -206,7 +206,7 @@ namespace TyphoonUnitySDK
     /// <summary>
     /// 微信小游戏配置
     /// </summary>
-    public class WxMiniConfig : ScriptableObject
+    public class WxMiniConfig : ScriptableObject, ISaveConfigPipeline
     {
         private static string ConfigPath = "Assets/Typhoon_Gen/TyphoonSDK/Editor/WxMiniConfig.asset";
 
@@ -273,5 +273,10 @@ namespace TyphoonUnitySDK
             EditorUtility.SetDirty(this);
             AssetDatabase.SaveAssets();
         }
+
+        public void SaveConfig()
+        {
+            Save();
+        }
     }
 }

package/Runtime/BaseSdk.cs

@@ -265,5 +265,20 @@ namespace TyphoonUnitySDK
         }
 
         #endregion
+
+        #region 退出挽留
+
+        public virtual bool IsSupportQuitWithKeep()
+        {
+            SdkDebug.Log($"[BaseSdk] IsSupportQuitWithKeep 默认不支持,返回false！");
+            return false;
+        }
+
+        public virtual void QuitWithKeep()
+        {
+            SdkDebug.Log($"[BaseSdk] QuitWithKeep 空实现！");
+        }
+
+        #endregion
     }
 }

package/Runtime/Interface.cs

@@ -7,7 +7,7 @@ namespace TyphoonUnitySDK
     /// SDK全功能接口
     /// </summary>
     public interface ISdk : IOnCreate, IInitSdk, ILogin, IExitGame, IBannerAD, IVideoAD, IIntersAD, IFloatIconAD,
-        INativeAD, IRecordGame, IHttpGet, IHttpPost, ISideBarReturn, IShowToast,ITrack
+        INativeAD, IRecordGame, IHttpGet, IHttpPost, ISideBarReturn, IShowToast, ITrack,IQuitGameWithKeep
     {
     }
 
@@ -211,4 +211,18 @@ namespace TyphoonUnitySDK
     }
 
     #endregion
+
+
+    #region 退出挽留
+
+    public interface IQuitGameWithKeep
+    {
+        //是否支持
+        bool IsSupportQuitWithKeep();
+
+        //退出游戏
+        void QuitWithKeep();
+    }
+
+    #endregion
 }

package/Runtime/SdkLite.cs

@@ -219,7 +219,7 @@ namespace TyphoonUnitySDK
         public bool IsSupportExitGame()
         {
 #if UNITY_EDITOR
-            return SdkTestInUnity.Instance.IsSupportExitGame;
+            return SdkTestInUnity.Instance.IsSupportQuitWithKeep;
 #endif
             return _sdk.IsSupportExitGame();
         }
@@ -241,6 +241,33 @@ namespace TyphoonUnitySDK
 
         #endregion
 
+        #region 退出挽留
+
+        /// <summary>
+        /// 是否支持退出挽留
+        /// </summary>
+        public bool IsSupportQuitWithKeep()
+        {
+#if UNITY_EDITOR
+            return SdkTestInUnity.Instance.IsSupportQuitWithKeep;
+#endif
+            return _sdk.IsSupportQuitWithKeep();
+        }
+
+        /// <summary>
+        /// 退出挽留
+        /// </summary>
+        public void QuitWithKeep()
+        {
+            Log("QuitWithKeep");
+#if UNITY_EDITOR
+            return;
+#endif
+            _sdk.QuitWithKeep();
+        }
+
+        #endregion
+
         #region 日志
 
         private void Log(string log)

package/Runtime/SdkTestInUnity.cs

@@ -1,6 +1,7 @@
 using System.IO;
 using TyphoonUnitySDK;
 using UnityEngine;
+using UnityEngine.Serialization;
 #if UNITY_EDITOR
 using UnityEditor;
 #endif
@@ -10,7 +11,7 @@ public class SdkTestInUnity : ScriptableObject
     private const string ASSET_PATH = "Assets/Typhoon_Gen/TyphoonSDK/Editor/SdkTestInUnity.asset";
 
     [LabelOverride("登录回调")] public bool LoginResult = true;
-    [LabelOverride("是否支持ExitGame")] public bool IsSupportExitGame = true;
+    [LabelOverride("是否支持退出挽留")] public bool IsSupportQuitWithKeep = true;
     [LabelOverride("开启广告交互式测试")] public bool OpenInteractive = true;
     [LabelOverride("广告交互式悬停关闭时间")] public float InteractiveHoldCloseTime = 1.2f;
     [LabelOverride("视频广告flag")] public bool GetVideoFlagResult = true;

package/Runtime/TyphoonSdkCallback.cs

@@ -34,21 +34,21 @@ namespace TyphoonUnitySDK
             SessionItem.Invoke(sessionId, data);
         }
 
-        public void Update()
-        {
-            switch (AppConfig.Channel)
-            {
-                case AppChannel.ChinaAndroid:
-                    if (Input.GetKeyDown(KeyCode.Escape))
-                    {
-                        if (SdkLite.Instance.IsSupportExitGame())
-                        {
-                            SdkLite.Instance.ExitGame();
-                        }
-                    }
-
-                    break;
-            }
-        }
+        // public void Update()
+        // {
+        //     switch (AppConfig.Channel)
+        //     {
+        //         case AppChannel.ChinaAndroid:
+        //             if (Input.GetKeyDown(KeyCode.Escape))
+        //             {
+        //                 if (SdkLite.Instance.IsSupportQuitWithKeep())
+        //                 {
+        //                     SdkLite.Instance.QuitWithKeep();
+        //                 }
+        //             }
+        //
+        //             break;
+        //     }
+        // }
     }
 }

package/Sources~/Package/ChinaAndroid.unitypackage.manifest

@@ -1,6 +1,4 @@
-Assets/Plugins/Android/libs/sdk_plug-release.aar
-Assets/Plugins/Android/libs/unity_app-release.aar
-Assets/Plugins/Android/libs/unity_launcher-release.aar
+Assets/Plugins/Android/libs/lib-union-sdk.aar
 Assets/Plugins/Android/AndroidManifest.xml
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid
 Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid/ChinaAndroidSdk.cs

package/package.json

@@ -1 +1 @@
-{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.0.93","description":"","unity":"2018.1","type":"tool","hideInEditor":false,"author":{"name":"Jan Zhang","email":"","url":""},"changelogUrl":"","documentationUrl":"","keywords":["typhoon"],"license":"","licensesUrl":"","customDependencies":[{"PackageName":"com.unity.nuget.newtonsoft-json","Value":"2.0.0"}],"version_log":"## [1.0.93] - 2024-01-23\r\n\r\n### 修复\n* 抖音快捷发布GUIbug\r\n\r\n","major_flag":false,"write_time_stamp":1706020228000,"others":{"items":[]},"dependencies":{"com.unity.nuget.newtonsoft-json":"2.0.0"}}
+{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.0.95","description":"","unity":"2018.1","type":"tool","hideInEditor":false,"author":{"name":"Jan Zhang","email":"","url":""},"changelogUrl":"","documentationUrl":"","keywords":["typhoon"],"license":"","licensesUrl":"","customDependencies":[{"PackageName":"com.unity.nuget.newtonsoft-json","Value":"2.0.0"}],"version_log":"## [1.0.94] - 2024-01-25\r\n\r\n### 新增\n* 更新vivo app sdk\r\n\r\n","major_flag":false,"write_time_stamp":1706850595000,"others":{"items":[]},"dependencies":{"com.unity.nuget.newtonsoft-json":"2.0.0"}}