From 559890c482f5973f06aafdfec9550fee5ba3c7f2 Mon Sep 17 00:00:00 2001
From: wenxiangchao <wenxiangchao@ihengxin.com.cn>
Date: 星期一, 09 十一月 2026 17:02:15 +0800
Subject: [PATCH] feat: CAN 模拟器 TCP 化 + 多设备并发调试 + 后台生命周期管理
---
WPFProject/PanuonWindow.xaml.cs | 244 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 217 insertions(+), 27 deletions(-)
diff --git a/WPFProject/PanuonWindow.xaml.cs b/WPFProject/PanuonWindow.xaml.cs
index d8b4ffe..7dceeff 100644
--- a/WPFProject/PanuonWindow.xaml.cs
+++ b/WPFProject/PanuonWindow.xaml.cs
@@ -4,24 +4,42 @@
using HMI.Core.Setting;
using HMI.Core.Util;
using HMI.UI.Util;
+using HMI.Util.Alarm;
+using log4net;
using Panuon.WPF.UI;
using System;
+using System.Collections.ObjectModel;
using System.ComponentModel;
using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media.Imaging;
namespace WPFProject
{
+ public class SimpleAlarm
+ {
+ public string Id { get; set; }
+ public string Time { get; set; }
+ public string Message { get; set; }
+ public override string ToString()
+ {
+ return $"{Time} {Message}";
+ }
+ }
+
/// <summary>
/// PanuonWindow.xaml 鐨勪氦浜掗�昏緫
/// </summary>
- public partial class PanuonWindow : WindowX, IPluginContainer
+ public partial class PanuonWindow : WindowX, IPluginContainer, IAlarmShow
{
+ private ILog log = LogManager.GetLogger("MainWindow");
public PanuonWindow()
{
this.Loaded += PanuonWindow_Loaded;
+ SoftwareVersion = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
}
private UserInfo currentUser;
@@ -34,15 +52,83 @@
}
}
+ private string welcomeTitle;
+ public string WelcomeTitle
+ {
+ get => welcomeTitle;
+ set
+ {
+ Set(ref welcomeTitle, value);
+ }
+ }
+
+ private ObservableCollection<SimpleAlarm> alarms = new ObservableCollection<SimpleAlarm>();
+ public ObservableCollection<SimpleAlarm> Alarms
+ {
+ get => alarms;
+ set
+ {
+ Set(ref alarms, value);
+ }
+ }
+
+ public int AlarmCount
+ {
+ get => Alarms?.Count ?? 0;
+ }
+
+ private string softwareVersion;
+ public string SoftwareVersion
+ {
+ get => softwareVersion;
+ set
+ {
+ Set(ref softwareVersion, value);
+ }
+ }
+
+ private string pluginVersion;
+ public string PluginVersion
+ {
+ get => pluginVersion;
+ set
+ {
+ Set(ref pluginVersion, value);
+ }
+ }
+
+ public ListBox sb
+ {
+ get; set;
+ }
+
private void PanuonWindow_Loaded(object sender, RoutedEventArgs e)
{
- DataContext = this;
- RefrshConfig();
- InitializeComponent();
- userMenu.Header = this.lang("App.Welcome", UserInfo.User.Name);
- ShowMenu = true;
- Application.Current.MainWindow = this;
- SystemSetting.SystemSettingChanged += SystemSetting_SystemSettingChanged;
+ try
+ {
+ DataContext = this;
+ RefrshConfig();
+ InitializeComponent();
+ AlarmShowHelper.Register(this);
+
+ WelcomeTitle = this.lang("App.Welcome", UserInfo.User.Name);
+ ShowMenu = false;
+ Application.Current.MainWindow = this;
+ SystemSetting.SystemSettingChanged += SystemSetting_SystemSettingChanged;
+
+ if (Environment.Is64BitProcess)
+ {
+ Task.Run(() =>
+ {
+ ResourceListener.Instance.RefreshEvent += this.resourceUI.Refresh;
+ ResourceListener.Instance.Start();
+ });
+ }
+ }
+ catch (Exception ex)
+ {
+ log.Error("Window Loaded Error.", ex);
+ }
}
private void RefrshConfig()
@@ -91,18 +177,6 @@
}
}
-
- private void Button_Click_2(object sender, RoutedEventArgs e)
- {
- ShowMenu = !ShowMenu;
- //Button btn = (Button)sender;
- //double temp = btn.RenderTransform.Value.Determinant;
- //btn.RenderTransformOrigin = new Point(0.5, 0.5);
- //ScaleTransform verticalFlipTransform = new ScaleTransform(1, temp * -1);
- //btn.RenderTransform = verticalFlipTransform;
- //menuTab.ChangeItemVisibility();
- }
-
private void SystemSetting_SystemSettingChanged(object sender, SystemSetting e)
{
RefrshConfig();
@@ -121,8 +195,10 @@
}
private void MenuItem_Click(object sender, RoutedEventArgs e)
- {MenuItem mi = sender as MenuItem;
- switch (mi.Name) {
+ {
+ MenuItem mi = sender as MenuItem;
+ switch (mi.Name)
+ {
case "MiLogout":
Logout();
break;
@@ -134,20 +210,37 @@
}
}
+ private bool logoutAdded = false;
+
private void Logout()
{
if (MsgBoxHelper.WarnMessage(this, this.lang("App.MakeSureLogout")) == MessageBoxResult.OK)
{
string path = Path.Combine(PathHelper.DatabaseFolder, "user.bin");
- if (File.Exists(path)) {
+ if (File.Exists(path))
+ {
File.Delete(path);
}
this.Closed -= window_Closed;
+ if (!logoutAdded)
+ {
+ this.Closed += Logout_PanuonWindow_Closed;
+ logoutAdded = true;
+ }
this.Close();
- PluginLoader.Reset();
- Login login = new Login();
- login.Show();
}
+ }
+
+ private void Logout_PanuonWindow_Closed(object sender, EventArgs e)
+ {
+ AlarmUtil.Release();
+ PluginLoader.Reset();
+ UserInfo.Logout();
+ AlarmShowHelper.UnRegister(this);
+ Login login = new Login();
+ login.Show();
+ this.Closed -= Logout_PanuonWindow_Closed;
+ logoutAdded = false;
}
private void RestartApp()
@@ -166,7 +259,104 @@
private void window_Closed(object sender, EventArgs e)
{
- Application.Current.Shutdown();
+ try
+ {
+ ResourceListener.Instance.Stop();
+ AlarmUtil.Release();
+ PluginLoader.Reset();
+ UserInfo.Logout();
+ AlarmShowHelper.UnRegister(this);
+ }
+ catch (Exception ex)
+ {
+
+ }
+ Application.Current.Shutdown(0);
+ }
+
+ private void Button_Click(object sender, RoutedEventArgs e)
+ {
+ Button btn = sender as Button;
+ switch (btn.Name)
+ {
+ case "minBtn":
+ this.Minimize();
+ break;
+ case "maxBtn":
+ //var state = this.WindowState == WindowState.Maximized ? WindowState.Normal : WindowState.Maximized;
+ //SetCurrentValue(Window.WindowStateProperty, state);
+ if (this.WindowState == WindowState.Maximized)
+ {
+ this.Normalmize();
+ }
+ else
+ {
+ this.Maximize();
+ }
+ break;
+ case "closeBtn":
+ this.Closed -= Logout_PanuonWindow_Closed;
+ this.Close();
+ break;
+ case "BtnSwitchTheme":
+ ShowMenu = !ShowMenu;
+ //Button btn = (Button)sender;
+ //double temp = btn.RenderTransform.Value.Determinant;
+ //btn.RenderTransformOrigin = new Point(0.5, 0.5);
+ //ScaleTransform verticalFlipTransform = new ScaleTransform(1, temp * -1);
+ //btn.RenderTransform = verticalFlipTransform;
+ //menuTab.ChangeItemVisibility();
+ break;
+ default:
+ break;
+ }
+ }
+
+ public bool ShowAlarm(AlarmText alarm)
+ {
+ bool res = false;
+ Dispatcher.Invoke(() =>
+ {
+ if (Alarms.FirstOrDefault(e => e.Id == alarm.VirtualId) == null)
+ {
+ var data = new SimpleAlarm
+ {
+ Id = alarm.VirtualId,
+ Time = alarm.Time,
+ Message = alarm.AlarmInfo
+ };
+ Alarms.Add(data);
+ sb?.ScrollIntoView(data);
+ res = true;
+ }
+ });
+ return res;
+ }
+
+ private void list_Loaded(object sender, RoutedEventArgs e)
+ {
+ sb = sender as ListBox;
+ sb.Loaded -= list_Loaded;
+ }
+
+ private void Clear_AllAlarm_Click(object sender, RoutedEventArgs e)
+ {
+ Alarms?.Clear();
+ }
+
+ private void menuTab_TabChanged(object sender, Controls.TabChangedEventArg e)
+ {
+ Dispatcher.BeginInvoke(() =>
+ {
+ if (e.newValue == null)
+ {
+ PluginVersion = string.Empty;
+ }
+ else
+ {
+ PluginVersion = e.newValue.GetType().Assembly.GetName().Version.ToString();
+ }
+ }, System.Windows.Threading.DispatcherPriority.Normal);
}
//private void BaseWindow_Loaded(object sender, RoutedEventArgs e)
--
Gitblit v1.9.1