com.typhoon.unitysdk 1.0.15 → 1.0.17

package/Editor/ApplyTool.cs

@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using UnityEditor;
+using UnityEditor.VersionControl;
 using UnityEngine;
 
 namespace TyphoonUnitySDK
@@ -35,6 +36,8 @@ namespace TyphoonUnitySDK
             var done = SwitchPlatformTo(setting.BuildTarget);
             if (done)
             {
+                //写入apply 历史
+                UniEditor.WriteApplyHistory(setting);
                 //修改参数
                 switch (setting.BuildTarget)
                 {

package/Editor/PublishVivoBatSettingInspector.cs

@@ -456,35 +456,34 @@ dependencies {{
         /*写入untiylibrary.xml*/
         private void WriteUnityLibrary()
         {
-            var path = GetUnityLibrary();
+            var android = GetUnityLibrary();
             var unityProj = GetMatchChinaAndroidProj();
             if (unityProj == null)
             {
                 throw new Exception($"找不到unity导出工程");
             }
 
-            var from = $"{unityProj}/unityLibrary";
-            var to = $"{path}";
-            var map = new (string from, string to)[]
+            var unityLib = $"{unityProj}/unityLibrary";
+            var map = new (string androidPath, string unityPath)[]
             {
                 //{unityProj}\unityLibrary
-                ($"{from}/libs", $"{to}/libs"),
-                ($"{from}/src/main/assets", $"{to}/src/main/assets"),
-                ($"{from}/src/main/java", $"{to}/src/main/java"),
-                ($"{from}/src/main/jniLibs", $"{to}/src/main/jniLibs"),
+                ($"{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"),
             };
 
-            var xmlPathForm = $"{from}/src/main/AndroidManifest.xml";
-            var xmlTo = $"{to}/src/main/AndroidManifest.xml";
+            var xmlAndroid = $"{android}/src/main/AndroidManifest.xml";
+            var xmlUnity = $"{unityLib}/src/main/AndroidManifest.xml";
             foreach (var e in map)
             {
-                UniEditor.TryDeleteFolder(e.from);
-                UniEditor.CopyFolder(e.from, e.to);
-                Debug.Log($"写入:{e.to} ");
+                UniEditor.TryDeleteFolder(e.androidPath);
+                UniEditor.CopyFolder(e.unityPath, e.androidPath);
+                Debug.Log($"写入:{e.androidPath} ");
             }
 
-            File.Copy(xmlPathForm, xmlTo, true);
-            Debug.Log($"复制:{xmlTo} ");
+            File.Copy(xmlUnity, xmlAndroid, true);
+            Debug.Log($"复制:{xmlUnity}-->{xmlAndroid} ");
 
             var xmlPath = GetUnityLibraryAndroidManifestXml();
             var xml = File.ReadAllText(xmlPath);

package/Editor/PublishWindow.cs

@@ -74,11 +74,21 @@ namespace TyphoonUnitySDK
         private void OnEnable()
         {
             ReloadSettings();
+            if (UniEditor.TryGetApplyHistory(out var match))
+            {
+                foreach (var setting in PublishSettings)
+                {
+                    if (setting.name == match)
+                    {
+                        _select = setting;
+                        break;
+                    }
+                }
+            }
         }
 
-        protected  void OnGUI()
+        protected void OnGUI()
         {
-            
             var temEnable = GUI.enabled;
             if (EditorApplication.isPlaying)
             {
@@ -122,24 +132,26 @@ namespace TyphoonUnitySDK
             rectToolbar.height = 22;
             GUILayout.BeginArea(rectToolbar);
             GUILayout.BeginHorizontal();
-            GUILayout.Label("发布配置", Styles.rbold_label,GUILayout.Width(110));
+            GUILayout.Label("发布配置", Styles.rbold_label, GUILayout.Width(110));
             GUILayout.Space(1);
             if (GUILayout.Button(new GUIContent(EditorIcons.icon_import, "导入常用配置"), Styles.rbutton,
-                    GUILayout.Width(40),GUILayout.Height(20)))
+                    GUILayout.Width(40), GUILayout.Height(20)))
             {
                 UniEditor.ImportPackage(UniEditor.PackagePath_PublishSetting);
             }
+
             GUILayout.Space(1);
             if (GUILayout.Button(new GUIContent(EditorIcons.icon_refresh, "刷新"), Styles.rbutton,
-                    GUILayout.Width(40),GUILayout.Height(20)))
+                    GUILayout.Width(40), GUILayout.Height(20)))
             {
                 ReloadSettings();
                 Repaint();
             }
+
             GUILayout.Space(1);
 
             if (GUILayout.Button(new GUIContent(EditorIcons.icon_extension, "更多"), Styles.rbutton,
-                    GUILayout.Width(40),GUILayout.Height(20)))
+                    GUILayout.Width(40), GUILayout.Height(20)))
             {
                 var menu = new GenericMenu();
                 menu.AddItem(new GUIContent("导入常用配置"), false,
@@ -153,13 +165,14 @@ namespace TyphoonUnitySDK
             rectSearch.y = rectToolbar.yMax;
             rectSearch.height = 22;
             InputTxtSearchSetting = GUI.TextField(rectSearch, InputTxtSearchSetting);
-            if(string.IsNullOrEmpty(InputTxtSearchSetting)){
-                GUI.Label(rectSearch,"搜索...",Styles.rlabel_italic);
+            if (string.IsNullOrEmpty(InputTxtSearchSetting))
+            {
+                GUI.Label(rectSearch, "搜索...", Styles.rlabel_italic);
             }
 
             /*绘制菜单栏*/
             var rectPos = rectLeftMenu;
-            rectPos.y = rectSearch.yMax+4;
+            rectPos.y = rectSearch.yMax + 4;
             rectPos.height = rectLeftMenu.yMax - rectPos.y;
             GUILayout.BeginArea(rectPos);
             rectPos.x = 0;
@@ -206,7 +219,7 @@ namespace TyphoonUnitySDK
                         var lockRect = rectItem;
                         lockRect.width = 60;
                         lockRect.x = rectItem.xMax - lockRect.width;
-                        GUI.Label(lockRect,"未开放",Styles.rlabel_italic);
+                        GUI.Label(lockRect, "未开放", Styles.rlabel_italic);
                     }
                 }
 
@@ -241,7 +254,7 @@ namespace TyphoonUnitySDK
             rectContent.height -= 8;
             rectContent.width -= 8;
             rectContent.center = rect.center;
-          
+
             if (_select == null)
             {
                 var tipRect = rectContent;
@@ -370,5 +383,6 @@ namespace TyphoonUnitySDK
 
             PublishSettings = hash;
         }
+        
     }
 }

package/Editor/UniEditor.cs

@@ -27,6 +27,11 @@ namespace TyphoonUnitySDK
         /// </summary>
         public static readonly string DEFINE_TYPHOON_ADDRESSABLE_NAME = "TYPHOON_ADDRESSABLE";
 
+        /// <summary>
+        /// apply历史记录
+        /// </summary>
+        public static readonly string APPLY_HISTORY = "Temp/typhoon_apply_history.txt";
+
 
         /// <summary>
         /// 插件包根目录
@@ -447,5 +452,35 @@ namespace TyphoonUnitySDK
             return !string.IsNullOrEmpty(Preferences.Default.GradlePath) &&
                    File.Exists($"{Preferences.Default.GradlePath}/gradle");
         }
+
+
+        /// <summary>
+        /// 尝试获取apply历史记录
+        /// </summary>
+        public static bool TryGetApplyHistory(out string match)
+        {
+            match = default;
+            if (File.Exists(APPLY_HISTORY))
+            {
+                match = File.ReadAllText(APPLY_HISTORY);
+                return true;
+            }
+
+            return false;
+        }
+
+        /// <summary>
+        /// 写入apply历史记录
+        /// </summary>
+        public static void WriteApplyHistory(PublishSetting setting)
+        {
+            var dir = Path.GetDirectoryName(APPLY_HISTORY);
+            if (!Directory.Exists(dir))
+            {
+                Directory.CreateDirectory(dir);
+            }
+
+            File.WriteAllText(APPLY_HISTORY, setting.name);
+        }
     }
 }

package/package.json

@@ -1 +1 @@
-{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.0.15","description":"unity端个汇总渠道的sdk,统一接口,一键发布","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"}],"dependencies":{"com.unity.nuget.newtonsoft-json":"2.0.0"}}
+{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.0.17","description":"unity端个汇总渠道的sdk,统一接口,一键发布","unity":"2017.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"}],"dependencies":{"com.unity.nuget.newtonsoft-json":"2.0.0"}}