修改接口路径

DMS.WPF.UnitTests/ViewModelTest/BaseServiceTest.cs

@@ -9,6 +9,7 @@ using DMS.Core.Interfaces.Repositories;
 using DMS.Infrastructure.Configurations;
 using DMS.Infrastructure.Data;
 using DMS.Infrastructure.Repositories;
+using DMS.WPF.Interfaces;
 using DMS.WPF.Services;
 using DMS.WPF.ViewModels;
 using Microsoft.Extensions.DependencyInjection;

DMS.WPF/App.xaml.cs

@@ -24,10 +24,11 @@ using DMS.WPF.Services;
 using DMS.WPF.Services.Processors;
 using DMS.WPF.ViewModels.Dialogs;
 using DataProcessingService = DMS.Services.DataProcessingService;
-using IDataProcessingService = DMS.Services.IDataProcessingService;
+using IDataProcessingService = DMS.WPF.Interfaces.IDataProcessingService;
 using LogLevel = Microsoft.Extensions.Logging.LogLevel;
 using DMS.Core.Interfaces.Services;
 using DMS.Infrastructure.Interfaces.Services;
+using DMS.WPF.Interfaces;
 
 namespace DMS;
 

DMS.WPF/Interfaces/IDataProcessingService.cs

@@ -1,7 +1,7 @@
-using System.Threading.Tasks;
 using DMS.Core.Models;
+using DMS.Services;
 
-namespace DMS.Services;
+namespace DMS.WPF.Interfaces;
 
 /// <summary>
 /// 定义了数据处理服务的接口。

DMS.WPF/Interfaces/IDialogService.cs

@@ -1,7 +1,6 @@
 using DMS.WPF.ViewModels.Dialogs;
-using System.Threading.Tasks;
 
-namespace DMS.WPF.Services
+namespace DMS.WPF.Interfaces
 {
     public interface IDialogService
     {

DMS.WPF/Interfaces/INavigatable.cs

@@ -2,7 +2,7 @@
 
 using DMS.WPF.ViewModels.Items;
 
-namespace DMS.WPF.Services;
+namespace DMS.WPF.Interfaces;
 
 /// <summary>
 /// 定义了一个契约，表示ViewModel可以安全地接收导航传入的参数。

DMS.WPF/Interfaces/INavigationService.cs

@@ -1,8 +1,8 @@
 // 文件: DMS.WPF/Services/INavigationService.cs
-using System.Threading.Tasks;
+
 using DMS.WPF.ViewModels.Items;
 
-namespace DMS.WPF.Services;
+namespace DMS.WPF.Interfaces;
 
 /// <summary>
 /// 定义了应用程序的导航服务接口。

DMS.WPF/Interfaces/INotificationService.cs

@@ -1,6 +1,4 @@
-using DMS.Core.Enums;
+namespace DMS.WPF.Interfaces;
-
-namespace DMS.Services;
 
 public interface INotificationService
 {

DMS.WPF/Interfaces/IVariableProcessor.cs

@@ -1,6 +1,6 @@
 using DMS.Core.Models;
 
-namespace DMS.Services;
+namespace DMS.WPF.Interfaces;
 
 /// <summary>
 /// 定义了变量数据处理器的通用接口。

DMS.WPF/Services/DataProcessingService.cs

@@ -1,6 +1,7 @@
 using System.Threading.Channels;
 using DMS.Core.Helper;
 using DMS.Core.Models;
+using DMS.WPF.Interfaces;
 using Microsoft.Extensions.Hosting;
 
 namespace DMS.Services;

DMS.WPF/Services/DialogService.cs

@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using System.Windows;
+using DMS.WPF.Interfaces;
 using DMS.WPF.Views;
 using iNKORE.UI.WPF.Modern.Controls;
 

DMS.WPF/Services/NavigationService.cs

@@ -10,6 +10,7 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using System.Windows;
+using DMS.WPF.Interfaces;
 
 namespace DMS.WPF.Services;
 

DMS.WPF/Services/Processors/CheckValueChangedProcessor.cs

@@ -1,6 +1,7 @@
 using DMS.Core.Helper;
 using DMS.Core.Models;
 using DMS.Helper;
+using DMS.WPF.Interfaces;
 using DMS.WPF.Services;
 
 namespace DMS.Services.Processors;

DMS.WPF/Services/Processors/HistoryProcessor.cs

@@ -1,6 +1,7 @@
 using DMS.Core.Helper;
 using DMS.Core.Models;
 using DMS.Services;
+using DMS.WPF.Interfaces;
 using Microsoft.Extensions.Logging;
 
 namespace DMS.WPF.Services.Processors;

DMS.WPF/Services/Processors/LoggingProcessor.cs

@@ -2,6 +2,7 @@ using System.Threading.Tasks;
 using DMS.Core.Models;
 using Microsoft.Extensions.Logging;
 using DMS.Helper;
+using DMS.WPF.Interfaces;
 
 namespace DMS.Services.Processors;
 

DMS.WPF/Services/Processors/MqttPublishProcessor.cs

@@ -1,5 +1,6 @@
 using System.Threading.Tasks;
 using DMS.Core.Models;
+using DMS.WPF.Interfaces;
 
 namespace DMS.Services.Processors
 {

DMS.WPF/Services/Processors/UpdateDbVariableProcessor.cs

@@ -2,6 +2,7 @@ using System.Threading.Tasks;
 using DMS.Core.Helper;
 using DMS.Core.Models;
 using DMS.Helper;
+using DMS.WPF.Interfaces;
 using DMS.WPF.Services;
 
 namespace DMS.Services.Processors

DMS.WPF/ViewModels/DeviceDetailViewModel.cs

@@ -8,6 +8,7 @@ using DMS.Core.Enums;
 using DMS.Helper;
 using DMS.WPF.Services;
 using DMS.Services;
+using DMS.WPF.Interfaces;
 using DMS.WPF.ViewModels.Dialogs;
 using DMS.WPF.ViewModels.Items;
 using iNKORE.UI.WPF.Modern.Common.IconKeys;
@@ -57,7 +58,8 @@ public partial class DeviceDetailViewModel : ViewModelBase, INavigatable
              var tableMenu = new MenuBeanDto()
                              {
                                  Header = variableTableItemViewModel.Name,
-                                 Icon = SegoeFluentIcons.DataSense.Glyph
+                                 Icon = SegoeFluentIcons.DataSense.Glyph,
+                                 TargetViewKey = "VariableTableView"
                              };
 
              if (await DataServices.AddVariableTable(_mapper.Map<VariableTableDto>(variableTableItemViewModel),

DMS.WPF/ViewModels/DevicesViewModel.cs

@@ -10,6 +10,7 @@ using DMS.Core.Models;
 using DMS.Helper;
 using DMS.Services;
 using DMS.WPF.Helper;
+using DMS.WPF.Interfaces;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using DMS.WPF.Services;

DMS.WPF/ViewModels/MainViewModel.cs

@@ -11,6 +11,7 @@ using DMS.Helper;
 using DMS.Services;
 using DMS.ViewModels;
 using DMS.WPF.Helper;
+using DMS.WPF.Interfaces;
 using DMS.WPF.ViewModels.Items;
 using iNKORE.UI.WPF.Modern.Common.IconKeys;
 using Microsoft.Extensions.DependencyInjection;

DMS.WPF/ViewModels/MqttServerDetailViewModel.cs

@@ -5,6 +5,7 @@ using System.Collections.ObjectModel;
 using DMS.Core.Models;
 using DMS.Helper;
 using DMS.Services;
+using DMS.WPF.Interfaces;
 using DMS.WPF.Services;
 using DMS.WPF.ViewModels;
 using DMS.WPF.ViewModels.Items;

DMS.WPF/ViewModels/MqttsViewModel.cs

@@ -5,6 +5,7 @@ using DMS.Core.Enums;
 using DMS.Helper;
 using DMS.Services;
 using DMS.WPF.Helper;
+using DMS.WPF.Interfaces;
 using DMS.WPF.Services;
 using DMS.WPF.ViewModels.Items;
 using Microsoft.Extensions.Logging;

DMS.WPF/ViewModels/VariableTableViewModel.cs

@@ -14,6 +14,7 @@ using ObservableCollections;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using DMS.WPF.Interfaces;
 
 namespace DMS.WPF.ViewModels;