From 15bbd62b0b24b72c717ae91ab45348a2083ad04e Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期五, 10 十月 2025 08:58:18 +0800
Subject: [PATCH] 优化bug；
---
WPFProject/PanuonWindow.xaml.cs | 218 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 194 insertions(+), 24 deletions(-)
diff --git a/WPFProject/PanuonWindow.xaml.cs b/WPFProject/PanuonWindow.xaml.cs
index 0c162fe..f2026f0 100644
--- a/WPFProject/PanuonWindow.xaml.cs
+++ b/WPFProject/PanuonWindow.xaml.cs
@@ -1,28 +1,93 @@
-锘縰sing HMI.Core.Setting;
+锘縰sing HMI.Base;
+using HMI.Core.Api;
+using HMI.Core.Entity;
+using HMI.Core.Setting;
using HMI.Core.Util;
using HMI.UI.Util;
using Panuon.WPF.UI;
using System;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
using System.IO;
+using System.Linq;
using System.Windows;
using System.Windows.Controls;
-using System.Windows.Media;
using System.Windows.Media.Imaging;
-using WPFProject.Utils;
namespace WPFProject
{
+ public class SimpleAlarm
+ {
+ 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
+ public partial class PanuonWindow : WindowX, IPluginContainer,IAlarmShow
{
public PanuonWindow()
+ {
+ this.Loaded += PanuonWindow_Loaded;
+ }
+
+ private UserInfo currentUser;
+ public UserInfo CurrentUser
+ {
+ get => currentUser;
+ set
+ {
+ Set(ref currentUser, value);
+ }
+ }
+
+ 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;
+ }
+
+ public ListBox sb {
+ get;set;
+ }
+
+ private void PanuonWindow_Loaded(object sender, RoutedEventArgs e)
{
DataContext = this;
RefrshConfig();
InitializeComponent();
- ShowMenu = true;
+ AlarmShowHelper.Register(this);
+ var sb = WindowXCaption.GetHeaderTemplate(this);
+ //sb.FindName("list",this.Con);
+
+ WelcomeTitle = this.lang("App.Welcome", UserInfo.User.Name);
+ ShowMenu = false;
+ Application.Current.MainWindow = this;
+ SystemSetting.SystemSettingChanged += SystemSetting_SystemSettingChanged;
}
private void RefrshConfig()
@@ -57,36 +122,141 @@
private bool showMenu;
+ public event CancelEventHandler OnCloseEvent;
+ public event EventHandler DoCloseEvent;
+ public event EventHandler LoadComplateEvent;
+
public bool ShowMenu
{
get { return showMenu; }
- set {
+ set
+ {
Set(ref showMenu, value);
menuTab.ChangeItemVisibility(value);
}
}
-
- 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 window_Loaded(object sender, RoutedEventArgs e)
- {
- SystemSetting.SystemSettingChanged += SystemSetting_SystemSettingChanged;
- }
-
private void SystemSetting_SystemSettingChanged(object sender, SystemSetting e)
{
RefrshConfig();
- LangUtil.LoadLang();
+ }
+
+ protected override void OnClosing(CancelEventArgs e)
+ {
+ OnCloseEvent?.Invoke(this, e);
+ base.OnClosing(e);
+ }
+
+ protected override void OnClosed(EventArgs e)
+ {
+ DoCloseEvent?.Invoke(this, e);
+ base.OnClosed(e);
+ }
+
+ private void MenuItem_Click(object sender, RoutedEventArgs e)
+ {
+ MenuItem mi = sender as MenuItem;
+ switch (mi.Name)
+ {
+ case "MiLogout":
+ Logout();
+ break;
+ case "MiRestart":
+ RestartApp();
+ break;
+ default:
+ break;
+ }
+ }
+
+ 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))
+ {
+ File.Delete(path);
+ }
+ this.Closed -= window_Closed;
+ this.Close();
+ PluginLoader.Reset();
+ Login login = new Login();
+ login.Show();
+ }
+ }
+
+ private void RestartApp()
+ {
+ if (MsgBoxHelper.WarnMessage(this, this.lang("App.MakeSureRestartApp")) == MessageBoxResult.OK)
+ {
+ Application.Current.Exit += Current_Exit;
+ this.Close();
+ }
+ }
+
+ private void Current_Exit(object sender, ExitEventArgs e)
+ {
+ System.Windows.Forms.Application.Restart();
+ }
+
+ private void window_Closed(object sender, EventArgs e)
+ {
+ Application.Current.Shutdown();
+ }
+
+ private void Button_Click(object sender, RoutedEventArgs e)
+ {
+ Button btn = sender as Button;
+ switch (btn.Name)
+ {
+ case "minBtn":
+ this.Minimize();
+ break;
+ case "maxBtn":
+ this.Maximize();
+ break;
+ case "closeBtn":
+ 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(string message)
+ {
+ bool res = false;
+ Dispatcher.Invoke(() =>
+ {
+ if (Alarms.FirstOrDefault(e => e.Message == message) == null)
+ {
+ var data = new SimpleAlarm
+ {
+ Time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+ Message = message
+ };
+ 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 BaseWindow_Loaded(object sender, RoutedEventArgs e)
--
Gitblit v1.9.1