perf: 优化 dll 更新时，多次重载的bug

uyoufu · Feb 23, 2024 · 5d10db7 · 5d10db7
1 parent b37f282
commit 5d10db7
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 14 deletions.
diff --git a/MSAddinTest/Core/FuncResult.cs b/MSAddinTest/Core/FuncResult.cs
@@ -50,5 +50,11 @@ public FuncResult(bool ok,string message):this(ok)
         /// 数据
         /// </summary>
         public object Data { get; set; }
+
+        // 与 bool 类型的隐式转换
+        public static implicit operator bool(FuncResult result)
+        {
+            return result.Ok;
+        }
     }
 }
diff --git a/MSAddinTest/Core/Loader/AutoReloader.cs b/MSAddinTest/Core/Loader/AutoReloader.cs
@@ -1,10 +1,12 @@
 using Bentley.MstnPlatformNET;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Timers;
 using System.Windows;
 
 namespace MSAddinTest.Core.Loader
@@ -16,6 +18,11 @@ internal class AutoReloader
     {
         private readonly FileSystemWatcher _watcher;
         private readonly PluginAssemblyLoader _assemblyLoader;
+        private readonly Timer _reloadTimer = new Timer(1000)
+        {
+            Enabled = false,
+            AutoReset = true
+        };
 
         public AutoReloader(PluginAssemblyLoader assemblyLoader)
         {
@@ -27,6 +34,7 @@ public AutoReloader(PluginAssemblyLoader assemblyLoader)
                 NotifyFilter = NotifyFilters.LastWrite
             };
             _watcher.Changed += Watcher_Changed;
+            _reloadTimer.Elapsed += ReloadTimer_Elapsed;
 
             // 从设置中获取是否自动重载
             var setting = _assemblyLoader.Setup.PluginSetting;
@@ -35,26 +43,38 @@ public AutoReloader(PluginAssemblyLoader assemblyLoader)
             // 监听数据变化
             setting.SettingChanged += (arg) =>
             {
-                if(arg.FieldName == "autoReload" && bool.TryParse(arg.Value,out bool result))
+                if (arg.FieldName == "autoReload" && bool.TryParse(arg.Value, out bool result))
                 {
                     _watcher.EnableRaisingEvents = result;
                 }
             };
-           
-        }
+
+        }       
 
         private void Watcher_Changed(object sender, FileSystemEventArgs e)
-        {           
-            // 判断是否是当前文件
-            if (e.FullPath != _assemblyLoader.Setup.DllFullPath) return;
+        {
+            // 只有当前文件才触发
+            if (e.FullPath != _assemblyLoader.Setup.DllFullPath)
+            {
+                return;
+            }
 
+            // 多次触发时，重置计时器
+            _reloadTimer.Stop();
+            _reloadTimer.Start();
+        }
+
+        private void ReloadTimer_Elapsed(object sender, ElapsedEventArgs e)
+        {
+            _reloadTimer.Stop();
             // 事件是在另一个线程触发的，直接重载会报错
             // 切换到主线程执行
             Application.Current.Dispatcher.Invoke(() =>
             {
                 // 文件更改后，需要重新加载
                 _assemblyLoader.Reload();
-            });           
+
+            });
         }
     }
 }
diff --git a/MSAddinTest/Core/Loader/PluginAssemblyLoader_Events.cs b/MSAddinTest/Core/Loader/PluginAssemblyLoader_Events.cs
@@ -42,15 +42,16 @@ private Assembly AppDomain_TypeResolve(object sender, ResolveEventArgs args)
 
         private Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
         {
-            // 获取对应版本的程序集
+            // 获取最新版本的程序集
             var assemblies = AppDomain.CurrentDomain.GetAssemblies();
-            Assembly targetAssembly = assemblies.LastOrDefault(x => x.FullName.Contains(args.Name));
+            string assemblyName = args.Name.Split(',')[0].Trim();
+            Assembly targetAssembly = assemblies.LastOrDefault(x => x.FullName.Contains(assemblyName));
 
             if (targetAssembly != null) return targetAssembly;
 
-            // 找到文件，然后加载
-            string targetFileName = args.Name.Split(',')[0];
-            string fileName = _allFileNames.Find(x => x.Contains(targetFileName));
+            // 找到文件，然后加载            
+            string assemblyFileName = $"{assemblyName}.dll";
+            string fileName = _allFileNames.Find(x => x.EndsWith(assemblyFileName));
             if (fileName == null) return null;
 
             byte[] bytes = File.ReadAllBytes(fileName);

diff --git a/MSAddinTest/Core/Loader/PluginAssemblyLoader_Methods.cs b/MSAddinTest/Core/Loader/PluginAssemblyLoader_Methods.cs
@@ -1,4 +1,5 @@
-using MSAddinTest.MSTestInterface;
+using Bentley.MstnPlatformNET;
+using MSAddinTest.MSTestInterface;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -45,7 +46,12 @@ public FuncResult Execute(string nameWithParams)
         /// </summary>
         public void Reload()
         {
-            LoadAssembly();
+            var reloadResult = LoadAssembly();
+            if (reloadResult)
+            {
+                // 提示成功               
+                MessageCenter.Instance.ShowInfoMessage($"{Setup.PluginName} 插件重载成功!", "", false);
+            }
         }
     }
 }