1

BPASmartClient.Business/BPASmartClient.Business.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="BPA.ApolloClient" Version="1.0.12" />
-    <PackageReference Include="BPA.Helper" Version="1.0.54" />
+    <PackageReference Include="BPA.Helper" Version="1.0.64" />
     <PackageReference Include="BPA.Message" Version="1.0.86" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
@@ -17,10 +17,8 @@
 
   <ItemGroup>
     <ProjectReference Include="..\BPASmartClient.Device\BPASmartClient.Device.csproj" />
-    <ProjectReference Include="..\BPASmartClient.Helper\BPASmartClient.Helper.csproj" />
     <ProjectReference Include="..\BPASmartClient.Http\BPASmartClient.Http.csproj" />
     <ProjectReference Include="..\BPASmartClient.Model\BPASmartClient.Model.csproj" />
-    <ProjectReference Include="..\BPASmartClient.MQTT\BPASmartClient.MQTT.csproj" />
   </ItemGroup>
 
 </Project>

BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj

@@ -459,14 +459,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Helper" Version="1.0.62" />
+    <PackageReference Include="BPA.Helper" Version="1.0.64" />
     <PackageReference Include="BPA.Message" Version="1.0.86" />
     <PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="4.11.0" />
     <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\BPASmartClient.Helper\BPASmartClient.Helper.csproj" />
     <ProjectReference Include="..\BPASmartClient.Model\BPASmartClient.Model.csproj" />
     <ProjectReference Include="..\BPASmartClient.Nfc\BPASmartClient.Nfc.csproj" />
   </ItemGroup>

BPASmartClient.CustomResource/Pages/Model/MenuManage.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Collections.ObjectModel;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using BPASmartClient.CustomResource.Pages.Enums;
 using System.Windows;
 
@@ -13,7 +13,7 @@ namespace BPASmartClient.CustomResource.Pages.Model
     /// <summary>
     /// 在启动界面之前设置菜单项
     /// </summary>
-    public class MenuManage : ObservableObject
+    public class MenuManage : NotifyBase
     {
         private volatile static MenuManage _Instance;
         public static MenuManage GetInstance => _Instance ?? (_Instance = new MenuManage());
@@ -22,7 +22,7 @@ namespace BPASmartClient.CustomResource.Pages.Model
         public ObservableCollection<MenuModel> menuModels { get; set; } = new ObservableCollection<MenuModel>();
     }
 
-    public class MenuModel : ObservableObject
+    public class MenuModel : NotifyBase
     {
 
         private Permission[] pers
@@ -84,7 +84,7 @@ namespace BPASmartClient.CustomResource.Pages.Model
 
     }
 
-    public class SubMenumodel : ObservableObject
+    public class SubMenumodel : NotifyBase
     {
         /// <summary>
         /// 子菜单名称

BPASmartClient.CustomResource/Pages/Model/PlcVariableInfoManage.cs

@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 
 namespace BPASmartClient.CustomResource.Pages.Model
 {
-    public class PlcVariableInfoManage:ObservableObject
+    public class PlcVariableInfoManage:NotifyBase
     {
         public ConcurrentDictionary<string, ObservableCollection<PlcVariableInfoModel>> VariablesInfo { get; set; } = new ConcurrentDictionary<string, ObservableCollection<PlcVariableInfoModel>>();
     }

BPASmartClient.CustomResource/Pages/Model/PlcVariableInfoModel.cs

@@ -1,5 +1,5 @@
 
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace BPASmartClient.CustomResource.Pages.Model
 {
-    public class PlcVariableInfoModel : ObservableObject
+    public class PlcVariableInfoModel : NotifyBase
     {
         //public int Id { get { return _id; } set { _id = value;OnPropertyChanged(); } }
         //private int _id;

BPASmartClient.CustomResource/Pages/Model/RecipeCompleteLog.cs

@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace BPASmartClient.CustomResource.Pages.Model
 {
-    public class RecipeCompleteLog : ObservableObject
+    public class RecipeCompleteLog : NotifyBase
     {
         [Key]
         public int Id { get; set; }

BPASmartClient.CustomResource/Pages/Model/ReportBase.cs

@@ -4,12 +4,12 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.ComponentModel;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 
 namespace BPASmartClient.CustomResource.Pages.Model
 {
     [Serializable]
-    public class ReportBase : ObservableObject
+    public class ReportBase : NotifyBase
     {
     }
 }

BPASmartClient.CustomResource/Pages/Model/ReportTestModel.cs

@@ -4,7 +4,7 @@ using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 
 namespace BPASmartClient.CustomResource.Pages.Model
 {

BPASmartClient.CustomResource/Pages/Model/RunLog.cs

@@ -4,11 +4,11 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 
 namespace BPASmartClient.CustomResource.Pages.Model
 {
-    public class RunLog : ObservableObject
+    public class RunLog : NotifyBase
     {
         [Key]
         public int Id { get; set; }

BPASmartClient.CustomResource/Pages/Model/UserInfo.cs

@@ -1,6 +1,6 @@
 using BPASmartClient.CustomResource.Pages.Enums;
 using BPASmartClient.Model;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 
 namespace BPASmartClient.CustomResource.Pages.Model
 {
-    public class UserInfo : ObservableObject
+    public class UserInfo : NotifyBase
     {
         public String LastLogInTime { get; set; } = "无";
 

BPASmartClient.CustomResource/Pages/Model/UserLog.cs

@@ -4,11 +4,11 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 
 namespace BPASmartClient.CustomResource.Pages.Model
 {
-    public class UserLog : ObservableObject
+    public class UserLog : NotifyBase
     {
         [Key]
         public int Id { get; set; }

BPASmartClient.CustomResource/Pages/Model/UserTreeViewModel.cs

@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace BPASmartClient.CustomResource.Pages.Model
 {
-    public class UserTreeViewModel: ObservableObject
+    public class UserTreeViewModel: NotifyBase
     {
         public string Name { get; set; }
 

BPASmartClient.CustomResource/Pages/ViewModel/AddNewUserViewModel.cs

@@ -1,6 +1,6 @@
 using BPASmartClient.CustomResource.Pages.Model;
 using BPASmartClient.Helper;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.Generic;
@@ -10,7 +10,7 @@ using System.Threading.Tasks;
 
 namespace BPASmartClient.CustomResource.Pages.ViewModel
 {
-    public class AddNewUserViewModel:ObservableObject
+    public class AddNewUserViewModel:NotifyBase
     {
         public string ErrorInfo { get { return _mErrorInfo; } set { _mErrorInfo = value; OnPropertyChanged(); } }
         private string _mErrorInfo;

BPASmartClient.CustomResource/Pages/ViewModel/AlarmViewModel.cs

@@ -3,11 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System.Collections.Concurrent;
 using System.Collections.ObjectModel;
 using System.Windows;
-using BPASmartClient.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using BPASmartClient.CustomResource.Pages.Model;
 using BPASmartClient.Model;
@@ -16,7 +15,7 @@ using System.Threading;
 
 namespace BPASmartClient.CustomResource.Pages.ViewModel
 {
-    public class AlarmViewModel : ObservableObject
+    public class AlarmViewModel : NotifyBase
     {
         public AlarmViewModel()
         {
@@ -72,7 +71,7 @@ namespace BPASmartClient.CustomResource.Pages.ViewModel
 
         private void GetHistoryAlarm()
         {
-            var data = Sqlite<Alarm>.GetInstance.GetData();
+            var data = Sqlite<BPASmartClient.Model.Alarm>.GetInstance.GetData();
             if (data != null)
             {
                 HistoryAlarm.Clear();
@@ -132,8 +131,8 @@ namespace BPASmartClient.CustomResource.Pages.ViewModel
         private DateTime _mEndDateTime = DateTime.Now;
 
 
-        public static ObservableCollection<Alarm> AlarmInfos { get; set; }
-        public ObservableCollection<Alarm> HistoryAlarm { get; set; } = new ObservableCollection<Alarm>();
+        public static ObservableCollection<BPASmartClient.Model.Alarm> AlarmInfos { get; set; }
+        public ObservableCollection<BPASmartClient.Model.Alarm> HistoryAlarm { get; set; } = new();
 
     }
 }

BPASmartClient.CustomResource/Pages/ViewModel/DebugLogViewModel.cs

@@ -5,14 +5,14 @@ using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using BPA.Helper;
 using System.Collections.ObjectModel;
 using System.Windows.Media;
 
 namespace BPASmartClient.CustomResource.Pages.ViewModel
 {
-    public class DebugLogViewModel : ObservableObject
+    public class DebugLogViewModel : NotifyBase
     {
         public DebugLogViewModel()
         {
@@ -38,7 +38,7 @@ namespace BPASmartClient.CustomResource.Pages.ViewModel
 
     }
 
-    public class MessageModel : ObservableObject
+    public class MessageModel : NotifyBase
     {
         public string LogInfo { get { return _mLogInfo; } set { _mLogInfo = value; OnPropertyChanged(); } }
         private string _mLogInfo;

BPASmartClient.CustomResource/Pages/ViewModel/LoginViewModel.cs

@@ -6,12 +6,12 @@ using System.Threading.Tasks;
 using System.Windows;
 using BPASmartClient.CustomResource.Pages.Model;
 using BPASmartClient.Helper;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 
 namespace BPASmartClient.CustomResource.Pages.ViewModel
 {
-    public class LoginViewModel : ObservableObject
+    public class LoginViewModel : NotifyBase
     {
         public LoginViewModel()
         {

BPASmartClient.CustomResource/Pages/ViewModel/MainViewModel.cs

@@ -11,12 +11,12 @@ using System.Windows.Media;
 using BPASmartClient.CustomResource.Pages.Model;
 using BPASmartClient.Helper;
 using BPASmartClient.Model;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 
 namespace BPASmartClient.CustomResource.Pages.ViewModel
 {
-    public class MainViewModel : ObservableObject
+    public class MainViewModel : NotifyBase
     {
         public MainViewModel()
         {

BPASmartClient.CustomResource/Pages/ViewModel/NfcSetViewModel.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System.Collections.ObjectModel;
 using BPASmartClient.CustomResource.Pages.Enums;
 using Microsoft.Toolkit.Mvvm.Input;
@@ -14,7 +14,7 @@ using BPASmartClient.Helper;
 
 namespace BPASmartClient.CustomResource.Pages.ViewModel
 {
-    public class NfcSetViewModel : ObservableObject
+    public class NfcSetViewModel : NotifyBase
     {
         public NfcSetViewModel()
         {
@@ -161,7 +161,7 @@ namespace BPASmartClient.CustomResource.Pages.ViewModel
 
     }
 
-    public class PermissionSelect : ObservableObject
+    public class PermissionSelect : NotifyBase
     {
 
         public string PermissionName { get { return _mPermissionName; } set { _mPermissionName = value; OnPropertyChanged(); } }

BPASmartClient.CustomResource/Pages/ViewModel/PasswordChangeViewModel.cs

@@ -5,13 +5,13 @@ using System.Text;
 using System.Threading.Tasks;
 using BPASmartClient.CustomResource.Pages.Model;
 using BPASmartClient.Helper;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 
 namespace BPASmartClient.CustomResource.Pages.ViewModel
 {
 
-    public class PasswordChangeViewModel : ObservableObject
+    public class PasswordChangeViewModel : NotifyBase
     {
         private void CheckPassword(UserInfo userInfo)
         {

BPASmartClient.CustomResource/Pages/ViewModel/PermissionConfigurationViewModel.cs

@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace BPASmartClient.CustomResource.Pages.ViewModel
 {
-    public class PermissionConfigurationViewModel:ObservableObject
+    public class PermissionConfigurationViewModel:NotifyBase
     {
          
     }

BPASmartClient.CustomResource/Pages/ViewModel/ProductionDataViewModel.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 
 namespace BPASmartClient.CustomResource.Pages.ViewModel
 {
-    public class ProductionDataViewModel : ObservableObject
+    public class ProductionDataViewModel : NotifyBase
     {
         public ProductionDataViewModel()
         {

BPASmartClient.CustomResource/Pages/ViewModel/RecipeCompleteViewModel.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System.Collections.ObjectModel;
 using BPASmartClient.CustomResource.Pages.Model;
@@ -12,7 +12,7 @@ using BPASmartClient.Helper;
 
 namespace BPASmartClient.CustomResource.Pages.ViewModel
 {
-    public class RecipeCompleteViewModel : ObservableObject
+    public class RecipeCompleteViewModel : NotifyBase
     {
         public RecipeCompleteViewModel()
         {

BPASmartClient.CustomResource/Pages/ViewModel/ReportViewModel.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System.Collections.ObjectModel;
 using BPASmartClient.CustomResource.Pages.Model;
 using Microsoft.Toolkit.Mvvm.Input;

BPASmartClient.CustomResource/Pages/ViewModel/RunLogViewModel.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System.Collections.ObjectModel;
 using BPASmartClient.CustomResource.Pages.Model;
@@ -13,7 +13,7 @@ using System.Diagnostics;
 
 namespace BPASmartClient.CustomResource.Pages.ViewModel
 {
-    public class RunLogViewModel : ObservableObject
+    public class RunLogViewModel : NotifyBase
     {
         public RunLogViewModel()
         {

BPASmartClient.CustomResource/Pages/ViewModel/UserConfigViewModel.cs

@@ -2,7 +2,7 @@
 using BPASmartClient.CustomResource.Pages.View;
 using BPASmartClient.Helper;
 using BPASmartClient.Model;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.Generic;
@@ -14,7 +14,7 @@ using System.Windows;
 
 namespace BPASmartClient.CustomResource.Pages.ViewModel
 {
-    public class UserConfigViewModel:ObservableObject
+    public class UserConfigViewModel:NotifyBase
     {
         /// <summary>
         /// 页面列表集合

BPASmartClient.CustomResource/Pages/ViewModel/UserLogViewModel.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System.Collections.ObjectModel;
 using BPASmartClient.CustomResource.Pages.Model;
 using System.Windows;
@@ -12,7 +12,7 @@ using BPASmartClient.Helper;
 
 namespace BPASmartClient.CustomResource.Pages.ViewModel
 {
-    public class UserLogViewModel : ObservableObject
+    public class UserLogViewModel : NotifyBase
     {
         public UserLogViewModel()
         {

BPASmartClient.CustomResource/Pages/ViewModel/UserManageViewModel.cs

@@ -1,7 +1,7 @@
 using BPA.Message;
 using BPASmartClient.CustomResource.Pages.Enums;
 using BPASmartClient.CustomResource.Pages.Model;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using Newtonsoft.Json;
 using System;
@@ -15,7 +15,7 @@ using System.Windows;
 
 namespace BPASmartClient.CustomResource.Pages.ViewModel
 {
-    internal class UserManageViewModel:ObservableObject
+    internal class UserManageViewModel:NotifyBase
     {
         //private static UserManageViewModel _instance;
         //public static UserManageViewModel GetInstance => _instance ??= new UserManageViewModel();

BPASmartClient.CustomResource/Pages/ViewModel/VariableViewModel.cs

@@ -2,7 +2,7 @@
 using BPASmartClient.CustomResource.UserControls;
 using BPASmartClient.CustomResource.UserControls.MessageShow;
 using BPASmartClient.Helper;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.Generic;
@@ -14,7 +14,7 @@ using System.Windows;
 
 namespace BPASmartClient.CustomResource.Pages.ViewModel
 {
-    public class VariableViewModel : ObservableObject
+    public class VariableViewModel : NotifyBase
     {
         public ObservableCollection<PlcVariableInfoModel> Variables { get; set; } = new ObservableCollection<PlcVariableInfoModel>();
 

BPASmartClient.Device/BPASmartClient.Device.csproj

@@ -12,7 +12,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\BPASmartClient.Helper\BPASmartClient.Helper.csproj" />
     <ProjectReference Include="..\BPASmartClient.Model\BPASmartClient.Model.csproj" />
     <ProjectReference Include="..\BPASmartClient.Peripheral\BPASmartClient.Peripheral.csproj" />
   </ItemGroup>

BPASmartClient.Device/BaseDevice.cs

@@ -1,7 +1,5 @@
 using BPA.Message;
 using BPA.Message.Enum;
-using BPASmartClient.Helper;
-using BPASmartClient.Message;
 using BPASmartClient.Model;
 using BPASmartClient.Peripheral;
 using System;
@@ -14,8 +12,8 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Collections.ObjectModel;
 using BPASmartClient.Model.单片机;
-using BPASmartClient.EventBus;
 using BPA.Models;
+using BPA.Helper;
 
 namespace BPASmartClient.Device
 {

BPASmartClient.Device/IDevice.cs

@@ -67,7 +67,7 @@ namespace BPASmartClient.Device
         /// <summary>
         /// 设备报警信息集合
         /// </summary>
-        List<Alarm> alarms { get; set; }
+        List<BPASmartClient.Model.Alarm> alarms { get; set; }
 
         /// <summary>
         /// 接口报警对象

BPASmartClient.Device/VariableMonitor.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 
 namespace BPASmartClient.Device
 {
-    public class VariableMonitor : ObservableObject
+    public class VariableMonitor : NotifyBase
     {
         public int Id { get { return _mId; } set { _mId = value; OnPropertyChanged(); } }
         private int _mId;

BPASmartClient.DosingSystemSingle/BPASmartClient.DosingSystemSingle.csproj

@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Helper" Version="1.0.54" />
+    <PackageReference Include="BPA.Helper" Version="1.0.64" />
     <PackageReference Include="BPA.Message" Version="1.0.86" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>

BPASmartClient.EventBus/BPASmartClient.EventBus.csproj

@@ -6,8 +6,4 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\BPASmartClient.Helper\BPASmartClient.Helper.csproj" />
-  </ItemGroup>
-
 </Project>

BPASmartClient.FoodStationTest/BPASmartClient.FoodStationTest.csproj

@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Communication" Version="1.0.105" />
+    <PackageReference Include="BPA.Communication" Version="1.0.106" />
   </ItemGroup>
 
   <ItemGroup>

BPASmartClient.FoodStationTest/Model/Bom/BomMaterial.cs

@@ -1,8 +1,8 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 
 namespace BPASmartClient.FoodStationTest.Model.Bom
 {
-    public class BomMaterial : ObservableObject
+    public class BomMaterial : NotifyBase
     {
         public int Count { get { return _count; } set { _count = value; OnPropertyChanged(); } }
         public int _count { get; set; }

BPASmartClient.FoodStationTest/Model/GVL/PlcInfos.cs

@@ -1,11 +1,11 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 
 namespace BPASmartClient.FoodStationTest.Model.GVL
 {
     /// <summary>
     /// PLC变量信息
     /// </summary>
-    public class PlcInfos : ObservableObject
+    public class PlcInfos : NotifyBase
     {
         /// <summary>
         /// 变量序号

BPASmartClient.FoodStationTest/Model/Par/ConnectParMode.cs

@@ -1,11 +1,11 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 
 namespace BPASmartClient.FoodStationTest.Model.Par
 {
     /// <summary>
     /// 连接参数设置。
     /// </summary>
-    public class ConnectParMode : ObservableObject
+    public class ConnectParMode : NotifyBase
     {
         /// <summary>
         /// 海科PLC是否连接

BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceCurrentStatus.cs

@@ -1,11 +1,11 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 
 namespace BPASmartClient.FoodStationTest.Model
 {
     /// <summary>
     /// 味魔方当前状态。
     /// </summary>
-    public class DeviceCurrentStatus : ObservableObject
+    public class DeviceCurrentStatus : NotifyBase
     {
 
         public double Weight { get { return _mWeight; } set { _mWeight = value; OnPropertyChanged(); } }

BPASmartClient.FoodStationTest/Model/RawMaterial/DevicePar.cs

@@ -1,12 +1,12 @@
 using BPASmartClient.FoodStationTest.Model.Bom;
 using BPASmartClient.FoodStationTest.Model.Par;
 using BPASmartClient.FoodStationTest.Model.RawMaterial;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System.Collections.ObjectModel;
 
 namespace BPASmartClient.FoodStationTest.Model
 {
-    public class DevicePar : ObservableObject
+    public class DevicePar : NotifyBase
     {
         public ObservableCollection<DeviceParMode> deviceParModels { get; set; } = new ObservableCollection<DeviceParMode>();
         public ConnectParMode deviceConnectPar { get { return _mdeviceConnectPar; } set { _mdeviceConnectPar = value; OnPropertyChanged(); } }

BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceParModel.cs

@@ -1,8 +1,8 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 
 namespace BPASmartClient.FoodStationTest.Model
 {
-    public class DeviceParMode : ObservableObject
+    public class DeviceParMode : NotifyBase
     {
 
         /// <summary>

BPASmartClient.FoodStationTest/Model/RawMaterial/RawMaterialColl.cs

@@ -1,8 +1,8 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 
 namespace BPASmartClient.FoodStationTest.Model.RawMaterial
 {
-    public class RawMaterialColl : ObservableObject
+    public class RawMaterialColl : NotifyBase
     {
         /// <summary>
         /// 原料设备IP

BPASmartClient.FoodStationTest/Model/RawMaterial/RawMaterialStockBin.cs

@@ -1,8 +1,8 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 
 namespace BPASmartClient.FoodStationTest.Model.RawMaterial
 {
-    public class RawMaterialStockBin : ObservableObject
+    public class RawMaterialStockBin : NotifyBase
     {
 
         public short RawMaterialCount { get { return _mRawMaterialCount; } set { _mRawMaterialCount = value; OnPropertyChanged(); } }

BPASmartClient.FoodStationTest/Model/RawMaterial/RecipeModel.cs

@@ -1,5 +1,5 @@
 using BPASmartClient.Model;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System.Collections.ObjectModel;
 using System.Threading;
 
@@ -8,7 +8,7 @@ namespace BPASmartClient.FoodStationTest.Model
     /// <summary>
     /// 配方模块
     /// </summary>
-    public class RecipeModel : ObservableObject
+    public class RecipeModel : NotifyBase
     {
         [Newtonsoft.Json.JsonIgnore]
         public bool IsEnable { get { return _mIsEnable; } set { _mIsEnable = value; OnPropertyChanged(); } }

BPASmartClient.FoodStationTest/Model/Recipe/RemoteRecipeData.cs

@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System.Collections.ObjectModel;
 
 namespace BPASmartClient.FoodStationTest.Model
@@ -7,7 +7,7 @@ namespace BPASmartClient.FoodStationTest.Model
     /// <summary>
     /// 远程配方数据。
     /// </summary>
-    public class RemoteRecipeData : ObservableObject
+    public class RemoteRecipeData : NotifyBase
     {
         /// <summary>
         /// 配方名称

BPASmartClient.FoodStationTest/Model/Recipe/RemoteRecipeRawMaterial.cs

@@ -1,8 +1,8 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 
 namespace BPASmartClient.FoodStationTest.Model
 {
-    public class RemoteRecipeRawMaterial : ObservableObject
+    public class RemoteRecipeRawMaterial : NotifyBase
     {
         public int DeviceIp { get { return _mIp; } set { _mIp = value; } }
         private int _mIp;

BPASmartClient.FoodStationTest/ViewModel/BomOfMaterialViewModel.cs

@@ -4,14 +4,14 @@ using BPASmartClient.CustomResource.UserControls.MessageShow;
 using BPASmartClient.FoodStationTest.Model;
 using BPASmartClient.FoodStationTest.Model.Bom;
 using BPASmartClient.Helper;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System.Collections.ObjectModel;
 using System.Linq;
 
 namespace BPASmartClient.FoodStationTest.ViewModel
 {
-    public class BomOfMaterialViewModel : ObservableObject
+    public class BomOfMaterialViewModel : NotifyBase
     {
         public BomOfMaterialViewModel()
         {

BPASmartClient.FoodStationTest/ViewModel/ChangeDeviceNameViewModel.cs

@@ -1,14 +1,14 @@
 using BPASmartClient.CustomResource.Pages.Model;
 using BPASmartClient.FoodStationTest.Model;
 using BPASmartClient.Helper;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Linq;
 
 namespace BPASmartClient.FoodStationTest.ViewModel
 {
-    public class ChangeDeviceNameViewModel : ObservableObject
+    public class ChangeDeviceNameViewModel : NotifyBase
     {
         public ChangeDeviceNameViewModel()
         {

BPASmartClient.FoodStationTest/ViewModel/DeviceListViewModel.cs

@@ -1,13 +1,13 @@
 using BPASmartClient.FoodStationTest.Model;
 using BPASmartClient.FoodStationTest.View;
 using BPASmartClient.Helper;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System.Collections.ObjectModel;
 
 namespace BPASmartClient.FoodStationTest.ViewModel
 {
-    public class DeviceListViewModel : ObservableObject
+    public class DeviceListViewModel : NotifyBase
     {
         public DeviceListViewModel()
         {
@@ -53,7 +53,7 @@ namespace BPASmartClient.FoodStationTest.ViewModel
         public ObservableCollection<Devices> devices { get; set; }
     }
 
-    public class Devices : ObservableObject
+    public class Devices : NotifyBase
     {
         public int Serial { get { return _mSerial; } set { _mSerial = value; OnPropertyChanged(); } }
         private int _mSerial;

BPASmartClient.FoodStationTest/ViewModel/DeviceMaterialParViewModel.cs

@@ -2,14 +2,14 @@
 using BPASmartClient.CustomResource.UserControls.MessageShow;
 using BPASmartClient.FoodStationTest.Model;
 using BPASmartClient.Helper;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System.Collections.ObjectModel;
 using System.Linq;
 
 namespace BPASmartClient.FoodStationTest.ViewModel
 {
-    public class DeviceMaterialParViewModel : ObservableObject
+    public class DeviceMaterialParViewModel : NotifyBase
     {
         public DeviceMaterialParViewModel()
         {

BPASmartClient.FoodStationTest/ViewModel/HardwareStatusViewModel.cs

@@ -1,10 +1,10 @@
 using BPASmartClient.FoodStationTest.Model;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System.Collections.ObjectModel;
 
 namespace BPASmartClient.FoodStationTest.ViewModel
 {
-    public class HardwareStatusViewModel : ObservableObject
+    public class HardwareStatusViewModel : NotifyBase
     {
         public HardwareStatusViewModel()
         {

BPASmartClient.FoodStationTest/ViewModel/ManualCommViewModel.cs

@@ -1,12 +1,12 @@
 using BPASmartClient.FoodStationTest.Model;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System.Collections.ObjectModel;
 using System.Linq;
 
 namespace BPASmartClient.FoodStationTest.ViewModel
 {
-    public class ManualCommViewModel : ObservableObject
+    public class ManualCommViewModel : NotifyBase
     {
         public ManualCommViewModel()
         {

BPASmartClient.FoodStationTest/ViewModel/ManualControlViewModel.cs

@@ -2,7 +2,7 @@
 using BPASmartClient.CustomResource.UserControls.MessageShow;
 using BPASmartClient.FoodStationTest.Model;
 using BPASmartClient.Helper;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.ObjectModel;
@@ -13,7 +13,7 @@ using System.Threading;
 
 namespace BPASmartClient.FoodStationTest.ViewModel
 {
-    public class ManualControlViewModel : ObservableObject
+    public class ManualControlViewModel : NotifyBase
     {
         public ManualControlViewModel()
         {
@@ -409,7 +409,7 @@ namespace BPASmartClient.FoodStationTest.ViewModel
 
 
 
-    public class CylinderModel : ObservableObject
+    public class CylinderModel : NotifyBase
     {
         public bool LeftTog { get { return _mLeftTog; } set { _mLeftTog = value; OnPropertyChanged(); } }
         private bool _mLeftTog;

BPASmartClient.FoodStationTest/ViewModel/ManualFlowViewModel.cs

@@ -4,7 +4,7 @@ using BPASmartClient.CustomResource.UserControls.MessageShow;
 using BPASmartClient.FoodStationTest.Model;
 using BPASmartClient.FoodStationTest.Model.HK_PLC;
 using BPASmartClient.Helper;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.ComponentModel;
@@ -15,7 +15,7 @@ using System.Windows;
 
 namespace BPASmartClient.FoodStationTest.ViewModel
 {
-    public class ManualFlowViewModel : ObservableObject
+    public class ManualFlowViewModel : NotifyBase
     {
         public ManualFlowViewModel()
         {

BPASmartClient.FoodStationTest/ViewModel/NewLocalRecipeViewModel.cs

@@ -3,7 +3,7 @@ using BPASmartClient.CustomResource.UserControls;
 using BPASmartClient.CustomResource.UserControls.MessageShow;
 using BPASmartClient.FoodStationTest.Model;
 using BPASmartClient.Helper;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.ObjectModel;
@@ -11,7 +11,7 @@ using System.Linq;
 
 namespace BPASmartClient.FoodStationTest.ViewModel
 {
-    public class NewLocalRecipeViewModel : ObservableObject
+    public class NewLocalRecipeViewModel : NotifyBase
     {
         public NewLocalRecipeViewModel()
         {

BPASmartClient.FoodStationTest/ViewModel/NewMaterialViewModel.cs

@@ -1,7 +1,7 @@
 using BPASmartClient.CustomResource.Pages.Model;
 using BPASmartClient.Helper;
 using BPASmartClient.Model;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.ObjectModel;
@@ -9,7 +9,7 @@ using System.Linq;
 
 namespace BPASmartClient.FoodStationTest.ViewModel;
 
-public class NewMaterialViewModel : ObservableObject
+public class NewMaterialViewModel : NotifyBase
 {
     public ObservableCollection<RawMaterialModel> Materials { get; set; } = Json<LocaMaterial>.Data.LocalMaterails;
 

BPASmartClient.FoodStationTest/ViewModel/NewRecipeViewModel.cs

@@ -2,7 +2,7 @@
 using BPASmartClient.FoodStationTest.Model;
 using BPASmartClient.Helper;
 using BPASmartClient.Model;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.ObjectModel;
@@ -11,7 +11,7 @@ using System.Text;
 
 namespace BPASmartClient.FoodStationTest.ViewModel
 {
-    public class NewRecipeViewModel : ObservableObject
+    public class NewRecipeViewModel : NotifyBase
     {
         public NewRecipeViewModel()
         {

BPASmartClient.FoodStationTest/ViewModel/PlcVarMonitorViewModel.cs

@@ -1,11 +1,11 @@
 using BPASmartClient.FoodStationTest.Model;
 using BPASmartClient.FoodStationTest.Model.GVL;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System.Collections.ObjectModel;
 
 namespace BPASmartClient.FoodStationTest.ViewModel
 {
-    public class PlcVarMonitorViewModel : ObservableObject
+    public class PlcVarMonitorViewModel : NotifyBase
     {
         public PlcVarMonitorViewModel()
         {

BPASmartClient.FoodStationTest/ViewModel/ProcessMonitorViewModel.cs

@@ -1,11 +1,11 @@
 using BPASmartClient.FoodStationTest.Model;
 using BPASmartClient.FoodStationTest.Model.GVL;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System.Collections.ObjectModel;
 
 namespace BPASmartClient.FoodStationTest.ViewModel
 {
-    public class ProcessMonitorViewModel : ObservableObject
+    public class ProcessMonitorViewModel : NotifyBase
     {
         public ProcessMonitorViewModel()
         {

BPASmartClient.FoodStationTest/ViewModel/RecipeControlViewModel.cs

@@ -4,7 +4,7 @@ using BPASmartClient.CustomResource.UserControls.MessageShow;
 using BPASmartClient.FoodStationTest.Model;
 using BPASmartClient.Helper;
 using BPASmartClient.Model;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.Concurrent;
@@ -14,7 +14,7 @@ using System.Threading;
 
 namespace BPASmartClient.FoodStationTest.ViewModel
 {
-    public class RecipeControlViewModel : ObservableObject
+    public class RecipeControlViewModel : NotifyBase
     {
         ConcurrentQueue<string> devices = new ConcurrentQueue<string>();
 

BPASmartClient.FoodStationTest/ViewModel/RecipeInfosViewModel.cs

@@ -1,6 +1,6 @@
 using BPASmartClient.FoodStationTest.Model;
 using BPASmartClient.Helper;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.ObjectModel;
@@ -8,7 +8,7 @@ using System.Linq;
 
 namespace BPASmartClient.FoodStationTest.ViewModel
 {
-    public class RecipeInfosViewModel : ObservableObject
+    public class RecipeInfosViewModel : NotifyBase
     {
         public RecipeInfosViewModel()
         {

BPASmartClient.FoodStationTest/ViewModel/RecipeReceiveViewModel.cs

@@ -4,7 +4,7 @@ using BPASmartClient.CustomResource.UserControls.MessageShow;
 using BPASmartClient.FoodStationTest.Model;
 using BPASmartClient.FoodStationTest.View;
 using BPASmartClient.Helper;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.ObjectModel;
@@ -12,7 +12,7 @@ using System.Linq;
 
 namespace BPASmartClient.FoodStationTest.ViewModel
 {
-    public class RecipeReceiveViewModel : ObservableObject
+    public class RecipeReceiveViewModel : NotifyBase
     {
         //ObservableCollection<RemoteRecipeRawMaterial> RawMaterials { get; set; } = new ObservableCollection<RemoteRecipeRawMaterial>();
         public RecipeReceiveViewModel()

BPASmartClient.FoodStationTest/ViewModel/RecipeSettingsViewModel.cs

@@ -4,14 +4,14 @@ using BPASmartClient.CustomResource.UserControls.MessageShow;
 using BPASmartClient.FoodStationTest.Model;
 using BPASmartClient.FoodStationTest.View;
 using BPASmartClient.Helper;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System.Collections.ObjectModel;
 using System.Linq;
 
 namespace BPASmartClient.FoodStationTest.ViewModel
 {
-    public class RecipeSettingsViewModel : ObservableObject
+    public class RecipeSettingsViewModel : NotifyBase
     {
         public RecipeSettingsViewModel()
         {

BPASmartClient.FoodStationTest/ViewModel/SelectRecipesViewModel.cs

@@ -1,13 +1,13 @@
 using BPASmartClient.FoodStationTest.Model;
 using BPASmartClient.Helper;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System.Collections.ObjectModel;
 using System.Linq;
 
 namespace BPASmartClient.FoodStationTest.ViewModel
 {
-    internal class SelectRecipesViewModel : ObservableObject
+    internal class SelectRecipesViewModel : NotifyBase
     {
         public SelectRecipesViewModel()
         {
@@ -93,7 +93,7 @@ namespace BPASmartClient.FoodStationTest.ViewModel
         public RelayCommand ConfirmCommand { get; set; }
 
 
-        internal class RecipeDataWithCheck : ObservableObject
+        internal class RecipeDataWithCheck : NotifyBase
         {
             public RemoteRecipeData Recipe { get; set; }
             private bool _IsSelected;

BPASmartClient.FoodStationTest/ViewModel/SiemensRecipeReceiveViewModel.cs

@@ -2,14 +2,14 @@
 using BPASmartClient.FoodStationTest.Model;
 using BPASmartClient.FoodStationTest.View;
 using BPASmartClient.Helper;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System.Collections.ObjectModel;
 using System.Linq;
 
 namespace BPASmartClient.FoodStationTest.ViewModel
 {
-    public class SiemensRecipeReceiveViewModel : ObservableObject
+    public class SiemensRecipeReceiveViewModel : NotifyBase
     {
         //ObservableCollection<RemoteRecipeRawMaterial> RawMaterials { get; set; } = new ObservableCollection<RemoteRecipeRawMaterial>();
         public SiemensRecipeReceiveViewModel()

BPASmartClient.FoodStationTest/ViewModel/StockBinRawMaterialViewModel.cs

@@ -4,7 +4,7 @@ using BPASmartClient.CustomResource.UserControls.MessageShow;
 using BPASmartClient.FoodStationTest.Model;
 using BPASmartClient.FoodStationTest.Model.RawMaterial;
 using BPASmartClient.Helper;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.ObjectModel;
@@ -12,7 +12,7 @@ using System.Linq;
 
 namespace BPASmartClient.FoodStationTest.ViewModel
 {
-    public class StockBinRawMaterialViewModel : ObservableObject
+    public class StockBinRawMaterialViewModel : NotifyBase
     {
         public StockBinRawMaterialViewModel()
         {

BPASmartClient.FoodStationTest/ViewModel/SystemParViewModel.cs

@@ -4,12 +4,12 @@ using BPASmartClient.FoodStationTest.Model;
 using BPASmartClient.FoodStationTest.Model.HK_PLC;
 using BPASmartClient.FoodStationTest.Model.Par;
 using BPASmartClient.Helper;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 
 namespace BPASmartClient.FoodStationTest.ViewModel
 {
-    public class SystemParViewModel : ObservableObject
+    public class SystemParViewModel : NotifyBase
     {
         public SystemParViewModel()
         {

BPASmartClient.IoT/BPASmartClient.IoT.csproj

@@ -18,7 +18,6 @@
 
 	<ItemGroup>
 		<ProjectReference Include="..\BPASmartClient.Business\BPASmartClient.Business.csproj" />
-		<ProjectReference Include="..\BPASmartClient.Helper\BPASmartClient.Helper.csproj" />
 	</ItemGroup>
 
 </Project>

BPASmartClient.JXJFoodBigStation/BPASmartClient.JXJFoodBigStation.csproj

@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Communication" Version="1.0.36" />
+    <PackageReference Include="BPA.Communication" Version="1.0.106" />
   </ItemGroup>
 
   <ItemGroup>

BPASmartClient.JXJFoodBigStation/Model/DeviceCurrentStatus.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 
 namespace BPASmartClient.JXJFoodBigStation.Model
 {
-    public class DeviceCurrentStatus : ObservableObject
+    public class DeviceCurrentStatus : NotifyBase
     {
 
         public double Weight { get { return _mWeight; } set { _mWeight = value; OnPropertyChanged(); } }

BPASmartClient.JXJFoodBigStation/Model/DeviceInfo.cs

@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace BPASmartClient.JXJFoodBigStation.Model
 {
-    internal class DeviceInfo:ObservableObject
+    internal class DeviceInfo:NotifyBase
     {
         public string IpAddress { get { return _mIpAddress; } set { _mIpAddress = value; OnPropertyChanged(); } }
         private string _mIpAddress;

BPASmartClient.JXJFoodBigStation/Model/HardWare/BomMaterial.cs

@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;

BPASmartClient.JXJFoodBigStation/Model/PlcVarMonitor.cs

@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace BPASmartClient.JXJFoodBigStation.Model
 {
-    public  class PlcVarMonitor: ObservableObject
+    public  class PlcVarMonitor: NotifyBase
     {
         private int _serialNum;
         public int SerialNum { get { return _serialNum; } set { _serialNum = value;OnPropertyChanged(); } }

BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RawMaterial.cs

@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace BPASmartClient.JXJFoodBigStation.Model
 {
-    public class RawMaterial :ObservableObject
+    public class RawMaterial :NotifyBase
     {
         private int _mIp;
         public int DeviceIp { get { return _mIp; } set { _mIp = value; OnPropertyChanged(); } }

BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RawMaterialData.cs

@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;

BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RecipeData.cs

@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace BPASmartClient.JXJFoodBigStation.Model
 {
-    public class RecipeData : ObservableObject
+    public class RecipeData : NotifyBase
     {
         /// <summary>
         /// 配方名称

BPASmartClient.JXJFoodBigStation/ViewModel/BomOfMaterialViewModel.cs

@@ -4,7 +4,7 @@ using BPASmartClient.CustomResource.UserControls.MessageShow;
 using BPASmartClient.Helper;
 using BPASmartClient.JXJFoodBigStation.Model;
 using BPASmartClient.JXJFoodBigStation.Model.HK_PLC;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.Generic;
@@ -18,7 +18,7 @@ using System.Threading.Tasks;
 
 namespace BPASmartClient.JXJFoodBigStation.ViewModel
 {
-    public class BomOfMaterialViewModel : ObservableObject
+    public class BomOfMaterialViewModel : NotifyBase
     {
         public BomOfMaterialViewModel()
         {

BPASmartClient.JXJFoodBigStation/ViewModel/ChangeDeviceNameViewModel.cs

@@ -1,6 +1,6 @@
 using BPASmartClient.CustomResource.Pages.Model;
 using BPASmartClient.Helper;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.Generic;
@@ -10,7 +10,7 @@ using System.Threading.Tasks;
 
 namespace BPASmartClient.JXJFoodBigStation.ViewModel
 {
-    internal class ChangeDeviceNameViewModel:ObservableObject
+    internal class ChangeDeviceNameViewModel:NotifyBase
     {
         private static string IpAddress = string.Empty;
 

BPASmartClient.JXJFoodBigStation/ViewModel/DeviceManageViewModel.cs

@@ -2,7 +2,7 @@
 using BPASmartClient.Helper;
 using BPASmartClient.JXJFoodBigStation.Model;
 using BPASmartClient.JXJFoodBigStation.View;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.Generic;
@@ -13,7 +13,7 @@ using System.Threading.Tasks;
 
 namespace BPASmartClient.JXJFoodBigStation.ViewModel
 {
-    internal class DeviceManageViewModel:ObservableObject
+    internal class DeviceManageViewModel:NotifyBase
     {
 
         public ObservableCollection<DeviceInfo> Devices { get; set; } = new ObservableCollection<DeviceInfo>() { new DeviceInfo { DeviceName = "123", IpAddress = "123.213.123.213." } };

BPASmartClient.JXJFoodBigStation/ViewModel/HKPlcCommMonitorViewModel.cs

@@ -1,7 +1,7 @@
 using BPASmartClient.Helper;
 using BPASmartClient.JXJFoodBigStation.Model;
 using BPASmartClient.JXJFoodBigStation.Model.HK_PLC;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.Generic;
@@ -15,7 +15,7 @@ using System.Threading.Tasks;
 
 namespace BPASmartClient.JXJFoodBigStation.ViewModel
 {
-    public class HKPlcCommMonitorViewModel:ObservableObject
+    public class HKPlcCommMonitorViewModel:NotifyBase
     {
         public HKPlcCommMonitorViewModel()
         {

BPASmartClient.JXJFoodBigStation/ViewModel/HardwareStatusViewModel.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System.Collections.Concurrent;
 using System.Collections.ObjectModel;
 using System.Windows;
@@ -17,7 +17,7 @@ using System.Reflection;
 
 namespace BPASmartClient.JXJFoodBigStation.ViewModel
 {
-    public class HardwareStatusViewModel : ObservableObject
+    public class HardwareStatusViewModel : NotifyBase
     {
         public HardwareStatusViewModel()
         {

BPASmartClient.JXJFoodBigStation/ViewModel/ManualFlowViewModel.cs

@@ -5,7 +5,7 @@ using BPASmartClient.Helper;
 using BPASmartClient.JXJFoodBigStation.Model;
 using BPASmartClient.JXJFoodBigStation.Model.HK_PLC;
 using BPASmartClient.JXJFoodBigStation.Model.Siemens;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.Generic;
@@ -20,7 +20,7 @@ using System.Threading.Tasks;
 
 namespace BPASmartClient.JXJFoodBigStation.ViewModel
 {
-    public class ManualFlowViewModel:ObservableObject
+    public class ManualFlowViewModel:NotifyBase
     {
         public ManualFlowViewModel()
         {

BPASmartClient.JXJFoodBigStation/ViewModel/RecipeInfosViewModel.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System.Collections.ObjectModel;
 using Microsoft.Toolkit.Mvvm.Input;
 using BPASmartClient.Helper;
@@ -16,7 +16,7 @@ using BPASmartClient.CustomResource.UserControls.MessageShow;
 
 namespace BPASmartClient.JXJFoodBigStation.ViewModel
 {
-    public class RecipeInfosViewModel : ObservableObject
+    public class RecipeInfosViewModel : NotifyBase
     {
         public RecipeInfosViewModel()
         {

BPASmartClient.JXJFoodBigStation/ViewModel/RecipeReceiveViewModel.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System.Collections.Concurrent;
 using System.Collections.ObjectModel;
 using System.Windows;
@@ -21,7 +21,7 @@ using BPASmartClient.JXJFoodBigStation.Model.Siemens;
 
 namespace BPASmartClient.JXJFoodBigStation.ViewModel
 {
-    public class RecipeReceiveViewModel : ObservableObject
+    public class RecipeReceiveViewModel : NotifyBase
     {
         public ObservableCollection<RawMaterial> RawMaterials { get; set; } = new ObservableCollection<RawMaterial>();
         public RecipeReceiveViewModel()

BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs

@@ -5,7 +5,7 @@ using BPASmartClient.Helper;
 using BPASmartClient.JXJFoodBigStation.Model;
 using BPASmartClient.JXJFoodBigStation.Model.Siemens;
 using BPASmartClient.JXJFoodBigStation.View;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.Generic;
@@ -16,7 +16,7 @@ using System.Threading.Tasks;
 
 namespace BPASmartClient.JXJFoodBigStation.ViewModel
 {
-    internal class RecipeSendDownViewModel:ObservableObject
+    internal class RecipeSendDownViewModel:NotifyBase
     {
         public  ObservableCollection<RecipeData> Recipes { get; set; } = Json<LocalRecipe>.Data.Recipes;
         /// <summary>

BPASmartClient.JXJFoodBigStation/ViewModel/SelectRecipesViewModel.cs

@@ -1,7 +1,7 @@
 using BPASmartClient.CustomResource.Pages.Model;
 using BPASmartClient.Helper;
 using BPASmartClient.JXJFoodBigStation.Model;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.Generic;
@@ -12,7 +12,7 @@ using System.Threading.Tasks;
 
 namespace BPASmartClient.JXJFoodBigStation.ViewModel
 {
-    internal class SelectRecipesViewModel:ObservableObject
+    internal class SelectRecipesViewModel:NotifyBase
     {
         public SelectRecipesViewModel()
         {
@@ -100,7 +100,7 @@ namespace BPASmartClient.JXJFoodBigStation.ViewModel
         /// <summary>
         /// 一个配方数据的包装类。
         /// </summary>
-        internal class RecipeDataWithCheck:ObservableObject
+        internal class RecipeDataWithCheck:NotifyBase
         {
             public RecipeData Recipe { get; set; }
             private bool _IsSelected;

BPASmartClient.JXJFoodBigStation/ViewModel/SiemensRecipeSendDownViewModel.cs

@@ -1,7 +1,7 @@
 using BPASmartClient.Helper;
 using BPASmartClient.JXJFoodBigStation.Model;
 using BPASmartClient.JXJFoodBigStation.Model.Siemens;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.Generic;
@@ -12,7 +12,7 @@ using System.Threading.Tasks;
 
 namespace BPASmartClient.JXJFoodBigStation.ViewModel
 {
-    public class SiemensRecipeSendDownViewModel : ObservableObject
+    public class SiemensRecipeSendDownViewModel : NotifyBase
     {
         public ObservableCollection<RecipeData> Recipes { get; set; } = Json<RemoteRecipe>.Data.Recipes;
         public SiemensRecipeSendDownViewModel()

BPASmartClient.JXJFoodBigStation/ViewModel/StockBinRawMaterialViewModel.cs

@@ -4,7 +4,7 @@ using BPASmartClient.CustomResource.UserControls.MessageShow;
 using BPASmartClient.Helper;
 using BPASmartClient.JXJFoodBigStation.Model;
 using BPASmartClient.JXJFoodBigStation.Model.HK_PLC;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using System;
 using System.Collections.Generic;
@@ -18,7 +18,7 @@ using System.Threading.Tasks;
 
 namespace BPASmartClient.JXJFoodBigStation.ViewModel
 {
-    public class StockBinRawMaterialViewModel : ObservableObject
+    public class StockBinRawMaterialViewModel : NotifyBase
     {
         public StockBinRawMaterialViewModel()
         {

BPASmartClient.JXJFoodSmallStation/Model/Bom/BomMaterial.cs

@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace BPASmartClient.JXJFoodSmallStation.Model.Bom
 {
-    public class BomMaterial:ObservableObject
+    public class BomMaterial:NotifyBase
     {
         public int Count { get { return _count; } set { _count = value; OnPropertyChanged(); } }
         public int _count { get; set; }

BPASmartClient.JXJFoodSmallStation/Model/Bom/BomMaterialData.cs

@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;

BPASmartClient.JXJFoodSmallStation/Model/GVL/PlcInfos.cs

@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace BPASmartClient.JXJFoodSmallStation.Model.GVL
 {
-    public class PlcInfos: ObservableObject
+    public class PlcInfos: NotifyBase
     {
         public int Count { get { return _Count; } set { _Count = value;OnPropertyChanged(); } }
         private int _Count { get; set; }

BPASmartClient.JXJFoodSmallStation/Model/Par/ConnectParMode.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 
 namespace BPASmartClient.JXJFoodSmallStation.Model.Par
 {
-    public class ConnectParMode: ObservableObject
+    public class ConnectParMode: NotifyBase
     {
         public bool SiemensConnect { get { return _mSiemensConnect; } set { _mSiemensConnect = value; OnPropertyChanged(); } }
         private bool _mSiemensConnect;

BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/ActionMenu.cs

@@ -3,12 +3,12 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 
 namespace BPASmartClient.JXJFoodSmallStation.Model
 {
-    public class ActionMenu : ObservableObject
+    public class ActionMenu : NotifyBase
     {
         public string CommandParameter { get { return _mCommandParameter; } set { _mCommandParameter = value; OnPropertyChanged(); } }
         private string _mCommandParameter;

BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/ConveyorServer.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 
 namespace BPASmartClient.JXJFoodSmallStation.Model
 {

BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/CylinderStatusModel.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 
 namespace BPASmartClient.JXJFoodSmallStation.Model
 {
-    public class CylinderStatusModel : ObservableObject
+    public class CylinderStatusModel : NotifyBase
     {
         /// <summary>
         /// 气缸原点信号

BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceCurrentStatus.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 
 namespace BPASmartClient.JXJFoodSmallStation.Model
 {
-    public class DeviceCurrentStatus : ObservableObject
+    public class DeviceCurrentStatus : NotifyBase
     {
 
         public double Weight { get { return _mWeight; } set { _mWeight = value; OnPropertyChanged(); } }

BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DevicePar.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System.Collections.ObjectModel;
 using BPASmartClient.JXJFoodSmallStation.Model.Par;
 using BPASmartClient.JXJFoodSmallStation.Model.RawMaterial;
@@ -11,7 +11,7 @@ using BPASmartClient.JXJFoodSmallStation.Model.Bom;
 
 namespace BPASmartClient.JXJFoodSmallStation.Model
 {
-    public class DevicePar:ObservableObject
+    public class DevicePar:NotifyBase
     {
         public ObservableCollection<DeviceParMode> deviceParModels { get; set; } = new ObservableCollection<DeviceParMode>();
         public ConnectParMode deviceConnectPar { get { return _mdeviceConnectPar; } set { _mdeviceConnectPar = value; OnPropertyChanged(); } }

BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceParModel.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 
 namespace BPASmartClient.JXJFoodSmallStation.Model
 {
-    public class DeviceParMode : ObservableObject
+    public class DeviceParMode : NotifyBase
     {
 
         /// <summary>

BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/RawMaterialColl.cs

@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace BPASmartClient.JXJFoodSmallStation.Model.RawMaterial
 {
-    public class RawMaterialColl : ObservableObject
+    public class RawMaterialColl : NotifyBase
     {
         /// <summary>
         /// 原料设备IP

BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/RawMaterialStockBin.cs

@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPA.Helper;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace BPASmartClient.JXJFoodSmallStation.Model.RawMaterial
 {
-    public class RawMaterialStockBin : ObservableObject
+    public class RawMaterialStockBin : NotifyBase
     {
 
         public short RawMaterialCount { get { return _mRawMaterialCount; } set { _mRawMaterialCount = value; OnPropertyChanged(); } }