优化项目；

alielie

2025-05-12 7bf89fd93bc487e8445d6d85bb527251b7371a04

 WPFProject/LoadingWindow.xaml.cs

@@ -1,9 +1,12 @@
using HMI.Base;
using HMI.Core.Api;
using HMI.UI.Util;
using Panuon.WPF.UI;
using System;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Documents;
using System.Windows.Media;

namespace WPFProject
{
@@ -13,12 +16,36 @@
    public partial class LoadingWindow : WindowX
    {

        private string consoleText = "";
        private string message = "";

        public string ConsoleText
        public string Message
        {
            get { return consoleText; }
            set { Set(ref consoleText, value); }
            get { return message; }
            set { Set(ref message, value); }
        }

        private bool HasErr = false;

        private bool showConsole = false;
        public bool ShowConsole
        {
            get => showConsole;
            set
            {
                Set(ref showConsole, value);
                NotifyOfPropertyChange("ConsoleVisiable");
                NotifyOfPropertyChange("BarVisiable");
            }
        }

        public Visibility ConsoleVisiable
        {
            get => showConsole ? Visibility.Visible : Visibility.Collapsed;
        }

        public Visibility BarVisiable
        {
            get => showConsole ? Visibility.Collapsed : Visibility.Visible;
        }

        public LoadingWindow()
@@ -29,55 +56,86 @@

        private void Window_Loaded(object sender, RoutedEventArgs e)
        {
            

        }
        private void Loader_LoadMessageAppend(object sender, string e)
        private void Loader_LoadMessageAppend(object sender, LoadMsg msg)
        {
            Add(e);
            switch (msg.Type)
            {
                case LoadMsgType.INIT:
                    total = msg.NumData;
                    Add(msg.Message, null);
                    break;
                case LoadMsgType.LOADING:
                    HasErr = HasErr || msg.Result == false;
                    if (msg.Result != null)
                    {
                        processBar.Value = ++finished / total * 100;
                    }
                    Add(msg.Message, msg.Result);
                    break;
                case LoadMsgType.FINISHED:
                    LoadFinished();
                    break;
                default:
                    break;
            }
        }


        private void Button_Click(object sender, RoutedEventArgs e)
        {
            PanuonWindow window = new PanuonWindow();
            window.Show();
            this.Close();
        }
        private PanuonWindow window;
        private double total;
        private double finished;

        private void WindowX_ContentRendered(object sender, System.EventArgs e)
        {
            window = new PanuonWindow();
            PluginLoader loader = PluginLoader.GetLoader();
            loader.LoadMessageAppend += Loader_LoadMessageAppend;
            loader.Loaded += Loader_Loaded;
            Task.Run(() =>
            {
                loader.LoadMenuAndPlugin(Dispatcher);
                loader.LoadMenuAndPlugin(window, Dispatcher);
                //
            });
        }

        private void Loader_Loaded(object sender, EventArgs e)
        private void LoadFinished()
        {
            Dispatcher.Invoke(() =>
            if (!HasErr)
            {
                Button_Click(null, null);
            });
            }
            else
            {
                WindowXCaption.SetButtons(this, CaptionButtons.Close);
                ShowConsole = true;
                BtnNext.Visibility = Visibility.Visible;
                MsgBoxHelper.Error(this, "加载出错，请确认");
            }
        }

        public void Add(string text)
        public void Add(string text, bool? result)
        {
            string t = string.Format("{0:G}", DateTime.Now);
            Message = text;
            string time = string.Format("{0:G}", DateTime.Now);
            Run run = new Run();
            run.Text = t + " 信息：" + text;
            //run.Foreground = new Brush();
            string type = result != false ? "Info" : "Warn";
            run.Text = $"{time} {type} {text}";
            run.Foreground = result == null ? Brushes.Black : (result == true ? Brushes.Green : Brushes.Red);

            Paragraph paragraph = new Paragraph(run) {
                LineHeight =1
            Paragraph paragraph = new Paragraph(run)
            {
                LineHeight = 1
            };
            //rtxtLog.Document.Blocks.InsertAfter(); ;
            //插入到最前面
            Console.Document.Blocks.InsertAfter(Console.Document.Blocks.LastBlock, paragraph);
            //也可以插入到最后面
            Console.Document.Blocks.InsertAfter(Console.Document.Blocks.LastBlock, paragraph);

            //插入到最前面
            //rtxtLog.Document.Blocks.Add(paragraph);

            // 滚动至最后行