From 0940f31b7eba1cf6b6a8c1fca72d97cf686e79f2 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期五, 04 七月 2025 10:43:00 +0800
Subject: [PATCH] 优化插件，完善TreeListView
---
HMI.Base/PluginLoader.cs | 156 ++++++++++++++++++++++++++++-----------------------
1 files changed, 86 insertions(+), 70 deletions(-)
diff --git a/HMI.Base/PluginLoader.cs b/HMI.Base/PluginLoader.cs
index fc082bd..e63503a 100644
--- a/HMI.Base/PluginLoader.cs
+++ b/HMI.Base/PluginLoader.cs
@@ -8,15 +8,27 @@
using System.IO;
using System.Reflection;
using System.Threading;
-using System.Threading.Tasks;
using System.Windows;
-using System.Windows.Media.Imaging;
using System.Windows.Threading;
namespace HMI.Base
{
+ public enum LoadMsgType
+ {
+ INIT, LOADING, FINISHED
+ }
+
+ public class LoadMsg
+ {
+ public string Message { get; set; }
+ public bool? Result { get; set; }
+ public LoadMsgType Type { get; set; }
+ public int NumData { get; set; }
+ }
+
public class PluginLoader
{
+ private static ILog log = LogManager.GetLogger("PluginLoader");
private static string PluginFolder = PathHelper.PluginFolder();
public bool Completed { get; private set; } = false;
@@ -25,12 +37,19 @@
public List<PluginInfo> Plugins { get; private set; }
public static PluginLoader Instance { get; private set; }
- public event EventHandler<string> LoadMessageAppend;
- public event EventHandler Loaded;
+ public event EventHandler<LoadMsg> LoadMessageAppend;
private PluginLoader()
{
sqliteHelper = new SqliteHelper(PathHelper.DatabasePath);
+ }
+
+ public static void Reset()
+ {
+ if (Instance != null)
+ {
+ Instance = null;
+ }
}
public static PluginLoader GetLoader()
@@ -42,54 +61,20 @@
return Instance;
}
- public void LoadMenuAndPlugin(Dispatcher dispatcher)
+ private IPluginContainer pluginContainer;
+
+ public void LoadMenuAndPlugin(IPluginContainer container, Dispatcher dispatcher)
{
+ pluginContainer = container;
if (Menus == null)
{
Plugins = new List<PluginInfo>();
Menus = LoadTreeMenu(dispatcher);
- Loaded?.Invoke(this, null);
- }
- }
-
- private void LoadChildrenMenu(PluginInfo menu, Dispatcher dispatcher)
- {
- LoadMessageAppend?.Invoke(this, $"姝ｅ湪鍔犺浇{menu.Name}鑿滃崟...");
- try
- {
- Application.Current.Dispatcher.Invoke(() =>
+ sqliteHelper.Close();
+ dispatcher.Invoke(() =>
{
- if (!string.IsNullOrEmpty(menu.DllPath))
- {
- string dllPath = Path.Combine(PluginFolder, menu.DllPath);
- Assembly ass = Assembly.LoadFrom(dllPath);
- Type ClassType = ass.GetType(menu.ClassName);
- object Instance = Activator.CreateInstance(ClassType);
- menu.Content = Instance;
- if (Instance is IPlugin plugin)
- {
- plugin.SetLogger(LogManager.GetLogger(menu.Code));
- string configFolder = Path.Combine(PathHelper.ConfigFolder, menu.Code);
- if (!Directory.Exists(configFolder))
- {
- Directory.CreateDirectory(configFolder);
- }
- plugin.SetBaseFolder(configFolder);
- plugin.InitFinish();
- }
- Type SettingType = ass.GetType($"{menu.ClassName}_Setting");
- if (SettingType != null)
- {
- object SettingInstance = Activator.CreateInstance(SettingType);
- menu.SettingControl = SettingInstance;
- }
- }
+ LoadMessageAppend?.Invoke(this, new LoadMsg { Type = LoadMsgType.FINISHED });
});
- Thread.Sleep(100);
- }
- catch (Exception ex)
- {
- LoadMessageAppend?.Invoke(this, $"{ex.Message} {ex.StackTrace}");
}
}
@@ -98,47 +83,71 @@
foreach (var menu in Plugins)
{
CountdownEvent c = new CountdownEvent(1);
- Thread.Sleep(10);
+ Thread.Sleep(80);
Application.Current.Dispatcher.Invoke(new Action(() =>
{
-
try
{
- LoadMessageAppend?.Invoke(this, $"姝ｅ湪鍔犺浇{menu.Name}鑿滃崟...");
+ LoadMessageAppend?.Invoke(this,
+ new LoadMsg
+ {
+ Type = LoadMsgType.LOADING,
+ Message = this.lang("App.IsLoadingMenu", menu.Name)
+ }
+ );
if (!string.IsNullOrEmpty(menu.DllPath))
{
string dllPath = Path.Combine(PluginFolder, menu.DllPath);
Assembly ass = Assembly.LoadFrom(dllPath);
+ var tss = ass.GetTypes();
Type ClassType = ass.GetType(menu.ClassName);
object Instance = Activator.CreateInstance(ClassType);
menu.Content = Instance;
if (Instance is IPlugin plugin)
{
- plugin.SetLogger(LogManager.GetLogger(menu.Code));
- string configFolder = Path.Combine(PathHelper.ConfigFolder, menu.Code);
- if (!Directory.Exists(configFolder))
+ }
+ else
+ {
+ plugin = new PluginPackage(Instance);
+ }
+ plugin.SetLogger(LogManager.GetLogger(menu.Code));
+ string configFolder = Path.Combine(PathHelper.ConfigFolder, menu.Code);
+ if (!Directory.Exists(configFolder))
+ {
+ Directory.CreateDirectory(configFolder);
+ }
+ plugin.SetBaseFolder(configFolder);
+ plugin.InitFinish();
+ pluginContainer.OnCloseEvent += plugin.OnClose;
+ pluginContainer.DoCloseEvent += plugin.DoClose;
+ Type SettingType = ass.GetType($"{menu.ClassName}_Setting");
+ if (SettingType != null)
+ {
+ object SettingInstance = Activator.CreateInstance(SettingType);
+ if (SettingInstance is IFolderOwner fo)
{
- Directory.CreateDirectory(configFolder);
+ fo.SetBaseFolder(configFolder);
}
- plugin.SetBaseFolder(configFolder);
- plugin.InitFinish();
- Type SettingType = ass.GetType($"{menu.ClassName}_Setting");
- if (SettingType != null)
- {
- object SettingInstance = Activator.CreateInstance(SettingType);
- if (SettingInstance is IFolderOwner fo)
- {
- fo.SetBaseFolder(configFolder);
- }
- menu.SettingControl = SettingInstance;
- }
+ menu.SettingControl = SettingInstance;
}
}
- LoadMessageAppend?.Invoke(this, $"鍔犺浇瀹�");
+ LoadMessageAppend?.Invoke(this,
+ new LoadMsg
+ {
+ Type = LoadMsgType.LOADING,
+ Result = true,
+ Message = this.lang("App.MenuLoadSuccess", menu.Name),
+ });
}
catch (Exception ex)
{
- LoadMessageAppend?.Invoke(this, $"{ex.Message} {ex.StackTrace}");
+ log.Error($"Load Plugin [{menu.Name}] Failed.", ex);
+ LoadMessageAppend?.Invoke(this, new LoadMsg
+ {
+ Type = LoadMsgType.LOADING,
+ Result = false,
+ Message = this.lang("App.MenuLoadFailed", menu.Name, ex.Message, ex.StackTrace)
+ });
}
finally
{
@@ -157,17 +166,24 @@
try
{
UserInfo user = UserInfo.User;
- string sql = $@"SELECT m.* FROM menu AS m INNER JOIN role_menu_rel AS rrel ON m.code = rrel.menuCode
+ string sql = $@"SELECT DISTINCT m.* FROM menu AS m INNER JOIN role_menu_rel AS rrel ON m.code = rrel.menuCode
INNER JOIN role AS r ON rrel.roleCode = r.code
INNER JOIN user_role_rel AS urel ON r.code = urel.roleCode
-AND urel.username = '{user.Username}' ORDER BY m.level, m.id;";
+AND urel.username = '{user.Username}' ORDER BY m.level,m.sort, m.id;";
DataTable dt = sqliteHelper.GetDataTable(sql);
if (dt != null)
{
- //LoadMessageAppend?.Invoke(this, $"鍏辨湁{dt.Rows.Count}鏉¤彍鍗曞緟鍔犺浇...");
Application.Current.Dispatcher.Invoke(() =>
{
+ LoadMessageAppend?.Invoke(this,
+ new LoadMsg
+ {
+ Type = LoadMsgType.INIT,
+ NumData = dt.Rows.Count,
+ Message = this.lang("App.MenuCount", dt.Rows.Count),
+ });
+
foreach (DataRow dr in dt.Rows)
{
string path = Path.Combine(PathHelper.IconFolder, dr["iconPath"].ToString());
@@ -175,6 +191,7 @@
{
Code = dr["code"].ToString(),
Name = dr["name"].ToString(),
+ Type = dr["type"].ToString(),
ParentCode = dr["parentCode"].ToString(),
DllPath = dr["dllPath"].ToString(),
ClassName = dr["className"].ToString(),
@@ -202,6 +219,5 @@
}
return data;
}
-
}
}
--
Gitblit v1.9.1