From 88d29fe2f256bec9f3a432f80b729bfa8853787d Mon Sep 17 00:00:00 2001
From: huyufei <yufei.hu@castbox.fm>
Date: Mon, 29 Jul 2024 19:06:12 +0800
Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=20=E6=9A=82=E6=97=B6=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=20UserProguard=20=E4=BF=AE=E5=A4=8D=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--story=1020956 --user=yufei.hu 【中台】【Android】构建插件 API 升级 34 验证 https://www.tapd.cn/33527076/s/1160300

Signed-off-by: huyufei <yufei.hu@castbox.fm>
---
 .../AND_POST_PROGUARD/UserProguardHelper.cs   | 114 ++++++++++++++----
 .../Plugins/IOS/Connectivity.framework.meta   |   2 +-
 2 files changed, 92 insertions(+), 24 deletions(-)

diff --git a/Editor/GuruBuildSuit/AND_POST_PROGUARD/UserProguardHelper.cs b/Editor/GuruBuildSuit/AND_POST_PROGUARD/UserProguardHelper.cs
index 1d5b186..dcefddb 100644
--- a/Editor/GuruBuildSuit/AND_POST_PROGUARD/UserProguardHelper.cs
+++ b/Editor/GuruBuildSuit/AND_POST_PROGUARD/UserProguardHelper.cs
@@ -1,3 +1,6 @@
+using System.Collections.Generic;
+using NUnit.Framework;
+
 #if UNITY_ANDROID
 namespace Guru
 {
@@ -13,7 +16,8 @@ namespace Guru
     /// Android混淆器内容填充
     /// 于应用构建前执行
     /// </summary>
-    public class UserProguardHelper: IPreprocessBuildWithReport
+    // public class UserProguardHelper: IPreprocessBuildWithReport
+    public class UserProguardHelper
     {
         public int callbackOrder { get; } = 0;
         public void OnPreprocessBuild(BuildReport report)
@@ -27,7 +31,6 @@ namespace Guru
             string proguardPath = $"{Application.dataPath}/Plugins/Android/proguard-user.txt";
             if (File.Exists(proguardPath))
             {
-                List<string> keeps = new List<string>();
                 DirectoryInfo dir = new DirectoryInfo(Application.dataPath);
                 string raw = File.ReadAllText(proguardPath);
                 
@@ -41,36 +44,40 @@ namespace Guru
                     }
                     
                     // Debug.Log($"--- Proguard Files: {files.Length}");
+                    
+                    ProguardItemBuilder builder = new ProguardItemBuilder();
 
-                    string[] lens = null;
-                    string l = "";
+                    var allItems = new List<ProguardItem>(30);
+                    
+                    string[] lines = null;
                     for (int i = 0; i < files.Count; i++)
                     {
-                        lens = File.ReadAllLines(files[i].FullName);
-                        foreach (var s in lens)
-                        {
-                            l = s.TrimStart();
-                            if(string.IsNullOrEmpty(l)) continue;
-                            if(raw.Contains(l)) continue;
-                            keeps.Add(l);
-                            Debug.Log($"--- ✏️ Apply: [ {l} ]");
-                        }
+                        lines = File.ReadAllLines(files[i].FullName);
+                        var items = builder.BuildItemsFormLines(lines);
+                        if(items != null && items.Count > 0) allItems.AddRange(items);
                     }
+                    
+                    
+                    List<string> finalLines = new List<string>(50);
+                    foreach (var item in allItems)
+                    {
+                        finalLines.AddRange(item.lines);
+                    }
+                    
+                    File.WriteAllLines(proguardPath, finalLines.ToArray());
+                    Debug.Log($"--- Update proguard-user.txt done! ☀️ ---");
                 }
-                
-                if (keeps.Count == 0) return; // 无注入文件则退出
-                
-                List<string> lines = File.ReadAllLines(proguardPath).ToList();
-                lines.Add("");
-                lines.AddRange(keeps);
-                
-                File.WriteAllLines(proguardPath, lines.ToArray());
-                Debug.Log($"--- Update proguard-user.txt done! ☀️ ---");
-                
             }
         }
+
         
         
+
+        
+
+
+
+
         [MenuItem("Tools/Android/Add proguard-user")]
         private static void EditorAddProguardUser()
         {
@@ -78,6 +85,67 @@ namespace Guru
         }
 
     }
+
+    internal class ProguardItemBuilder
+    {
+        
+        
+        
+        
+        
+        
+        public List<ProguardItem> BuildItemsFormLines(string[] lines)
+        {
+            List<ProguardItem> items = new List<ProguardItem>(30);
+
+            string line = "";
+            ProguardItem curItem = null;
+
+            for(int i =0; i < lines.Length; i++)
+            {
+                line = lines[i];
+                
+                if(string.IsNullOrEmpty(line)) continue;
+
+                if (curItem == null)
+                {
+                    curItem = new ProguardItem();
+                }
+
+                curItem.Append(line);
+                
+                if(line.Contains("}"))
+                {
+                    items.Add(curItem);
+                    curItem = null;
+                }
+            }
+            
+            return items;
+        } 
+    }
+
+
+    internal class ProguardItem
+    {
+        public List<string> lines = new List<string>();
+        public string key = "";
+
+        public void Append(string line)
+        {
+            if (string.IsNullOrEmpty(key) && 
+                line.StartsWith("-"))
+            {
+                key = line;
+            }
+
+            if (lines == null) lines = new List<string>(5);
+            lines.Add(line);
+        }
+
+    }
+
+
 }
 
 #endif
\ No newline at end of file
diff --git a/Runtime/GuruNetworkMonitor/Plugins/IOS/Connectivity.framework.meta b/Runtime/GuruNetworkMonitor/Plugins/IOS/Connectivity.framework.meta
index c082578..f5d2ced 100644
--- a/Runtime/GuruNetworkMonitor/Plugins/IOS/Connectivity.framework.meta
+++ b/Runtime/GuruNetworkMonitor/Plugins/IOS/Connectivity.framework.meta
@@ -71,7 +71,7 @@ PluginImporter:
     second:
       enabled: 1
       settings:
-        AddToEmbeddedBinaries: false
+        AddToEmbeddedBinaries: true
         CPU: AnyCPU
         CompileFlags: 
         FrameworkDependencies: