From b37d1c1056ece9a0c7baf45d23fec66cbac12308 Mon Sep 17 00:00:00 2001 From: hsc Date: Mon, 17 Nov 2025 11:40:12 +0800 Subject: [PATCH] =?UTF-8?q?BOB=E5=8F=82=E6=95=B0=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BOB/ViewModels/CommandTreeViewModel.cs | 2 +- BOB/ViewModels/ShellViewModel.cs | 11 ++--- BOB/Views/ShellView.xaml | 15 +++---- Command/CommandApplication.cs | 2 +- Command/CommandArray.cs | 2 +- Command/CommandMath.cs | 2 +- Command/CommandRadixChange.cs | 2 +- Command/CommandStringProcessing.cs | 2 +- Command/CommandSystem.cs | 2 +- Command/CommandTime.cs | 2 +- Command/Delay.cs | 2 +- ...andAttribute.cs => BOBCommandAttribute.cs} | 6 +-- DeviceCommand/Base/ModbusRtu.cs | 11 ++--- DeviceCommand/Base/ModbusTcp.cs | 41 +++++-------------- DeviceCommand/Device/E36233A.cs | 9 ++-- DeviceCommand/Device/EAEL9080.cs | 9 +++- DeviceCommand/Device/IT6724C.cs | 10 +++-- DeviceCommand/Device/LQ7500-D.cs | 9 +++- DeviceCommand/Device/PSB11000.cs | 9 +++- DeviceCommand/Device/SQ0030G1D.cs | 9 +++- DeviceCommand/Device/WS-68030-380T.cs | 9 +++- DeviceCommand/Device/ZXKS.cs | 9 +++- DeviceCommand/DeviceCommand.csproj | 6 ++- 23 files changed, 98 insertions(+), 83 deletions(-) rename Common/Attributes/{ATSCommandAttribute.cs => BOBCommandAttribute.cs} (82%) diff --git a/BOB/ViewModels/CommandTreeViewModel.cs b/BOB/ViewModels/CommandTreeViewModel.cs index 0595b38..2737a6d 100644 --- a/BOB/ViewModels/CommandTreeViewModel.cs +++ b/BOB/ViewModels/CommandTreeViewModel.cs @@ -275,7 +275,7 @@ namespace BOB.ViewModels !t.IsNested && (t.IsClass || t.IsValueType) && (!t.IsAbstract || t.IsSealed) && - t.GetCustomAttribute() != null); + t.GetCustomAttribute() != null); foreach (var type in types) { diff --git a/BOB/ViewModels/ShellViewModel.cs b/BOB/ViewModels/ShellViewModel.cs index eb8fa14..5319b5c 100644 --- a/BOB/ViewModels/ShellViewModel.cs +++ b/BOB/ViewModels/ShellViewModel.cs @@ -1,19 +1,12 @@ using BOB.Models; using BOB.Views; using Common.PubEvent; -using Common.PubEvents; using Logger; using MaterialDesignThemes.Wpf; using Microsoft.Win32; using Newtonsoft.Json; -using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows; -using System.Windows.Documents; using System.Windows.Input; using System.Windows.Media; @@ -92,6 +85,7 @@ namespace BOB.ViewModels public ICommand NewCommand { get; set; } public ICommand SetDefaultCommand { get; set; } public ICommand LoadCommand { get; set; } + public ICommand NavigateOneCommand { get; set; } #endregion private IEventAggregator _eventAggregator; @@ -102,7 +96,7 @@ namespace BOB.ViewModels { _eventAggregator = eventAggregator; _globalVariables = globalVariables; - _stepRunning=stepRunning; + _stepRunning =stepRunning; LeftDrawerOpenCommand = new DelegateCommand(LeftDrawerOpen); MinimizeCommand = new DelegateCommand(MinimizeWindow); MaximizeCommand = new DelegateCommand(MaximizeWindow); @@ -119,6 +113,7 @@ namespace BOB.ViewModels LoadCommand = new DelegateCommand(Load); _eventAggregator.GetEvent().Subscribe(UpdateRunIcon); } + private void UpdateRunIcon(string obj) { diff --git a/BOB/Views/ShellView.xaml b/BOB/Views/ShellView.xaml index 37d9d5d..9f128ab 100644 --- a/BOB/Views/ShellView.xaml +++ b/BOB/Views/ShellView.xaml @@ -38,9 +38,6 @@ Margin="16" Foreground="{DynamicResource PrimaryHueMidBrush}" /> -