From 70ca1619753e8ed8002688506c2b5f023f9bf4ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com> Date: Thu, 15 Jun 2023 17:05:00 +0800 Subject: [PATCH] 1 --- .../BPASmartClient.Business.csproj | 4 +- .../BPASmartClient.CustomResource.csproj | 3 +- .../Pages/Model/MenuManage.cs | 8 +- .../Pages/Model/PlcVariableInfoManage.cs | 4 +- .../Pages/Model/PlcVariableInfoModel.cs | 4 +- .../Pages/Model/RecipeCompleteLog.cs | 4 +- .../Pages/Model/ReportBase.cs | 4 +- .../Pages/Model/ReportTestModel.cs | 2 +- .../Pages/Model/RunLog.cs | 4 +- .../Pages/Model/UserInfo.cs | 4 +- .../Pages/Model/UserLog.cs | 4 +- .../Pages/Model/UserTreeViewModel.cs | 4 +- .../Pages/ViewModel/AddNewUserViewModel.cs | 4 +- .../Pages/ViewModel/AlarmViewModel.cs | 11 +- .../Pages/ViewModel/DebugLogViewModel.cs | 6 +- .../Pages/ViewModel/LoginViewModel.cs | 4 +- .../Pages/ViewModel/MainViewModel.cs | 4 +- .../Pages/ViewModel/NfcSetViewModel.cs | 6 +- .../ViewModel/PasswordChangeViewModel.cs | 4 +- .../PermissionConfigurationViewModel.cs | 4 +- .../ViewModel/ProductionDataViewModel.cs | 4 +- .../ViewModel/RecipeCompleteViewModel.cs | 4 +- .../Pages/ViewModel/ReportViewModel.cs | 2 +- .../Pages/ViewModel/RunLogViewModel.cs | 4 +- .../Pages/ViewModel/UserConfigViewModel.cs | 4 +- .../Pages/ViewModel/UserLogViewModel.cs | 4 +- .../Pages/ViewModel/UserManageViewModel.cs | 4 +- .../Pages/ViewModel/VariableViewModel.cs | 4 +- .../BPASmartClient.Device.csproj | 1 - BPASmartClient.Device/BaseDevice.cs | 4 +- BPASmartClient.Device/IDevice.cs | 2 +- BPASmartClient.Device/VariableMonitor.cs | 4 +- .../BPASmartClient.DosingSystemSingle.csproj | 2 +- .../BPASmartClient.EventBus.csproj | 4 - .../BPASmartClient.FoodStationTest.csproj | 2 +- .../Model/Bom/BomMaterial.cs | 4 +- .../Model/GVL/PlcInfos.cs | 4 +- .../Model/Par/ConnectParMode.cs | 4 +- .../Model/RawMaterial/DeviceCurrentStatus.cs | 4 +- .../Model/RawMaterial/DevicePar.cs | 4 +- .../Model/RawMaterial/DeviceParModel.cs | 4 +- .../Model/RawMaterial/RawMaterialColl.cs | 4 +- .../Model/RawMaterial/RawMaterialStockBin.cs | 4 +- .../Model/RawMaterial/RecipeModel.cs | 4 +- .../Model/Recipe/RemoteRecipeData.cs | 4 +- .../Model/Recipe/RemoteRecipeRawMaterial.cs | 4 +- .../ViewModel/BomOfMaterialViewModel.cs | 4 +- .../ViewModel/ChangeDeviceNameViewModel.cs | 4 +- .../ViewModel/DeviceListViewModel.cs | 6 +- .../ViewModel/DeviceMaterialParViewModel.cs | 4 +- .../ViewModel/HardwareStatusViewModel.cs | 4 +- .../ViewModel/ManualCommViewModel.cs | 4 +- .../ViewModel/ManualControlViewModel.cs | 6 +- .../ViewModel/ManualFlowViewModel.cs | 4 +- .../ViewModel/NewLocalRecipeViewModel.cs | 4 +- .../ViewModel/NewMaterialViewModel.cs | 4 +- .../ViewModel/NewRecipeViewModel.cs | 4 +- .../ViewModel/PlcVarMonitorViewModel.cs | 4 +- .../ViewModel/ProcessMonitorViewModel.cs | 4 +- .../ViewModel/RecipeControlViewModel.cs | 4 +- .../ViewModel/RecipeInfosViewModel.cs | 4 +- .../ViewModel/RecipeReceiveViewModel.cs | 4 +- .../ViewModel/RecipeSettingsViewModel.cs | 4 +- .../ViewModel/SelectRecipesViewModel.cs | 6 +- .../SiemensRecipeReceiveViewModel.cs | 4 +- .../ViewModel/StockBinRawMaterialViewModel.cs | 4 +- .../ViewModel/SystemParViewModel.cs | 4 +- BPASmartClient.IoT/BPASmartClient.IoT.csproj | 1 - .../BPASmartClient.JXJFoodBigStation.csproj | 2 +- .../Model/DeviceCurrentStatus.cs | 4 +- .../Model/DeviceInfo.cs | 4 +- .../Model/HardWare/BomMaterial.cs | 2 +- .../Model/PlcVarMonitor.cs | 4 +- .../Model/RawMaterial/RawMaterial.cs | 4 +- .../Model/RawMaterial/RawMaterialData.cs | 2 +- .../Model/RawMaterial/RecipeData.cs | 4 +- .../ViewModel/BomOfMaterialViewModel.cs | 4 +- .../ViewModel/ChangeDeviceNameViewModel.cs | 4 +- .../ViewModel/DeviceManageViewModel.cs | 4 +- .../ViewModel/HKPlcCommMonitorViewModel.cs | 4 +- .../ViewModel/HardwareStatusViewModel.cs | 4 +- .../ViewModel/ManualFlowViewModel.cs | 4 +- .../ViewModel/RecipeInfosViewModel.cs | 4 +- .../ViewModel/RecipeReceiveViewModel.cs | 4 +- .../ViewModel/RecipeSendDownViewModel.cs | 4 +- .../ViewModel/SelectRecipesViewModel.cs | 6 +- .../SiemensRecipeSendDownViewModel.cs | 4 +- .../ViewModel/StockBinRawMaterialViewModel.cs | 4 +- .../Model/Bom/BomMaterial.cs | 4 +- .../Model/Bom/BomMaterialData.cs | 2 +- .../Model/GVL/PlcInfos.cs | 4 +- .../Model/Par/ConnectParMode.cs | 4 +- .../Model/RawMaterial/ActionMenu.cs | 4 +- .../Model/RawMaterial/ConveyorServer.cs | 2 +- .../Model/RawMaterial/CylinderStatusModel.cs | 4 +- .../Model/RawMaterial/DeviceCurrentStatus.cs | 4 +- .../Model/RawMaterial/DevicePar.cs | 4 +- .../Model/RawMaterial/DeviceParModel.cs | 4 +- .../Model/RawMaterial/RawMaterialColl.cs | 4 +- .../Model/RawMaterial/RawMaterialStockBin.cs | 4 +- .../Model/RawMaterial/RecipeModel.cs | 4 +- .../Model/RawMaterial/RecipeProcess.cs | 4 +- .../Model/Siemens/NewRemoteRecipeModel.cs | 4 +- .../Model/Siemens/RemoteRecipeData.cs | 4 +- .../Model/Siemens/RemoteRecipeRawMaterial.cs | 4 +- .../Model/WindSend/WindSendDeviceParMode.cs | 4 +- .../Model/WindSend/WindSendRawMaterial.cs | 4 +- .../ViewModel/BomOfMaterialViewModel.cs | 4 +- .../ViewModel/ChangeDeviceNameViewModel.cs | 4 +- .../ViewModel/DeviceListViewModel.cs | 6 +- .../ViewModel/DeviceMaterialParViewModel.cs | 4 +- .../ViewModel/HardwareStatusViewModel.cs | 4 +- .../ViewModel/ManualCommViewModel.cs | 4 +- .../ViewModel/ManualControlViewModel.cs | 6 +- .../ViewModel/ManualFlowViewModel.cs | 4 +- .../ViewModel/NewLocalRecipeViewModel.cs | 4 +- .../ViewModel/NewMaterialViewModel.cs | 4 +- .../ViewModel/NewRecipeViewModel.cs | 4 +- .../ViewModel/PlcVarMonitorViewModel.cs | 4 +- .../ViewModel/ProcessMonitorViewModel.cs | 4 +- .../ViewModel/RecipeControlViewModel.cs | 4 +- .../ViewModel/RecipeInfosViewModel.cs | 4 +- .../ViewModel/RecipeReceiveViewModel.cs | 4 +- .../ViewModel/RecipeSettingsViewModel.cs | 4 +- .../ViewModel/RobotViewModel.cs | 4 +- .../ViewModel/SelectRecipesViewModel.cs | 6 +- .../SiemensRecipeReceiveViewModel.cs | 4 +- .../ViewModel/StockBinRawMaterialViewModel.cs | 4 +- .../ViewModel/SystemParViewModel.cs | 4 +- .../ViewModel/WindSendParViewModel.cs | 4 +- .../BPASmartClient.JakaRobot.csproj | 3 +- BPASmartClient.JakaRobot/JaKaHelper.cs | 3 +- .../BPASmartClient.Lebai.csproj | 3 - .../BPASmartClient.LebaiRobot.csproj | 1 - .../BPASmartClient.PLC.csproj | 3 - .../BPASmartClient.MQTT.csproj | 5 - BPASmartClient.MQTT/MQTTProxy.cs | 12 +- BPASmartClient.MQTT/MqttHelper.cs | 182 -------- .../BPASmartClient.MilkWithTea.csproj | 2 - .../ViewModel/LocalConfigureViewModel.cs | 2 +- .../ViewModel/MainControlViewModel.cs | 2 +- .../ViewModel/MainWindowVeiwModel.cs | 4 +- .../ViewModel/PatrameterSettiongViewModel.cs | 2 +- .../ViewModel/RecipeConfigeViewModel.cs | 2 +- .../BPASmartClient.Modbus.csproj | 6 +- BPASmartClient.Modbus/ModbusTcp.cs | 18 +- BPASmartClient.Model/Alarm.cs | 3 +- .../BPASmartClient.Model.csproj | 6 +- BPASmartClient.Model/BaseEvent.cs | 2 +- BPASmartClient.Model/Book.cs | 6 +- BPASmartClient.Model/Demo_MakeCoffeeEvent.cs | 2 +- BPASmartClient.Model/DeviceConfigModelJson.cs | 12 +- BPASmartClient.Model/GlobalUsing.cs | 7 + BPASmartClient.Model/KeepDataBase.cs | 4 +- BPASmartClient.Model/MixWinkModel.cs | 4 +- BPASmartClient.Model/OrderData.cs | 6 +- BPASmartClient.Model/大炒/FryPotMessages.cs | 4 +- .../柔性味魔方/RawMaterialModel.cs | 4 +- .../柔性味魔方/RecipeQueueModel.cs | 6 +- .../柔性味魔方/RecipeStates.cs | 4 +- .../ViewModel/MonitorViewModel.cs | 2 +- .../ViewModel/DebugViewModel.cs | 4 +- .../ViewModel/LocalMenuViewModel.cs | 4 +- .../ViewModel/MaterialCalibrationViewModel.cs | 4 +- BPASmartClient.MorkM/Model/MorksPar.cs | 2 +- .../ViewModel/DebugViewModel.cs | 4 +- .../ViewModel/MonitorViewModel.cs | 4 +- .../ViewModel/ParSetViewModel.cs | 4 +- .../ViewModel/SimOrderConfitViewModel.cs | 4 +- BPASmartClient.MorkMOC/Model/LocalMaterail.cs | 6 +- .../BPASmartClient.MorkMV1.csproj | 1 - BPASmartClient.MorkMV1/Model/MorksPar.cs | 2 +- .../ViewModel/DebugViewModel.cs | 4 +- .../ViewModel/MonitorViewModel.cs | 4 +- .../ViewModel/ParSetViewModel.cs | 4 +- BPASmartClient.MorkMW/Model/VaribleModel.cs | 4 +- .../ViewModel/DebugViewModel.cs | 4 +- .../ViewModel/MonitorViewModel.cs | 4 +- .../BPASmartClient.MorkS.csproj | 1 - BPASmartClient.MorkS/Model/MorksPar.cs | 2 +- .../ViewModel/DebugViewModel.cs | 4 +- .../ViewModel/MonitorViewModel.cs | 4 +- .../ViewModel/ParSetViewModel.cs | 4 +- .../BPASmartClient.MorkS3.csproj | 1 - BPASmartClient.MorkS3/Model/MorksPar.cs | 2 +- .../ViewModel/DebugViewModel.cs | 4 +- .../ViewModel/MonitorViewModel.cs | 4 +- .../ViewModel/ParSetViewModel.cs | 4 +- .../BPASmartClient.MorkSUpgradedVer.csproj | 1 - .../Model/MorksPar.cs | 2 +- .../ViewModel/DebugViewModel.cs | 4 +- .../ViewModel/MonitorViewModel.cs | 4 +- .../ViewModel/ParSetViewModel.cs | 4 +- .../ViewModel/DebugViewModel.cs | 4 +- .../ViewModel/MonitorViewModel.cs | 4 +- .../ViewModel/DebugViewModel.cs | 4 +- .../ViewModel/MonitorViewModel.cs | 4 +- .../Model/LocalTeaWithMilkConfig.cs | 8 +- .../ViewModel/DebugViewModel.cs | 4 +- .../ViewModel/RecipeViewModel.cs | 4 +- .../ViewModel/DebugViewModel.cs | 4 +- .../ViewModel/DebugViewModel.cs | 4 +- .../ViewModel/TestViewModel.cs | 4 +- .../ViewModel/DebugViewModel.cs | 4 +- .../ViewModel/DebugViewModel.cs | 4 +- .../ViewModel/MonitorViewModel.cs | 4 +- .../ViewModel/DebugViewModel.cs | 4 +- .../ViewModel/MonitorViewModel.cs | 4 +- BPASmartClient.Nfc/BPASmartClient.Nfc.csproj | 3 +- BPASmartClient.Nfc/NFCHelper.cs | 7 +- .../BPASmartClient.S7Net.csproj | 1 + .../BPASmartClient.SerialPort.csproj | 5 +- BPASmartClient.SerialPort/GlobalUsing.cs | 7 + BPASmartClient.SerialPort/IceMakerHelper.cs | 3 +- BPASmartClient.SerialPort/JuicerHelper.cs | 7 +- BPASmartClient.SerialPort/MCUSerialHelper.cs | 2 +- .../RobotGripperHelper.cs | 17 +- BPASmartClient.SerialPort/SerialPortClient.cs | 14 +- .../BPASmartClient.SmallBatchingSystem.csproj | 4 +- .../Models/BaseModel.cs | 4 +- .../Models/OutletInfoModel.cs | 4 +- .../Models/RecipeInfo.cs | 4 +- .../Models/RecipeRawMaterialInfo.cs | 4 +- .../Models/RecipeStatus.cs | 4 +- .../Models/SiloInfoModel.cs | 4 +- .../ViewModels/NewOutletViewModel.cs | 4 +- .../ViewModels/NewRecipeViewModel.cs | 2 +- .../ViewModels/NewSiloViewModel.cs | 2 +- .../ViewModels/OutletManagementViewModel.cs | 2 +- .../ViewModels/RecipeControlViewModel.cs | 4 +- .../ViewModels/RecipeViewModel.cs | 2 +- .../ViewModels/SiloManagementViewModel.cs | 2 +- BPASmartClient.TourismCollege/App.xaml.cs | 1 - .../BPASmartClient.TourismCollege.csproj | 2 +- .../BPASmartClient.Update.csproj | 2 +- .../AdminstratorsViewModel.cs | 4 +- BPASmartClient.ViewModel/AlarmViewModel.cs | 4 +- .../BPASmartClient.ViewModel.csproj | 3 +- BPASmartClient.ViewModel/DataVViewModel.cs | 4 +- BPASmartClient.ViewModel/DebugViewModel.cs | 4 +- .../DeviceMonitorViewModel.cs | 8 +- BPASmartClient.ViewModel/FoodMenuViewModel.cs | 4 +- .../LogOrAlarmIOTViewModel.cs | 6 +- .../LogOrAlarmViewModel.cs | 4 +- BPASmartClient.ViewModel/LogViewModel.cs | 6 +- BPASmartClient.ViewModel/MainViewModel.cs | 6 +- .../NewShopWindowModel.cs | 4 +- .../OrderListDialogViewModel.cs | 4 +- .../OrderStatusViewModel.cs | 4 +- .../ShopDeviceConfigViewModel.cs | 4 +- .../SystemSetViewModel.cs | 4 +- .../BPASmartClient.DosingSystem.csproj | 2 +- .../FryPotStatus/PotFiveStatus.cs | 2 +- .../FryPotStatus/PotFourStatus.cs | 2 +- .../FryPotStatus/PotOneStatus.cs | 2 +- .../FryPotStatus/PotThreeStatus.cs | 2 +- .../FryPotStatus/PotTwoStatus.cs | 2 +- .../FryPot_DosingSystem.csproj | 1 - FryPot_DosingSystem/Model/ActionMenu.cs | 4 +- FryPot_DosingSystem/Model/DeviceInfo.cs | 4 +- FryPot_DosingSystem/Model/DeviceManage.cs | 4 +- .../Model/FlowProcessManage.cs | 4 +- FryPot_DosingSystem/Model/FlowProcessModel.cs | 4 +- FryPot_DosingSystem/Model/FlowProcessNames.cs | 4 +- FryPot_DosingSystem/Model/FryPotInfoManage.cs | 4 +- FryPot_DosingSystem/Model/LogModel.cs | 4 +- FryPot_DosingSystem/Model/MaterialNames.cs | 4 +- FryPot_DosingSystem/Model/MaterialType.cs | 4 +- FryPot_DosingSystem/Model/RecipeManage.cs | 4 +- FryPot_DosingSystem/Model/RecipeModel.cs | 4 +- .../Model/RollerLineBarrelSerialModel.cs | 4 +- .../Model/VariableMonitorModel.cs | 4 +- .../ViewModel/AdministratorLoginViewModel.cs | 4 +- FryPot_DosingSystem/ViewModel/AgvViewModel.cs | 14 +- .../ViewModel/CopyInfoViewModel.cs | 4 +- .../ViewModel/DebugViewModel.cs | 4 +- .../ViewModel/DeviceListViewModel.cs | 4 +- .../ViewModel/FlowProcessSetViewModel.cs | 4 +- .../ViewModel/FryPotMonitorViewModel.cs | 4 +- .../ViewModel/HardWareStatusViewModel.cs | 4 +- .../ViewModel/LabelPrintViewModel.cs | 4 +- FryPot_DosingSystem/ViewModel/LogViewModel.cs | 4 +- .../ViewModel/MainViewModel.cs | 4 +- .../ViewModel/NewFryPotMaterialViewModel.cs | 4 +- .../ViewModel/NewRecipeViewModel.cs | 4 +- .../ViewModel/RecipeSetDownViewModel.cs | 4 +- .../ViewModel/RecipeSetViewModel.cs | 4 +- .../ViewModel/SqliteDataViewModel.cs | 4 +- .../ViewModel/UserManageViewModel.cs | 4 +- SmartClient.sln | 424 ------------------ TestDemo/TestDemo.csproj | 1 - WPFDemo/Bb/ViewModel.cs | 4 +- WPFDemo/Class1.cs | 4 +- WPFDemo/TheListBox.xaml.cs | 6 +- WPFDemo/WPFDemo.csproj | 1 - WPFDemo/Window2.xaml.cs | 2 +- 296 files changed, 569 insertions(+), 1226 deletions(-) delete mode 100644 BPASmartClient.MQTT/MqttHelper.cs create mode 100644 BPASmartClient.Model/GlobalUsing.cs create mode 100644 BPASmartClient.SerialPort/GlobalUsing.cs diff --git a/BPASmartClient.Business/BPASmartClient.Business.csproj b/BPASmartClient.Business/BPASmartClient.Business.csproj index 0d77ddd4..c64d8727 100644 --- a/BPASmartClient.Business/BPASmartClient.Business.csproj +++ b/BPASmartClient.Business/BPASmartClient.Business.csproj @@ -8,7 +8,7 @@ - + @@ -17,10 +17,8 @@ - - diff --git a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj index bf927934..a3987b96 100644 --- a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj +++ b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj @@ -459,14 +459,13 @@ - + - diff --git a/BPASmartClient.CustomResource/Pages/Model/MenuManage.cs b/BPASmartClient.CustomResource/Pages/Model/MenuManage.cs index 52e0ac49..954b3535 100644 --- a/BPASmartClient.CustomResource/Pages/Model/MenuManage.cs +++ b/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 /// /// 在启动界面之前设置菜单项 /// - 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 menuModels { get; set; } = new ObservableCollection(); } - 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 { /// /// 子菜单名称 diff --git a/BPASmartClient.CustomResource/Pages/Model/PlcVariableInfoManage.cs b/BPASmartClient.CustomResource/Pages/Model/PlcVariableInfoManage.cs index 80834923..784a8048 100644 --- a/BPASmartClient.CustomResource/Pages/Model/PlcVariableInfoManage.cs +++ b/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> VariablesInfo { get; set; } = new ConcurrentDictionary>(); } diff --git a/BPASmartClient.CustomResource/Pages/Model/PlcVariableInfoModel.cs b/BPASmartClient.CustomResource/Pages/Model/PlcVariableInfoModel.cs index fafe30b9..3f8ec6da 100644 --- a/BPASmartClient.CustomResource/Pages/Model/PlcVariableInfoModel.cs +++ b/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; diff --git a/BPASmartClient.CustomResource/Pages/Model/RecipeCompleteLog.cs b/BPASmartClient.CustomResource/Pages/Model/RecipeCompleteLog.cs index efbeb527..7a77fb77 100644 --- a/BPASmartClient.CustomResource/Pages/Model/RecipeCompleteLog.cs +++ b/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; } diff --git a/BPASmartClient.CustomResource/Pages/Model/ReportBase.cs b/BPASmartClient.CustomResource/Pages/Model/ReportBase.cs index baeb3623..f8703a59 100644 --- a/BPASmartClient.CustomResource/Pages/Model/ReportBase.cs +++ b/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 { } } diff --git a/BPASmartClient.CustomResource/Pages/Model/ReportTestModel.cs b/BPASmartClient.CustomResource/Pages/Model/ReportTestModel.cs index 3a0e1751..a921b9c3 100644 --- a/BPASmartClient.CustomResource/Pages/Model/ReportTestModel.cs +++ b/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 { diff --git a/BPASmartClient.CustomResource/Pages/Model/RunLog.cs b/BPASmartClient.CustomResource/Pages/Model/RunLog.cs index f3be25c3..8dc53112 100644 --- a/BPASmartClient.CustomResource/Pages/Model/RunLog.cs +++ b/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; } diff --git a/BPASmartClient.CustomResource/Pages/Model/UserInfo.cs b/BPASmartClient.CustomResource/Pages/Model/UserInfo.cs index 203d70e0..591d93d9 100644 --- a/BPASmartClient.CustomResource/Pages/Model/UserInfo.cs +++ b/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; } = "无"; diff --git a/BPASmartClient.CustomResource/Pages/Model/UserLog.cs b/BPASmartClient.CustomResource/Pages/Model/UserLog.cs index be1d0f31..5ae95b04 100644 --- a/BPASmartClient.CustomResource/Pages/Model/UserLog.cs +++ b/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; } diff --git a/BPASmartClient.CustomResource/Pages/Model/UserTreeViewModel.cs b/BPASmartClient.CustomResource/Pages/Model/UserTreeViewModel.cs index 4fb56aae..5c891e9e 100644 --- a/BPASmartClient.CustomResource/Pages/Model/UserTreeViewModel.cs +++ b/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; } diff --git a/BPASmartClient.CustomResource/Pages/ViewModel/AddNewUserViewModel.cs b/BPASmartClient.CustomResource/Pages/ViewModel/AddNewUserViewModel.cs index 3d16eea7..bfa9f346 100644 --- a/BPASmartClient.CustomResource/Pages/ViewModel/AddNewUserViewModel.cs +++ b/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; diff --git a/BPASmartClient.CustomResource/Pages/ViewModel/AlarmViewModel.cs b/BPASmartClient.CustomResource/Pages/ViewModel/AlarmViewModel.cs index 2d017446..61f1b935 100644 --- a/BPASmartClient.CustomResource/Pages/ViewModel/AlarmViewModel.cs +++ b/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.GetInstance.GetData(); + var data = Sqlite.GetInstance.GetData(); if (data != null) { HistoryAlarm.Clear(); @@ -132,8 +131,8 @@ namespace BPASmartClient.CustomResource.Pages.ViewModel private DateTime _mEndDateTime = DateTime.Now; - public static ObservableCollection AlarmInfos { get; set; } - public ObservableCollection HistoryAlarm { get; set; } = new ObservableCollection(); + public static ObservableCollection AlarmInfos { get; set; } + public ObservableCollection HistoryAlarm { get; set; } = new(); } } diff --git a/BPASmartClient.CustomResource/Pages/ViewModel/DebugLogViewModel.cs b/BPASmartClient.CustomResource/Pages/ViewModel/DebugLogViewModel.cs index 71fdd18d..c80a2a20 100644 --- a/BPASmartClient.CustomResource/Pages/ViewModel/DebugLogViewModel.cs +++ b/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; diff --git a/BPASmartClient.CustomResource/Pages/ViewModel/LoginViewModel.cs b/BPASmartClient.CustomResource/Pages/ViewModel/LoginViewModel.cs index 11f61598..c6a728b9 100644 --- a/BPASmartClient.CustomResource/Pages/ViewModel/LoginViewModel.cs +++ b/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() { diff --git a/BPASmartClient.CustomResource/Pages/ViewModel/MainViewModel.cs b/BPASmartClient.CustomResource/Pages/ViewModel/MainViewModel.cs index 6a8f6c60..adbd9894 100644 --- a/BPASmartClient.CustomResource/Pages/ViewModel/MainViewModel.cs +++ b/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() { diff --git a/BPASmartClient.CustomResource/Pages/ViewModel/NfcSetViewModel.cs b/BPASmartClient.CustomResource/Pages/ViewModel/NfcSetViewModel.cs index b1c059d1..4d92cf7a 100644 --- a/BPASmartClient.CustomResource/Pages/ViewModel/NfcSetViewModel.cs +++ b/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(); } } diff --git a/BPASmartClient.CustomResource/Pages/ViewModel/PasswordChangeViewModel.cs b/BPASmartClient.CustomResource/Pages/ViewModel/PasswordChangeViewModel.cs index acf516e9..6393f306 100644 --- a/BPASmartClient.CustomResource/Pages/ViewModel/PasswordChangeViewModel.cs +++ b/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) { diff --git a/BPASmartClient.CustomResource/Pages/ViewModel/PermissionConfigurationViewModel.cs b/BPASmartClient.CustomResource/Pages/ViewModel/PermissionConfigurationViewModel.cs index b9eb013c..6e29a5cc 100644 --- a/BPASmartClient.CustomResource/Pages/ViewModel/PermissionConfigurationViewModel.cs +++ b/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 { } diff --git a/BPASmartClient.CustomResource/Pages/ViewModel/ProductionDataViewModel.cs b/BPASmartClient.CustomResource/Pages/ViewModel/ProductionDataViewModel.cs index 36ac140b..e630da92 100644 --- a/BPASmartClient.CustomResource/Pages/ViewModel/ProductionDataViewModel.cs +++ b/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() { diff --git a/BPASmartClient.CustomResource/Pages/ViewModel/RecipeCompleteViewModel.cs b/BPASmartClient.CustomResource/Pages/ViewModel/RecipeCompleteViewModel.cs index 787bb5b7..c1e10eed 100644 --- a/BPASmartClient.CustomResource/Pages/ViewModel/RecipeCompleteViewModel.cs +++ b/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() { diff --git a/BPASmartClient.CustomResource/Pages/ViewModel/ReportViewModel.cs b/BPASmartClient.CustomResource/Pages/ViewModel/ReportViewModel.cs index 0d3cd9d4..c768d2a6 100644 --- a/BPASmartClient.CustomResource/Pages/ViewModel/ReportViewModel.cs +++ b/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; diff --git a/BPASmartClient.CustomResource/Pages/ViewModel/RunLogViewModel.cs b/BPASmartClient.CustomResource/Pages/ViewModel/RunLogViewModel.cs index 971f34f1..78e73db4 100644 --- a/BPASmartClient.CustomResource/Pages/ViewModel/RunLogViewModel.cs +++ b/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() { diff --git a/BPASmartClient.CustomResource/Pages/ViewModel/UserConfigViewModel.cs b/BPASmartClient.CustomResource/Pages/ViewModel/UserConfigViewModel.cs index 5324af4c..5c399bd9 100644 --- a/BPASmartClient.CustomResource/Pages/ViewModel/UserConfigViewModel.cs +++ b/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 { /// /// 页面列表集合 diff --git a/BPASmartClient.CustomResource/Pages/ViewModel/UserLogViewModel.cs b/BPASmartClient.CustomResource/Pages/ViewModel/UserLogViewModel.cs index 233491d9..3ac61b6d 100644 --- a/BPASmartClient.CustomResource/Pages/ViewModel/UserLogViewModel.cs +++ b/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() { diff --git a/BPASmartClient.CustomResource/Pages/ViewModel/UserManageViewModel.cs b/BPASmartClient.CustomResource/Pages/ViewModel/UserManageViewModel.cs index 92b33263..034bf1a7 100644 --- a/BPASmartClient.CustomResource/Pages/ViewModel/UserManageViewModel.cs +++ b/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(); diff --git a/BPASmartClient.CustomResource/Pages/ViewModel/VariableViewModel.cs b/BPASmartClient.CustomResource/Pages/ViewModel/VariableViewModel.cs index 8700a458..06b58334 100644 --- a/BPASmartClient.CustomResource/Pages/ViewModel/VariableViewModel.cs +++ b/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 Variables { get; set; } = new ObservableCollection(); diff --git a/BPASmartClient.Device/BPASmartClient.Device.csproj b/BPASmartClient.Device/BPASmartClient.Device.csproj index f1da1ba7..2a88e1a7 100644 --- a/BPASmartClient.Device/BPASmartClient.Device.csproj +++ b/BPASmartClient.Device/BPASmartClient.Device.csproj @@ -12,7 +12,6 @@ - diff --git a/BPASmartClient.Device/BaseDevice.cs b/BPASmartClient.Device/BaseDevice.cs index 3ef2b91e..a82732ed 100644 --- a/BPASmartClient.Device/BaseDevice.cs +++ b/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 { diff --git a/BPASmartClient.Device/IDevice.cs b/BPASmartClient.Device/IDevice.cs index ae7aaa2d..56435b08 100644 --- a/BPASmartClient.Device/IDevice.cs +++ b/BPASmartClient.Device/IDevice.cs @@ -67,7 +67,7 @@ namespace BPASmartClient.Device /// /// 设备报警信息集合 /// - List alarms { get; set; } + List alarms { get; set; } /// /// 接口报警对象 diff --git a/BPASmartClient.Device/VariableMonitor.cs b/BPASmartClient.Device/VariableMonitor.cs index 40d3bca3..b2b35a94 100644 --- a/BPASmartClient.Device/VariableMonitor.cs +++ b/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; diff --git a/BPASmartClient.DosingSystemSingle/BPASmartClient.DosingSystemSingle.csproj b/BPASmartClient.DosingSystemSingle/BPASmartClient.DosingSystemSingle.csproj index 472a4704..3b854d7f 100644 --- a/BPASmartClient.DosingSystemSingle/BPASmartClient.DosingSystemSingle.csproj +++ b/BPASmartClient.DosingSystemSingle/BPASmartClient.DosingSystemSingle.csproj @@ -16,7 +16,7 @@ - + diff --git a/BPASmartClient.EventBus/BPASmartClient.EventBus.csproj b/BPASmartClient.EventBus/BPASmartClient.EventBus.csproj index cb005768..27ac3865 100644 --- a/BPASmartClient.EventBus/BPASmartClient.EventBus.csproj +++ b/BPASmartClient.EventBus/BPASmartClient.EventBus.csproj @@ -6,8 +6,4 @@ enable - - - - diff --git a/BPASmartClient.FoodStationTest/BPASmartClient.FoodStationTest.csproj b/BPASmartClient.FoodStationTest/BPASmartClient.FoodStationTest.csproj index d2dee7d7..93735b1f 100644 --- a/BPASmartClient.FoodStationTest/BPASmartClient.FoodStationTest.csproj +++ b/BPASmartClient.FoodStationTest/BPASmartClient.FoodStationTest.csproj @@ -16,7 +16,7 @@ - + diff --git a/BPASmartClient.FoodStationTest/Model/Bom/BomMaterial.cs b/BPASmartClient.FoodStationTest/Model/Bom/BomMaterial.cs index 7a3d72e6..ec5a7e64 100644 --- a/BPASmartClient.FoodStationTest/Model/Bom/BomMaterial.cs +++ b/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; } diff --git a/BPASmartClient.FoodStationTest/Model/GVL/PlcInfos.cs b/BPASmartClient.FoodStationTest/Model/GVL/PlcInfos.cs index dd463ec8..dbe7defe 100644 --- a/BPASmartClient.FoodStationTest/Model/GVL/PlcInfos.cs +++ b/BPASmartClient.FoodStationTest/Model/GVL/PlcInfos.cs @@ -1,11 +1,11 @@ -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; namespace BPASmartClient.FoodStationTest.Model.GVL { /// /// PLC变量信息 /// - public class PlcInfos : ObservableObject + public class PlcInfos : NotifyBase { /// /// 变量序号 diff --git a/BPASmartClient.FoodStationTest/Model/Par/ConnectParMode.cs b/BPASmartClient.FoodStationTest/Model/Par/ConnectParMode.cs index 70a4b703..ac41c0e2 100644 --- a/BPASmartClient.FoodStationTest/Model/Par/ConnectParMode.cs +++ b/BPASmartClient.FoodStationTest/Model/Par/ConnectParMode.cs @@ -1,11 +1,11 @@ -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; namespace BPASmartClient.FoodStationTest.Model.Par { /// /// 连接参数设置。 /// - public class ConnectParMode : ObservableObject + public class ConnectParMode : NotifyBase { /// /// 海科PLC是否连接 diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceCurrentStatus.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceCurrentStatus.cs index 3185c514..345698e5 100644 --- a/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceCurrentStatus.cs +++ b/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceCurrentStatus.cs @@ -1,11 +1,11 @@ -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; namespace BPASmartClient.FoodStationTest.Model { /// /// 味魔方当前状态。 /// - public class DeviceCurrentStatus : ObservableObject + public class DeviceCurrentStatus : NotifyBase { public double Weight { get { return _mWeight; } set { _mWeight = value; OnPropertyChanged(); } } diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/DevicePar.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/DevicePar.cs index 927e0316..63bd5310 100644 --- a/BPASmartClient.FoodStationTest/Model/RawMaterial/DevicePar.cs +++ b/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 deviceParModels { get; set; } = new ObservableCollection(); public ConnectParMode deviceConnectPar { get { return _mdeviceConnectPar; } set { _mdeviceConnectPar = value; OnPropertyChanged(); } } diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceParModel.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceParModel.cs index b0eb4f6d..d8f72057 100644 --- a/BPASmartClient.FoodStationTest/Model/RawMaterial/DeviceParModel.cs +++ b/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 { /// diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/RawMaterialColl.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/RawMaterialColl.cs index 9c13ebe6..77ae0c48 100644 --- a/BPASmartClient.FoodStationTest/Model/RawMaterial/RawMaterialColl.cs +++ b/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 { /// /// 原料设备IP diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/RawMaterialStockBin.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/RawMaterialStockBin.cs index 6a9195d9..0a1481a0 100644 --- a/BPASmartClient.FoodStationTest/Model/RawMaterial/RawMaterialStockBin.cs +++ b/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(); } } diff --git a/BPASmartClient.FoodStationTest/Model/RawMaterial/RecipeModel.cs b/BPASmartClient.FoodStationTest/Model/RawMaterial/RecipeModel.cs index 8832c5f5..a3196241 100644 --- a/BPASmartClient.FoodStationTest/Model/RawMaterial/RecipeModel.cs +++ b/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 /// /// 配方模块 /// - public class RecipeModel : ObservableObject + public class RecipeModel : NotifyBase { [Newtonsoft.Json.JsonIgnore] public bool IsEnable { get { return _mIsEnable; } set { _mIsEnable = value; OnPropertyChanged(); } } diff --git a/BPASmartClient.FoodStationTest/Model/Recipe/RemoteRecipeData.cs b/BPASmartClient.FoodStationTest/Model/Recipe/RemoteRecipeData.cs index fb0dae1a..91363317 100644 --- a/BPASmartClient.FoodStationTest/Model/Recipe/RemoteRecipeData.cs +++ b/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 /// /// 远程配方数据。 /// - public class RemoteRecipeData : ObservableObject + public class RemoteRecipeData : NotifyBase { /// /// 配方名称 diff --git a/BPASmartClient.FoodStationTest/Model/Recipe/RemoteRecipeRawMaterial.cs b/BPASmartClient.FoodStationTest/Model/Recipe/RemoteRecipeRawMaterial.cs index dcf20e57..587601b8 100644 --- a/BPASmartClient.FoodStationTest/Model/Recipe/RemoteRecipeRawMaterial.cs +++ b/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; diff --git a/BPASmartClient.FoodStationTest/ViewModel/BomOfMaterialViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/BomOfMaterialViewModel.cs index ce684c33..61e50ad0 100644 --- a/BPASmartClient.FoodStationTest/ViewModel/BomOfMaterialViewModel.cs +++ b/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() { diff --git a/BPASmartClient.FoodStationTest/ViewModel/ChangeDeviceNameViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/ChangeDeviceNameViewModel.cs index a5fe3b8f..5b8b4022 100644 --- a/BPASmartClient.FoodStationTest/ViewModel/ChangeDeviceNameViewModel.cs +++ b/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() { diff --git a/BPASmartClient.FoodStationTest/ViewModel/DeviceListViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/DeviceListViewModel.cs index 3c5078ca..985a4bcf 100644 --- a/BPASmartClient.FoodStationTest/ViewModel/DeviceListViewModel.cs +++ b/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 { get; set; } } - public class Devices : ObservableObject + public class Devices : NotifyBase { public int Serial { get { return _mSerial; } set { _mSerial = value; OnPropertyChanged(); } } private int _mSerial; diff --git a/BPASmartClient.FoodStationTest/ViewModel/DeviceMaterialParViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/DeviceMaterialParViewModel.cs index 7e4b59eb..9f31b67c 100644 --- a/BPASmartClient.FoodStationTest/ViewModel/DeviceMaterialParViewModel.cs +++ b/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() { diff --git a/BPASmartClient.FoodStationTest/ViewModel/HardwareStatusViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/HardwareStatusViewModel.cs index 149b50a1..4fc2f9d7 100644 --- a/BPASmartClient.FoodStationTest/ViewModel/HardwareStatusViewModel.cs +++ b/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() { diff --git a/BPASmartClient.FoodStationTest/ViewModel/ManualCommViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/ManualCommViewModel.cs index da23f01c..e072b013 100644 --- a/BPASmartClient.FoodStationTest/ViewModel/ManualCommViewModel.cs +++ b/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() { diff --git a/BPASmartClient.FoodStationTest/ViewModel/ManualControlViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/ManualControlViewModel.cs index 30d88485..e9f4a128 100644 --- a/BPASmartClient.FoodStationTest/ViewModel/ManualControlViewModel.cs +++ b/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; diff --git a/BPASmartClient.FoodStationTest/ViewModel/ManualFlowViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/ManualFlowViewModel.cs index 90a8f320..b208019c 100644 --- a/BPASmartClient.FoodStationTest/ViewModel/ManualFlowViewModel.cs +++ b/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() { diff --git a/BPASmartClient.FoodStationTest/ViewModel/NewLocalRecipeViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/NewLocalRecipeViewModel.cs index 15673100..60ca6d53 100644 --- a/BPASmartClient.FoodStationTest/ViewModel/NewLocalRecipeViewModel.cs +++ b/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() { diff --git a/BPASmartClient.FoodStationTest/ViewModel/NewMaterialViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/NewMaterialViewModel.cs index 0504b4ff..9c1bdcc8 100644 --- a/BPASmartClient.FoodStationTest/ViewModel/NewMaterialViewModel.cs +++ b/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 Materials { get; set; } = Json.Data.LocalMaterails; diff --git a/BPASmartClient.FoodStationTest/ViewModel/NewRecipeViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/NewRecipeViewModel.cs index 00e28f3e..db9c9489 100644 --- a/BPASmartClient.FoodStationTest/ViewModel/NewRecipeViewModel.cs +++ b/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() { diff --git a/BPASmartClient.FoodStationTest/ViewModel/PlcVarMonitorViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/PlcVarMonitorViewModel.cs index d61bc685..c4c40fe4 100644 --- a/BPASmartClient.FoodStationTest/ViewModel/PlcVarMonitorViewModel.cs +++ b/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() { diff --git a/BPASmartClient.FoodStationTest/ViewModel/ProcessMonitorViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/ProcessMonitorViewModel.cs index b48ec6d7..41fb224f 100644 --- a/BPASmartClient.FoodStationTest/ViewModel/ProcessMonitorViewModel.cs +++ b/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() { diff --git a/BPASmartClient.FoodStationTest/ViewModel/RecipeControlViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/RecipeControlViewModel.cs index adb38a41..73b767e1 100644 --- a/BPASmartClient.FoodStationTest/ViewModel/RecipeControlViewModel.cs +++ b/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 devices = new ConcurrentQueue(); diff --git a/BPASmartClient.FoodStationTest/ViewModel/RecipeInfosViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/RecipeInfosViewModel.cs index 52976b37..1eb92318 100644 --- a/BPASmartClient.FoodStationTest/ViewModel/RecipeInfosViewModel.cs +++ b/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() { diff --git a/BPASmartClient.FoodStationTest/ViewModel/RecipeReceiveViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/RecipeReceiveViewModel.cs index de9c66c2..05b90e33 100644 --- a/BPASmartClient.FoodStationTest/ViewModel/RecipeReceiveViewModel.cs +++ b/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 RawMaterials { get; set; } = new ObservableCollection(); public RecipeReceiveViewModel() diff --git a/BPASmartClient.FoodStationTest/ViewModel/RecipeSettingsViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/RecipeSettingsViewModel.cs index 44321559..7fd247f8 100644 --- a/BPASmartClient.FoodStationTest/ViewModel/RecipeSettingsViewModel.cs +++ b/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() { diff --git a/BPASmartClient.FoodStationTest/ViewModel/SelectRecipesViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/SelectRecipesViewModel.cs index 4e01ecc2..311b0b90 100644 --- a/BPASmartClient.FoodStationTest/ViewModel/SelectRecipesViewModel.cs +++ b/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; diff --git a/BPASmartClient.FoodStationTest/ViewModel/SiemensRecipeReceiveViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/SiemensRecipeReceiveViewModel.cs index e8ddde40..2079f036 100644 --- a/BPASmartClient.FoodStationTest/ViewModel/SiemensRecipeReceiveViewModel.cs +++ b/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 RawMaterials { get; set; } = new ObservableCollection(); public SiemensRecipeReceiveViewModel() diff --git a/BPASmartClient.FoodStationTest/ViewModel/StockBinRawMaterialViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/StockBinRawMaterialViewModel.cs index ab6f1a8c..e9d7aede 100644 --- a/BPASmartClient.FoodStationTest/ViewModel/StockBinRawMaterialViewModel.cs +++ b/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() { diff --git a/BPASmartClient.FoodStationTest/ViewModel/SystemParViewModel.cs b/BPASmartClient.FoodStationTest/ViewModel/SystemParViewModel.cs index 4cd37af0..633a38f2 100644 --- a/BPASmartClient.FoodStationTest/ViewModel/SystemParViewModel.cs +++ b/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() { diff --git a/BPASmartClient.IoT/BPASmartClient.IoT.csproj b/BPASmartClient.IoT/BPASmartClient.IoT.csproj index ac372833..862b3500 100644 --- a/BPASmartClient.IoT/BPASmartClient.IoT.csproj +++ b/BPASmartClient.IoT/BPASmartClient.IoT.csproj @@ -18,7 +18,6 @@ - diff --git a/BPASmartClient.JXJFoodBigStation/BPASmartClient.JXJFoodBigStation.csproj b/BPASmartClient.JXJFoodBigStation/BPASmartClient.JXJFoodBigStation.csproj index d487ecaa..253bf603 100644 --- a/BPASmartClient.JXJFoodBigStation/BPASmartClient.JXJFoodBigStation.csproj +++ b/BPASmartClient.JXJFoodBigStation/BPASmartClient.JXJFoodBigStation.csproj @@ -17,7 +17,7 @@ - + diff --git a/BPASmartClient.JXJFoodBigStation/Model/DeviceCurrentStatus.cs b/BPASmartClient.JXJFoodBigStation/Model/DeviceCurrentStatus.cs index 1a79f8d4..89953f08 100644 --- a/BPASmartClient.JXJFoodBigStation/Model/DeviceCurrentStatus.cs +++ b/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(); } } diff --git a/BPASmartClient.JXJFoodBigStation/Model/DeviceInfo.cs b/BPASmartClient.JXJFoodBigStation/Model/DeviceInfo.cs index 5c037145..c93f9789 100644 --- a/BPASmartClient.JXJFoodBigStation/Model/DeviceInfo.cs +++ b/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; diff --git a/BPASmartClient.JXJFoodBigStation/Model/HardWare/BomMaterial.cs b/BPASmartClient.JXJFoodBigStation/Model/HardWare/BomMaterial.cs index 6dc11273..83b16807 100644 --- a/BPASmartClient.JXJFoodBigStation/Model/HardWare/BomMaterial.cs +++ b/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; diff --git a/BPASmartClient.JXJFoodBigStation/Model/PlcVarMonitor.cs b/BPASmartClient.JXJFoodBigStation/Model/PlcVarMonitor.cs index b7e7110b..a5d4f971 100644 --- a/BPASmartClient.JXJFoodBigStation/Model/PlcVarMonitor.cs +++ b/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(); } } diff --git a/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RawMaterial.cs b/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RawMaterial.cs index 125b6ae7..c7238066 100644 --- a/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RawMaterial.cs +++ b/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(); } } diff --git a/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RawMaterialData.cs b/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RawMaterialData.cs index ac8e0844..71ddbd67 100644 --- a/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RawMaterialData.cs +++ b/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; diff --git a/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RecipeData.cs b/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RecipeData.cs index 01adfb87..206be620 100644 --- a/BPASmartClient.JXJFoodBigStation/Model/RawMaterial/RecipeData.cs +++ b/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 { /// /// 配方名称 diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/BomOfMaterialViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/BomOfMaterialViewModel.cs index 83026ba4..133db858 100644 --- a/BPASmartClient.JXJFoodBigStation/ViewModel/BomOfMaterialViewModel.cs +++ b/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() { diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/ChangeDeviceNameViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/ChangeDeviceNameViewModel.cs index 36a70bbb..bfb8a250 100644 --- a/BPASmartClient.JXJFoodBigStation/ViewModel/ChangeDeviceNameViewModel.cs +++ b/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; diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/DeviceManageViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/DeviceManageViewModel.cs index aa7b9648..0d681106 100644 --- a/BPASmartClient.JXJFoodBigStation/ViewModel/DeviceManageViewModel.cs +++ b/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 Devices { get; set; } = new ObservableCollection() { new DeviceInfo { DeviceName = "123", IpAddress = "123.213.123.213." } }; diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/HKPlcCommMonitorViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/HKPlcCommMonitorViewModel.cs index 1c4ce38a..90922942 100644 --- a/BPASmartClient.JXJFoodBigStation/ViewModel/HKPlcCommMonitorViewModel.cs +++ b/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() { diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/HardwareStatusViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/HardwareStatusViewModel.cs index cd1e96f6..e684d72a 100644 --- a/BPASmartClient.JXJFoodBigStation/ViewModel/HardwareStatusViewModel.cs +++ b/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() { diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/ManualFlowViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/ManualFlowViewModel.cs index 569f1408..b83f90d8 100644 --- a/BPASmartClient.JXJFoodBigStation/ViewModel/ManualFlowViewModel.cs +++ b/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() { diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeInfosViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeInfosViewModel.cs index 35e40295..6be12e90 100644 --- a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeInfosViewModel.cs +++ b/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() { diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeReceiveViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeReceiveViewModel.cs index e257ddd8..30a560ff 100644 --- a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeReceiveViewModel.cs +++ b/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 RawMaterials { get; set; } = new ObservableCollection(); public RecipeReceiveViewModel() diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs index 58ddc7d3..5e9d2bab 100644 --- a/BPASmartClient.JXJFoodBigStation/ViewModel/RecipeSendDownViewModel.cs +++ b/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 Recipes { get; set; } = Json.Data.Recipes; /// diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/SelectRecipesViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/SelectRecipesViewModel.cs index a223edad..79895c1f 100644 --- a/BPASmartClient.JXJFoodBigStation/ViewModel/SelectRecipesViewModel.cs +++ b/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 /// /// 一个配方数据的包装类。 /// - internal class RecipeDataWithCheck:ObservableObject + internal class RecipeDataWithCheck:NotifyBase { public RecipeData Recipe { get; set; } private bool _IsSelected; diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/SiemensRecipeSendDownViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/SiemensRecipeSendDownViewModel.cs index fd2f38f0..929ddb79 100644 --- a/BPASmartClient.JXJFoodBigStation/ViewModel/SiemensRecipeSendDownViewModel.cs +++ b/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 Recipes { get; set; } = Json.Data.Recipes; public SiemensRecipeSendDownViewModel() diff --git a/BPASmartClient.JXJFoodBigStation/ViewModel/StockBinRawMaterialViewModel.cs b/BPASmartClient.JXJFoodBigStation/ViewModel/StockBinRawMaterialViewModel.cs index 0e6767b9..ff6440c8 100644 --- a/BPASmartClient.JXJFoodBigStation/ViewModel/StockBinRawMaterialViewModel.cs +++ b/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() { diff --git a/BPASmartClient.JXJFoodSmallStation/Model/Bom/BomMaterial.cs b/BPASmartClient.JXJFoodSmallStation/Model/Bom/BomMaterial.cs index 56606358..95295864 100644 --- a/BPASmartClient.JXJFoodSmallStation/Model/Bom/BomMaterial.cs +++ b/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; } diff --git a/BPASmartClient.JXJFoodSmallStation/Model/Bom/BomMaterialData.cs b/BPASmartClient.JXJFoodSmallStation/Model/Bom/BomMaterialData.cs index d7cacf1b..b7051d4c 100644 --- a/BPASmartClient.JXJFoodSmallStation/Model/Bom/BomMaterialData.cs +++ b/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; diff --git a/BPASmartClient.JXJFoodSmallStation/Model/GVL/PlcInfos.cs b/BPASmartClient.JXJFoodSmallStation/Model/GVL/PlcInfos.cs index 472a0ef7..642db102 100644 --- a/BPASmartClient.JXJFoodSmallStation/Model/GVL/PlcInfos.cs +++ b/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; } diff --git a/BPASmartClient.JXJFoodSmallStation/Model/Par/ConnectParMode.cs b/BPASmartClient.JXJFoodSmallStation/Model/Par/ConnectParMode.cs index 4c57d660..2bd75c81 100644 --- a/BPASmartClient.JXJFoodSmallStation/Model/Par/ConnectParMode.cs +++ b/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; diff --git a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/ActionMenu.cs b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/ActionMenu.cs index 8b075561..e364507c 100644 --- a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/ActionMenu.cs +++ b/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; diff --git a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/ConveyorServer.cs b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/ConveyorServer.cs index f5afcca4..bbec856d 100644 --- a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/ConveyorServer.cs +++ b/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 { diff --git a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/CylinderStatusModel.cs b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/CylinderStatusModel.cs index dac384d5..7e5959b9 100644 --- a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/CylinderStatusModel.cs +++ b/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 { /// /// 气缸原点信号 diff --git a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceCurrentStatus.cs b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceCurrentStatus.cs index 20626973..69dec0d5 100644 --- a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceCurrentStatus.cs +++ b/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(); } } diff --git a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DevicePar.cs b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DevicePar.cs index c8facaf5..e70ba353 100644 --- a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DevicePar.cs +++ b/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 deviceParModels { get; set; } = new ObservableCollection(); public ConnectParMode deviceConnectPar { get { return _mdeviceConnectPar; } set { _mdeviceConnectPar = value; OnPropertyChanged(); } } diff --git a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceParModel.cs b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceParModel.cs index c49c30e1..fda0621c 100644 --- a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceParModel.cs +++ b/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 { /// diff --git a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/RawMaterialColl.cs b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/RawMaterialColl.cs index 6202116d..236ce658 100644 --- a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/RawMaterialColl.cs +++ b/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 { /// /// 原料设备IP diff --git a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/RawMaterialStockBin.cs b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/RawMaterialStockBin.cs index 1cd90b17..17fd335b 100644 --- a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/RawMaterialStockBin.cs +++ b/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(); } } diff --git a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/RecipeModel.cs b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/RecipeModel.cs index c9569711..17789bf9 100644 --- a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/RecipeModel.cs +++ b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/RecipeModel.cs @@ -7,14 +7,14 @@ using System.Threading; using System.Threading.Tasks; using BPASmartClient.JXJFoodSmallStation.Model.RawMaterial; using BPASmartClient.Model; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; namespace BPASmartClient.JXJFoodSmallStation.Model { /// /// 配方模块 /// - public class RecipeModel : ObservableObject + public class RecipeModel : NotifyBase { [Newtonsoft.Json.JsonIgnore] public bool IsEnable { get { return _mIsEnable; } set { _mIsEnable = value; OnPropertyChanged(); } } diff --git a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/RecipeProcess.cs b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/RecipeProcess.cs index 053cf5d2..065795ee 100644 --- a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/RecipeProcess.cs +++ b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/RecipeProcess.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 RecipeProcess : ObservableObject + public class RecipeProcess : NotifyBase { public string RawMaterialName { get { return _mRawMaterialName; } set { _mRawMaterialName = value; OnPropertyChanged(); } } private string _mRawMaterialName; diff --git a/BPASmartClient.JXJFoodSmallStation/Model/Siemens/NewRemoteRecipeModel.cs b/BPASmartClient.JXJFoodSmallStation/Model/Siemens/NewRemoteRecipeModel.cs index 568471d7..e8cef8c1 100644 --- a/BPASmartClient.JXJFoodSmallStation/Model/Siemens/NewRemoteRecipeModel.cs +++ b/BPASmartClient.JXJFoodSmallStation/Model/Siemens/NewRemoteRecipeModel.cs @@ -1,5 +1,5 @@ //using BPA.Helper; -//using Microsoft.Toolkit.Mvvm.ComponentModel; +//using BPA.Helper; //using System; //using System.Collections.Generic; //using System.Linq; @@ -8,7 +8,7 @@ //namespace BPASmartClient.JXJFoodSmallStation.Model //{ -// public class NewRemoteRecipeModel : ObservableObject +// public class NewRemoteRecipeModel : NotifyBase // { // /// // /// 原料名称 diff --git a/BPASmartClient.JXJFoodSmallStation/Model/Siemens/RemoteRecipeData.cs b/BPASmartClient.JXJFoodSmallStation/Model/Siemens/RemoteRecipeData.cs index ed82b7d0..29e8de7c 100644 --- a/BPASmartClient.JXJFoodSmallStation/Model/Siemens/RemoteRecipeData.cs +++ b/BPASmartClient.JXJFoodSmallStation/Model/Siemens/RemoteRecipeData.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.JXJFoodSmallStation.Model { - public class RemoteRecipeData:ObservableObject + public class RemoteRecipeData:NotifyBase { /// /// 配方名称 diff --git a/BPASmartClient.JXJFoodSmallStation/Model/Siemens/RemoteRecipeRawMaterial.cs b/BPASmartClient.JXJFoodSmallStation/Model/Siemens/RemoteRecipeRawMaterial.cs index cf39f5f0..0d5d33c5 100644 --- a/BPASmartClient.JXJFoodSmallStation/Model/Siemens/RemoteRecipeRawMaterial.cs +++ b/BPASmartClient.JXJFoodSmallStation/Model/Siemens/RemoteRecipeRawMaterial.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 { - public class RemoteRecipeRawMaterial:ObservableObject + public class RemoteRecipeRawMaterial:NotifyBase { public int DeviceIp { get { return _mIp; } set { _mIp = value; }} private int _mIp; diff --git a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendDeviceParMode.cs b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendDeviceParMode.cs index 28f0c30b..5c46de5e 100644 --- a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendDeviceParMode.cs +++ b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendDeviceParMode.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 WindSendDeviceParMode : ObservableObject + public class WindSendDeviceParMode : NotifyBase { /// /// 原料名称 diff --git a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendRawMaterial.cs b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendRawMaterial.cs index 2b9f1a54..74374201 100644 --- a/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendRawMaterial.cs +++ b/BPASmartClient.JXJFoodSmallStation/Model/WindSend/WindSendRawMaterial.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 { - public class WindSendRawMaterial:ObservableObject + public class WindSendRawMaterial:NotifyBase { public int DeviceIp { get { return _mIp; } set { _mIp = value; }} private int _mIp; diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/BomOfMaterialViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/BomOfMaterialViewModel.cs index f4b0ac47..ae0fcb3f 100644 --- a/BPASmartClient.JXJFoodSmallStation/ViewModel/BomOfMaterialViewModel.cs +++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/BomOfMaterialViewModel.cs @@ -5,7 +5,7 @@ using BPASmartClient.Helper; using BPASmartClient.JXJFoodSmallStation.Model; using BPASmartClient.JXJFoodSmallStation.Model.Bom; using BPASmartClient.JXJFoodSmallStation.Model.HK_PLC; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; using System; using System.Collections.Generic; @@ -19,7 +19,7 @@ using System.Threading.Tasks; namespace BPASmartClient.JXJFoodSmallStation.ViewModel { - public class BomOfMaterialViewModel : ObservableObject + public class BomOfMaterialViewModel : NotifyBase { public BomOfMaterialViewModel() { diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/ChangeDeviceNameViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/ChangeDeviceNameViewModel.cs index 6ad49a2f..4966849d 100644 --- a/BPASmartClient.JXJFoodSmallStation/ViewModel/ChangeDeviceNameViewModel.cs +++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/ChangeDeviceNameViewModel.cs @@ -5,13 +5,13 @@ using System.Text; using System.Threading.Tasks; using BPASmartClient.Helper; using BPASmartClient.JXJFoodSmallStation.Model; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; using BPASmartClient.CustomResource.Pages.Model; namespace BPASmartClient.JXJFoodSmallStation.ViewModel { - public class ChangeDeviceNameViewModel : ObservableObject + public class ChangeDeviceNameViewModel : NotifyBase { public ChangeDeviceNameViewModel() { diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/DeviceListViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/DeviceListViewModel.cs index b65b5a79..b74b92a1 100644 --- a/BPASmartClient.JXJFoodSmallStation/ViewModel/DeviceListViewModel.cs +++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/DeviceListViewModel.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; @@ -14,7 +14,7 @@ using BPASmartClient.JXJFoodSmallStation.Model; namespace BPASmartClient.JXJFoodSmallStation.ViewModel { - public class DeviceListViewModel : ObservableObject + public class DeviceListViewModel : NotifyBase { public DeviceListViewModel() { @@ -60,7 +60,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel public ObservableCollection devices { get; set; } } - public class Devices : ObservableObject + public class Devices : NotifyBase { public int Serial { get { return _mSerial; } set { _mSerial = value; OnPropertyChanged(); } } private int _mSerial; diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/DeviceMaterialParViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/DeviceMaterialParViewModel.cs index 16e4623d..44588490 100644 --- a/BPASmartClient.JXJFoodSmallStation/ViewModel/DeviceMaterialParViewModel.cs +++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/DeviceMaterialParViewModel.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; using BPASmartClient.Helper; @@ -15,7 +15,7 @@ using BPASmartClient.CustomResource.Pages.Model; namespace BPASmartClient.JXJFoodSmallStation.ViewModel { - public class DeviceMaterialParViewModel : ObservableObject + public class DeviceMaterialParViewModel : NotifyBase { public DeviceMaterialParViewModel() { diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/HardwareStatusViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/HardwareStatusViewModel.cs index f3d59291..908163f0 100644 --- a/BPASmartClient.JXJFoodSmallStation/ViewModel/HardwareStatusViewModel.cs +++ b/BPASmartClient.JXJFoodSmallStation/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; @@ -13,7 +13,7 @@ using BPASmartClient.JXJFoodSmallStation.Model; namespace BPASmartClient.JXJFoodSmallStation.ViewModel { - public class HardwareStatusViewModel : ObservableObject + public class HardwareStatusViewModel : NotifyBase { public HardwareStatusViewModel() { diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualCommViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualCommViewModel.cs index 1de388e5..7020fb7c 100644 --- a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualCommViewModel.cs +++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualCommViewModel.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; using BPASmartClient.Helper; @@ -16,7 +16,7 @@ using BPASmartClient.JXJFoodSmallStation.Model.HK_PLC; namespace BPASmartClient.JXJFoodSmallStation.ViewModel { - public class ManualCommViewModel : ObservableObject + public class ManualCommViewModel : NotifyBase { public ManualCommViewModel() { diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualControlViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualControlViewModel.cs index 0d7db138..b5a3fa88 100644 --- a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualControlViewModel.cs +++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualControlViewModel.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; namespace BPASmartClient.JXJFoodSmallStation.ViewModel { - public class ManualControlViewModel : ObservableObject + public class ManualControlViewModel : NotifyBase { public ManualControlViewModel() { @@ -411,7 +411,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel - public class CylinderModel : ObservableObject + public class CylinderModel : NotifyBase { public bool LeftTog { get { return _mLeftTog; } set { _mLeftTog = value; OnPropertyChanged(); } } private bool _mLeftTog; diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs index 61a5c88c..b96d1f8f 100644 --- a/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.cs +++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/ManualFlowViewModel.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; using BPASmartClient.Helper; @@ -21,7 +21,7 @@ using System.Windows; namespace BPASmartClient.JXJFoodSmallStation.ViewModel { - public class ManualFlowViewModel : ObservableObject + public class ManualFlowViewModel : NotifyBase { public ManualFlowViewModel() { diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs index f42963ee..592b9906 100644 --- a/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.cs +++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/NewLocalRecipeViewModel.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; using BPASmartClient.Helper; @@ -18,7 +18,7 @@ using BPASmartClient.CustomResource.Pages.Model; namespace BPASmartClient.JXJFoodSmallStation.ViewModel { - public class NewLocalRecipeViewModel : ObservableObject + public class NewLocalRecipeViewModel : NotifyBase { public NewLocalRecipeViewModel() { diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/NewMaterialViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/NewMaterialViewModel.cs index ff254aba..06886da4 100644 --- a/BPASmartClient.JXJFoodSmallStation/ViewModel/NewMaterialViewModel.cs +++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/NewMaterialViewModel.cs @@ -2,7 +2,7 @@ using BPASmartClient.JXJFoodSmallStation.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.Generic; @@ -13,7 +13,7 @@ using System.Threading.Tasks; namespace BPASmartClient.JXJFoodSmallStation.ViewModel; -public class NewMaterialViewModel:ObservableObject +public class NewMaterialViewModel:NotifyBase { public ObservableCollection Materials { get; set; } = Json.Data.LocalMaterails; diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/NewRecipeViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/NewRecipeViewModel.cs index a0bd5286..1a01deba 100644 --- a/BPASmartClient.JXJFoodSmallStation/ViewModel/NewRecipeViewModel.cs +++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/NewRecipeViewModel.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 Renci.SshNet.Messages; namespace BPASmartClient.JXJFoodSmallStation.ViewModel { - public class NewRecipeViewModel : ObservableObject + public class NewRecipeViewModel : NotifyBase { public NewRecipeViewModel() { diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/PlcVarMonitorViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/PlcVarMonitorViewModel.cs index 1317ea02..8c1f73a9 100644 --- a/BPASmartClient.JXJFoodSmallStation/ViewModel/PlcVarMonitorViewModel.cs +++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/PlcVarMonitorViewModel.cs @@ -1,7 +1,7 @@ using BPASmartClient.JXJFoodSmallStation.Model; using BPASmartClient.JXJFoodSmallStation.Model.GVL; using BPASmartClient.JXJFoodSmallStation.Model.HK_PLC; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -12,7 +12,7 @@ using System.Threading.Tasks; namespace BPASmartClient.JXJFoodSmallStation.ViewModel { - public class PlcVarMonitorViewModel : ObservableObject + public class PlcVarMonitorViewModel : NotifyBase { public PlcVarMonitorViewModel() { diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/ProcessMonitorViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/ProcessMonitorViewModel.cs index 5d49ee44..30965d3f 100644 --- a/BPASmartClient.JXJFoodSmallStation/ViewModel/ProcessMonitorViewModel.cs +++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/ProcessMonitorViewModel.cs @@ -1,7 +1,7 @@ using BPASmartClient.JXJFoodSmallStation.Model; using BPASmartClient.JXJFoodSmallStation.Model.GVL; using BPASmartClient.JXJFoodSmallStation.Model.HK_PLC; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -12,7 +12,7 @@ using System.Threading.Tasks; namespace BPASmartClient.JXJFoodSmallStation.ViewModel { - public class ProcessMonitorViewModel : ObservableObject + public class ProcessMonitorViewModel : NotifyBase { public ProcessMonitorViewModel() { diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeControlViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeControlViewModel.cs index 4170fcea..e2b4ddb7 100644 --- a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeControlViewModel.cs +++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeControlViewModel.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; @@ -19,7 +19,7 @@ using BPASmartClient.Model; namespace BPASmartClient.JXJFoodSmallStation.ViewModel { - public class RecipeControlViewModel : ObservableObject + public class RecipeControlViewModel : NotifyBase { ConcurrentQueue devices = new ConcurrentQueue(); diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeInfosViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeInfosViewModel.cs index 807a7733..77f466a7 100644 --- a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeInfosViewModel.cs +++ b/BPASmartClient.JXJFoodSmallStation/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; @@ -12,7 +12,7 @@ using BPASmartClient.CustomResource.Pages.Model; namespace BPASmartClient.JXJFoodSmallStation.ViewModel { - public class RecipeInfosViewModel : ObservableObject + public class RecipeInfosViewModel : NotifyBase { public RecipeInfosViewModel() { diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs index 08ccd6a3..cd77611d 100644 --- a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs +++ b/BPASmartClient.JXJFoodSmallStation/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; @@ -23,7 +23,7 @@ using BPASmartClient.JXJFoodSmallStation.View; namespace BPASmartClient.JXJFoodSmallStation.ViewModel { - public class RecipeReceiveViewModel : ObservableObject + public class RecipeReceiveViewModel : NotifyBase { //ObservableCollection RawMaterials { get; set; } = new ObservableCollection(); public RecipeReceiveViewModel() diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeSettingsViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeSettingsViewModel.cs index 3ca9c517..60501378 100644 --- a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeSettingsViewModel.cs +++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeSettingsViewModel.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.Model; namespace BPASmartClient.JXJFoodSmallStation.ViewModel { - public class RecipeSettingsViewModel : ObservableObject + public class RecipeSettingsViewModel : NotifyBase { public RecipeSettingsViewModel() { diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/RobotViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/RobotViewModel.cs index b56317e6..03cddb29 100644 --- a/BPASmartClient.JXJFoodSmallStation/ViewModel/RobotViewModel.cs +++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/RobotViewModel.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; using BPASmartClient.Helper; @@ -20,7 +20,7 @@ using BPASmartClient.CustomResource.Pages.Model; namespace BPASmartClient.JXJFoodSmallStation.ViewModel { - public class RobotViewModel : ObservableObject + public class RobotViewModel : NotifyBase { public RobotViewModel() { diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/SelectRecipesViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/SelectRecipesViewModel.cs index b5fec65e..99f743a3 100644 --- a/BPASmartClient.JXJFoodSmallStation/ViewModel/SelectRecipesViewModel.cs +++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/SelectRecipesViewModel.cs @@ -2,7 +2,7 @@ using BPASmartClient.Helper; using BPASmartClient.JXJFoodSmallStation.Model; using BPASmartClient.JXJFoodSmallStation.Model.Siemens; -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.JXJFoodSmallStation.ViewModel { - internal class SelectRecipesViewModel:ObservableObject + internal class SelectRecipesViewModel:NotifyBase { public SelectRecipesViewModel() { @@ -99,7 +99,7 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel public RelayCommand ConfirmCommand { get; set; } - internal class RecipeDataWithCheck:ObservableObject + internal class RecipeDataWithCheck:NotifyBase { public RemoteRecipeData Recipe { get; set; } private bool _IsSelected; diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/SiemensRecipeReceiveViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/SiemensRecipeReceiveViewModel.cs index f2eaae4a..e5abb37f 100644 --- a/BPASmartClient.JXJFoodSmallStation/ViewModel/SiemensRecipeReceiveViewModel.cs +++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/SiemensRecipeReceiveViewModel.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; @@ -22,7 +22,7 @@ using BPASmartClient.JXJFoodSmallStation.Model.GVL; namespace BPASmartClient.JXJFoodSmallStation.ViewModel { - public class SiemensRecipeReceiveViewModel : ObservableObject + public class SiemensRecipeReceiveViewModel : NotifyBase { //ObservableCollection RawMaterials { get; set; } = new ObservableCollection(); public SiemensRecipeReceiveViewModel() diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/StockBinRawMaterialViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/StockBinRawMaterialViewModel.cs index f37aa81f..4b82a449 100644 --- a/BPASmartClient.JXJFoodSmallStation/ViewModel/StockBinRawMaterialViewModel.cs +++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/StockBinRawMaterialViewModel.cs @@ -4,7 +4,7 @@ using BPASmartClient.CustomResource.UserControls.MessageShow; using BPASmartClient.Helper; using BPASmartClient.JXJFoodSmallStation.Model; using BPASmartClient.JXJFoodSmallStation.Model.RawMaterial; -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.JXJFoodSmallStation.ViewModel { - public class StockBinRawMaterialViewModel : ObservableObject + public class StockBinRawMaterialViewModel : NotifyBase { public StockBinRawMaterialViewModel() { diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/SystemParViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/SystemParViewModel.cs index d8a0b763..93f9a1ec 100644 --- a/BPASmartClient.JXJFoodSmallStation/ViewModel/SystemParViewModel.cs +++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/SystemParViewModel.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; using BPASmartClient.Helper; @@ -18,7 +18,7 @@ using BPASmartClient.CustomResource.Pages.Model; namespace BPASmartClient.JXJFoodSmallStation.ViewModel { - public class SystemParViewModel : ObservableObject + public class SystemParViewModel : NotifyBase { public SystemParViewModel() { diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/WindSendParViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/WindSendParViewModel.cs index 05cea152..443ea3de 100644 --- a/BPASmartClient.JXJFoodSmallStation/ViewModel/WindSendParViewModel.cs +++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/WindSendParViewModel.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; using BPASmartClient.Helper; @@ -17,7 +17,7 @@ using BPASmartClient.CustomResource.Pages.Model; namespace BPASmartClient.JXJFoodSmallStation.ViewModel { - public class WindSendParViewModel : ObservableObject + public class WindSendParViewModel : NotifyBase { public WindSendParViewModel() { diff --git a/BPASmartClient.JakaRobot/BPASmartClient.JakaRobot.csproj b/BPASmartClient.JakaRobot/BPASmartClient.JakaRobot.csproj index a21a359c..41709dc2 100644 --- a/BPASmartClient.JakaRobot/BPASmartClient.JakaRobot.csproj +++ b/BPASmartClient.JakaRobot/BPASmartClient.JakaRobot.csproj @@ -7,8 +7,7 @@ - - + diff --git a/BPASmartClient.JakaRobot/JaKaHelper.cs b/BPASmartClient.JakaRobot/JaKaHelper.cs index 046ccc43..11f899fc 100644 --- a/BPASmartClient.JakaRobot/JaKaHelper.cs +++ b/BPASmartClient.JakaRobot/JaKaHelper.cs @@ -1,5 +1,4 @@ -using BPASmartClient.Helper; -using BPASmartClient.Message; +using BPA.Helper; using System.Net; using System.Net.NetworkInformation; using System.Text; diff --git a/BPASmartClient.Lebai/BPASmartClient.Lebai.csproj b/BPASmartClient.Lebai/BPASmartClient.Lebai.csproj index c39fa1e5..6c039cec 100644 --- a/BPASmartClient.Lebai/BPASmartClient.Lebai.csproj +++ b/BPASmartClient.Lebai/BPASmartClient.Lebai.csproj @@ -7,10 +7,7 @@ - - - diff --git a/BPASmartClient.LebaiRobot/BPASmartClient.LebaiRobot.csproj b/BPASmartClient.LebaiRobot/BPASmartClient.LebaiRobot.csproj index 1ce18eb6..1f10088a 100644 --- a/BPASmartClient.LebaiRobot/BPASmartClient.LebaiRobot.csproj +++ b/BPASmartClient.LebaiRobot/BPASmartClient.LebaiRobot.csproj @@ -7,7 +7,6 @@ - diff --git a/BPASmartClient.MORKSM.BK.PLC/BPASmartClient.PLC.csproj b/BPASmartClient.MORKSM.BK.PLC/BPASmartClient.PLC.csproj index 1e34ec81..30f91fe5 100644 --- a/BPASmartClient.MORKSM.BK.PLC/BPASmartClient.PLC.csproj +++ b/BPASmartClient.MORKSM.BK.PLC/BPASmartClient.PLC.csproj @@ -7,9 +7,6 @@ - - - diff --git a/BPASmartClient.MQTT/BPASmartClient.MQTT.csproj b/BPASmartClient.MQTT/BPASmartClient.MQTT.csproj index 0bb830fa..90975c6d 100644 --- a/BPASmartClient.MQTT/BPASmartClient.MQTT.csproj +++ b/BPASmartClient.MQTT/BPASmartClient.MQTT.csproj @@ -8,9 +8,4 @@ - - - - - diff --git a/BPASmartClient.MQTT/MQTTProxy.cs b/BPASmartClient.MQTT/MQTTProxy.cs index dd3942ac..6b65e94f 100644 --- a/BPASmartClient.MQTT/MQTTProxy.cs +++ b/BPASmartClient.MQTT/MQTTProxy.cs @@ -1,14 +1,4 @@ -//using BPA.MQTTClient; -//using Microsoft.Extensions.Configuration; -//using MQTTnet.Client; -//using MQTTnet.Client; -//using MQTTnet; -//using MQTTnet.Client; -//using MQTTnet.Client.Options; -//using MQTTnet.Client.Receiving; -using BPASmartClient.Helper; -using BPASmartClient.Message; -using MQTTnet; +using MQTTnet; using MQTTnet.Client; using MQTTnet.Client.Options; using System; diff --git a/BPASmartClient.MQTT/MqttHelper.cs b/BPASmartClient.MQTT/MqttHelper.cs deleted file mode 100644 index aa7a2a0a..00000000 --- a/BPASmartClient.MQTT/MqttHelper.cs +++ /dev/null @@ -1,182 +0,0 @@ -using BPASmartClient.Helper; -using BPASmartClient.Message; -using MQTTnet; -using MQTTnet.Client; -using MQTTnet.Client.Options; -using System; -using System.Threading; - -namespace HBLConsole.Communication -{ - public class MqttHelper:Singleton - { - - private IMqttClient client; - IMqttClientOptions options; - - /// - /// MQTT 接收消息 - /// - public Action MqttReceive { get; set; } - - /// - /// MQTT 连接成功 - /// - public Action ConnectOk { get; set; } - - /// - /// 重连成功 - /// - public Action Reconnection { get; set; } - - Action UseDisconnectedAction; - - - public async void MqttInitAsync(string UserName, string pass, string IP, int port, string clientID) - { - options = new MqttClientOptionsBuilder().WithTcpServer(IP, port).WithClientId(clientID).WithCredentials(UserName, pass).Build(); - client = new MqttFactory().CreateMqttClient(); - client.UseDisconnectedHandler(c => - { - if (UseDisconnectedAction == null) - { - Reconnect(); - UseDisconnectedAction(); - } - - }).UseApplicationMessageReceivedHandler(c => - { - MqttReceive(c); - }).UseConnectedHandler((e) => - { - MessageLog.GetInstance.Show($"连接成功"); - }); - - try - { - await client.ConnectAsync(options); - } - catch (Exception ex) - { - MessageLog.GetInstance.ShowEx(ex.Message); - MessageLog.GetInstance.Show("mqtt连接失败！重连执行中"); - } - - if (client.IsConnected) - { - MessageLog.GetInstance.Show("MQTT连接成功！"); - if (ConnectOk != null) ConnectOk(); - } - } - - public async void Close() { - await client.DisconnectAsync(); - } - - private void Reconnect() - { - UseDisconnectedAction = new Action(() => - { - Thread.Sleep(2000); - while (!UniversalHelper.GetInstance().GetNetworkState()) - { - Thread.Sleep(2000); - } - MessageLog.GetInstance.Show($"断开连接"); - bool ErrorFlag = false; - while (!client.IsConnected) - { - try - { - MessageLog.GetInstance.Show($"重连中"); - client.ConnectAsync(options).Wait(); - } - catch (Exception ex) - { - if (!ErrorFlag) - { - MessageLog.GetInstance.ShowEx(ex.ToString()); - ErrorFlag = true; - } - } - Thread.Sleep(3000); - } - - if (client.IsConnected) - { - MessageLog.GetInstance.Show("MQTT重连成功！"); - if (Reconnection != null) Reconnection(); - } - UseDisconnectedAction = null; - }); - } - - /// - /// Mqtt 订阅 - /// - /// 需要订阅的主题 - public async void MqttSubscriptionAsync(string topic) - { - if (client != null) - { - if (client.IsConnected) - { - try - { - var result = await client.SubscribeAsync(new MqttTopicFilterBuilder().WithTopic(topic).WithExactlyOnceQoS().Build()); - } - catch { } - } - } - } - - /// - /// Mqtt 订阅 - /// - /// 需要订阅的主题 - public async void MqttSubscriptionAsync(string[] topic) - { - if (client != null) - { - if (client.IsConnected) - { - try - { - foreach (var item in topic) - { - var result = await client.SubscribeAsync(new MqttTopicFilterBuilder().WithTopic(item).WithExactlyOnceQoS().Build()); - } - - } - catch { } - } - } - } - - /// - /// Mqtt 发布 - /// - /// 需要发布的主题 - /// 需要发布的内容 - public async void MqttPublishAsync(string topic, string content) - { - if (client != null) - { - if (client.IsConnected) - { - - var msg = new MqttApplicationMessageBuilder().WithTopic(topic).WithPayload(content).WithExactlyOnceQoS().Build(); - try - { - var result = await client.PublishAsync(msg); - } - catch { } - } - } - } - - - - - } -} diff --git a/BPASmartClient.MilkWithTea/BPASmartClient.MilkWithTea.csproj b/BPASmartClient.MilkWithTea/BPASmartClient.MilkWithTea.csproj index 7b248a82..a835fc5a 100644 --- a/BPASmartClient.MilkWithTea/BPASmartClient.MilkWithTea.csproj +++ b/BPASmartClient.MilkWithTea/BPASmartClient.MilkWithTea.csproj @@ -30,8 +30,6 @@ - - diff --git a/BPASmartClient.MilkWithTea/ViewModel/LocalConfigureViewModel.cs b/BPASmartClient.MilkWithTea/ViewModel/LocalConfigureViewModel.cs index 21f1beca..683ce434 100644 --- a/BPASmartClient.MilkWithTea/ViewModel/LocalConfigureViewModel.cs +++ b/BPASmartClient.MilkWithTea/ViewModel/LocalConfigureViewModel.cs @@ -12,7 +12,7 @@ using System.Windows; namespace BPASmartClient.MilkWithTea.ViewModel { - partial class LocalConfigureViewModel : ObservableObject + partial class LocalConfigureViewModel : NotifyBase { #region 本地奶茶配方 /// diff --git a/BPASmartClient.MilkWithTea/ViewModel/MainControlViewModel.cs b/BPASmartClient.MilkWithTea/ViewModel/MainControlViewModel.cs index aaee4657..11ea80af 100644 --- a/BPASmartClient.MilkWithTea/ViewModel/MainControlViewModel.cs +++ b/BPASmartClient.MilkWithTea/ViewModel/MainControlViewModel.cs @@ -5,7 +5,7 @@ using BPASmartClient.Message; namespace BPASmartClient.MilkWithTea.ViewModel { - partial class MainControlViewModel: ObservableObject + partial class MainControlViewModel: NotifyBase { /// diff --git a/BPASmartClient.MilkWithTea/ViewModel/MainWindowVeiwModel.cs b/BPASmartClient.MilkWithTea/ViewModel/MainWindowVeiwModel.cs index 1c306e84..7e0d5bf3 100644 --- a/BPASmartClient.MilkWithTea/ViewModel/MainWindowVeiwModel.cs +++ b/BPASmartClient.MilkWithTea/ViewModel/MainWindowVeiwModel.cs @@ -1,4 +1,4 @@ -global using Microsoft.Toolkit.Mvvm.ComponentModel; +global using BPA.Helper; using BPASmartClient.Helper; using BPASmartClient.Model; using System; @@ -10,7 +10,7 @@ using System.Threading.Tasks; namespace BPASmartClient.MilkWithTea.ViewModel { - public class MainWindowVeiwModel : ObservableObject + public class MainWindowVeiwModel : NotifyBase { public bool AutoStart { get { return SystemHelper.GetInstance.IsAutoStart(); } set { SystemHelper.GetInstance.AutoStart(value); OnPropertyChanged(); } } diff --git a/BPASmartClient.MilkWithTea/ViewModel/PatrameterSettiongViewModel.cs b/BPASmartClient.MilkWithTea/ViewModel/PatrameterSettiongViewModel.cs index 25926a3e..ed8b0b73 100644 --- a/BPASmartClient.MilkWithTea/ViewModel/PatrameterSettiongViewModel.cs +++ b/BPASmartClient.MilkWithTea/ViewModel/PatrameterSettiongViewModel.cs @@ -13,7 +13,7 @@ using System.Threading.Tasks; namespace BPASmartClient.MilkWithTea.ViewModel { - partial class PatrameterSettiongViewModel: ObservableObject + partial class PatrameterSettiongViewModel: NotifyBase { string FileName => GLobal.deviceConfig.Count > 0 ? GLobal.deviceConfig[0].ShopName : string.Empty; diff --git a/BPASmartClient.MilkWithTea/ViewModel/RecipeConfigeViewModel.cs b/BPASmartClient.MilkWithTea/ViewModel/RecipeConfigeViewModel.cs index efd2389c..7fa3f636 100644 --- a/BPASmartClient.MilkWithTea/ViewModel/RecipeConfigeViewModel.cs +++ b/BPASmartClient.MilkWithTea/ViewModel/RecipeConfigeViewModel.cs @@ -7,7 +7,7 @@ using System.Windows.Controls; namespace BPASmartClient.MilkWithTea.ViewModel { - partial class RecipeConfigeViewModel:ObservableObject + partial class RecipeConfigeViewModel:NotifyBase { public static ObservableCollection Materails { get; set; } = new ObservableCollection(); diff --git a/BPASmartClient.Modbus/BPASmartClient.Modbus.csproj b/BPASmartClient.Modbus/BPASmartClient.Modbus.csproj index 646a09bc..00c35b6d 100644 --- a/BPASmartClient.Modbus/BPASmartClient.Modbus.csproj +++ b/BPASmartClient.Modbus/BPASmartClient.Modbus.csproj @@ -5,14 +5,10 @@ + - - - - - diff --git a/BPASmartClient.Modbus/ModbusTcp.cs b/BPASmartClient.Modbus/ModbusTcp.cs index 84ea817e..0e131012 100644 --- a/BPASmartClient.Modbus/ModbusTcp.cs +++ b/BPASmartClient.Modbus/ModbusTcp.cs @@ -1,7 +1,4 @@ -using BPASmartClient.Helper; -using BPASmartClient.Message; -//using BPASmartClient.Message; -using NModbus; +using NModbus; using System; using System.Collections.Generic; using System.Diagnostics; @@ -10,6 +7,7 @@ using System.Net.Sockets; using System.Text; using System.Threading; using System.Threading.Tasks; +using BPA.Helper; namespace BPASmartClient.Modbus { @@ -474,7 +472,7 @@ namespace BPASmartClient.Modbus //然后使用下面的代码就可以获取了 Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); var bytes = Encoding.GetEncoding("gb2312")?.GetBytes(value); - Write(StartAddress, bytes.BytesToUshorts()); + Write(StartAddress, bytes.ToUshorts()); } /// @@ -489,7 +487,7 @@ namespace BPASmartClient.Modbus if (res != null && res is ushort[] ushorts) { Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); - return Encoding.GetEncoding("gb2312")?.GetString(ushorts.UshortsToBytes()).Trim(new char[] { '\0' }); + return Encoding.GetEncoding("gb2312")?.GetString(ushorts.ToBytes()).Trim(new char[] { '\0' }); } return String.Empty; } @@ -505,7 +503,7 @@ namespace BPASmartClient.Modbus public bool SetReal(string StartAddress, float value, int Retries = 1) { var bytes = BitConverter.GetBytes(value); - return Write(StartAddress, bytes.BytesToUshorts(), Retries); + return Write(StartAddress, bytes.ToUshorts(), Retries); } /// @@ -518,7 +516,7 @@ namespace BPASmartClient.Modbus var res = Read(StartAddress, 2); if (res != null && res is ushort[] ushorts) { - return BitConverter.ToSingle(ushorts.UshortsToBytes(), 0); + return BitConverter.ToSingle(ushorts.ToBytes(), 0); } return 0; } @@ -533,7 +531,7 @@ namespace BPASmartClient.Modbus public void SetUint(string StartAddress, uint value) { var bytes = BitConverter.GetBytes(value); - Write(StartAddress, bytes.BytesToUshorts()); + Write(StartAddress, bytes.ToUshorts()); } /// @@ -546,7 +544,7 @@ namespace BPASmartClient.Modbus var res = Read(StartAddress, 2); if (res != null && res is ushort[] ushorts) { - return BitConverter.ToUInt32(ushorts.UshortsToBytes(), 0); + return BitConverter.ToUInt32(ushorts.ToBytes(), 0); } return 0; } diff --git a/BPASmartClient.Model/Alarm.cs b/BPASmartClient.Model/Alarm.cs index 6ed6a121..1f66e656 100644 --- a/BPASmartClient.Model/Alarm.cs +++ b/BPASmartClient.Model/Alarm.cs @@ -4,11 +4,10 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; -using Microsoft.Toolkit.Mvvm.ComponentModel; namespace BPASmartClient.Model { - public class Alarm : ObservableObject + public class Alarm : NotifyBase { /// /// ID diff --git a/BPASmartClient.Model/BPASmartClient.Model.csproj b/BPASmartClient.Model/BPASmartClient.Model.csproj index 1c8949a9..e4c9f72f 100644 --- a/BPASmartClient.Model/BPASmartClient.Model.csproj +++ b/BPASmartClient.Model/BPASmartClient.Model.csproj @@ -13,12 +13,8 @@ - - - - + - diff --git a/BPASmartClient.Model/BaseEvent.cs b/BPASmartClient.Model/BaseEvent.cs index bfd5714b..86d6b2fc 100644 --- a/BPASmartClient.Model/BaseEvent.cs +++ b/BPASmartClient.Model/BaseEvent.cs @@ -1,5 +1,5 @@ using BPA.Message.Enum; -using BPASmartClient.EventBus; + using System; using System.Collections.Generic; using System.Linq; diff --git a/BPASmartClient.Model/Book.cs b/BPASmartClient.Model/Book.cs index e6e5bbda..28548660 100644 --- a/BPASmartClient.Model/Book.cs +++ b/BPASmartClient.Model/Book.cs @@ -1,4 +1,4 @@ -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.Linq; @@ -12,11 +12,11 @@ namespace BPASmartClient.Model public string Name { get; set; } public string Tag { get; set; } } - public class BookEx : ObservableObject + public class BookEx : NotifyBase { public Book BookN { get; private set; } - private bool _isChecked=false; + private bool _isChecked = false; public bool IsChecked { diff --git a/BPASmartClient.Model/Demo_MakeCoffeeEvent.cs b/BPASmartClient.Model/Demo_MakeCoffeeEvent.cs index 4aa56820..16bd501f 100644 --- a/BPASmartClient.Model/Demo_MakeCoffeeEvent.cs +++ b/BPASmartClient.Model/Demo_MakeCoffeeEvent.cs @@ -1,4 +1,4 @@ -using BPASmartClient.EventBus; + using System; using System.Collections.Generic; using System.Linq; diff --git a/BPASmartClient.Model/DeviceConfigModelJson.cs b/BPASmartClient.Model/DeviceConfigModelJson.cs index 8a51ee16..b2d900f9 100644 --- a/BPASmartClient.Model/DeviceConfigModelJson.cs +++ b/BPASmartClient.Model/DeviceConfigModelJson.cs @@ -1,4 +1,4 @@ -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -12,7 +12,7 @@ namespace BPASmartClient.Model /// /// 店铺设备 /// - public class DeviceConfigModelJson : ObservableObject + public class DeviceConfigModelJson : NotifyBase { /// /// 店铺名称 @@ -35,7 +35,7 @@ namespace BPASmartClient.Model /// /// 启动模块 /// - public class DeviceModel : ObservableObject + public class DeviceModel : NotifyBase { /// /// 设备名称 @@ -72,7 +72,7 @@ namespace BPASmartClient.Model /// /// 通讯模块 /// - public class CommunicationModel : ObservableObject + public class CommunicationModel : NotifyBase { /// /// 通讯启动模块 @@ -98,7 +98,7 @@ namespace BPASmartClient.Model /// /// 通讯参数 /// - public class CommunicationPar : ObservableObject + public class CommunicationPar : NotifyBase { /// /// 选择网口通讯 @@ -164,7 +164,7 @@ namespace BPASmartClient.Model //public ObservableCollection variables { get; set; } = new ObservableCollection(); } - public class Variable : ObservableObject + public class Variable : NotifyBase { public int Id { get { return _mId; } set { _mId = value; OnPropertyChanged(); } } private int _mId; diff --git a/BPASmartClient.Model/GlobalUsing.cs b/BPASmartClient.Model/GlobalUsing.cs new file mode 100644 index 00000000..2a40cd4f --- /dev/null +++ b/BPASmartClient.Model/GlobalUsing.cs @@ -0,0 +1,7 @@ +global using System; +global using System.Collections.Generic; +global using System.Linq; +global using System.Text; +global using System.Threading.Tasks; +global using BPA.Helper; + diff --git a/BPASmartClient.Model/KeepDataBase.cs b/BPASmartClient.Model/KeepDataBase.cs index 1d4a6f54..e57b8074 100644 --- a/BPASmartClient.Model/KeepDataBase.cs +++ b/BPASmartClient.Model/KeepDataBase.cs @@ -6,11 +6,11 @@ using System.Text; using System.Threading.Tasks; using System.Collections.ObjectModel; using System.Collections.Concurrent; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; namespace BPASmartClient.Model { - public class KeepDataBase : ObservableObject + public class KeepDataBase : NotifyBase { /// /// 模拟订单数据的配置 diff --git a/BPASmartClient.Model/MixWinkModel.cs b/BPASmartClient.Model/MixWinkModel.cs index ae41ddbb..3b6cd555 100644 --- a/BPASmartClient.Model/MixWinkModel.cs +++ b/BPASmartClient.Model/MixWinkModel.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.Model { - public class MixWinkModel:ObservableObject + public class MixWinkModel:NotifyBase { private string _materialName; public string materialName { get { return _materialName; } set { _materialName = value;OnPropertyChanged(); } } diff --git a/BPASmartClient.Model/OrderData.cs b/BPASmartClient.Model/OrderData.cs index 76102096..380de9d1 100644 --- a/BPASmartClient.Model/OrderData.cs +++ b/BPASmartClient.Model/OrderData.cs @@ -6,11 +6,11 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Collections.ObjectModel; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; namespace BPASmartClient.Model { - public class OrderData : ObservableObject + public class OrderData : NotifyBase { public bool IsAllSelect { @@ -35,7 +35,7 @@ namespace BPASmartClient.Model } - public class MorkOrder : ObservableObject + public class MorkOrder : NotifyBase { public bool IsSelected { get { return _mIsSelected; } set { _mIsSelected = value; OnPropertyChanged(); } } private bool _mIsSelected = true; diff --git a/BPASmartClient.Model/大炒/FryPotMessages.cs b/BPASmartClient.Model/大炒/FryPotMessages.cs index b5ce1c8e..149bbc54 100644 --- a/BPASmartClient.Model/大炒/FryPotMessages.cs +++ b/BPASmartClient.Model/大炒/FryPotMessages.cs @@ -1,4 +1,4 @@ -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.Linq; @@ -22,7 +22,7 @@ namespace BPASmartClient.Model.大炒 public int FryOffStirTime; } - public class FryPotProcess:ObservableObject + public class FryPotProcess:NotifyBase { /// /// 步骤 diff --git a/BPASmartClient.Model/柔性味魔方/RawMaterialModel.cs b/BPASmartClient.Model/柔性味魔方/RawMaterialModel.cs index 76d6eb0e..673d005d 100644 --- a/BPASmartClient.Model/柔性味魔方/RawMaterialModel.cs +++ b/BPASmartClient.Model/柔性味魔方/RawMaterialModel.cs @@ -1,4 +1,4 @@ -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.Drawing; @@ -11,7 +11,7 @@ namespace BPASmartClient.Model /// /// 原料模块 /// - public class RawMaterialModel : ObservableObject + public class RawMaterialModel : NotifyBase { /// /// 原料名称 diff --git a/BPASmartClient.Model/柔性味魔方/RecipeQueueModel.cs b/BPASmartClient.Model/柔性味魔方/RecipeQueueModel.cs index aad82de3..926b8efc 100644 --- a/BPASmartClient.Model/柔性味魔方/RecipeQueueModel.cs +++ b/BPASmartClient.Model/柔性味魔方/RecipeQueueModel.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.Model.柔性味魔方 { - public class RecipeQueueModel :ObservableObject + public class RecipeQueueModel :NotifyBase { public string RecipeName { get{ return _recipeName; }set { _recipeName = value; OnPropertyChanged(); } } private string _recipeName; @@ -18,7 +18,7 @@ namespace BPASmartClient.Model.柔性味魔方 } - public class MaterailStates: ObservableObject + public class MaterailStates: NotifyBase { public RawMaterialModel RawMaterial { get; set; } = new RawMaterialModel(); diff --git a/BPASmartClient.Model/柔性味魔方/RecipeStates.cs b/BPASmartClient.Model/柔性味魔方/RecipeStates.cs index a1341c4f..49f3724c 100644 --- a/BPASmartClient.Model/柔性味魔方/RecipeStates.cs +++ b/BPASmartClient.Model/柔性味魔方/RecipeStates.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.Model.柔性味魔方 { - public class RecipeStates:ObservableObject + public class RecipeStates:NotifyBase { public string RecipeName { get { return _recipeName; } set { _recipeName = value; OnPropertyChanged(); } } private string _recipeName; diff --git a/BPASmartClient.MorkBF/ViewModel/MonitorViewModel.cs b/BPASmartClient.MorkBF/ViewModel/MonitorViewModel.cs index 1f800525..26257cde 100644 --- a/BPASmartClient.MorkBF/ViewModel/MonitorViewModel.cs +++ b/BPASmartClient.MorkBF/ViewModel/MonitorViewModel.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using BPASmartClient.Business; using BPASmartClient.Device; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System.Collections.ObjectModel; namespace BPASmartClient.MorkBF.ViewModel diff --git a/BPASmartClient.MorkF/ViewModel/DebugViewModel.cs b/BPASmartClient.MorkF/ViewModel/DebugViewModel.cs index 4c093fa1..c25cb6d5 100644 --- a/BPASmartClient.MorkF/ViewModel/DebugViewModel.cs +++ b/BPASmartClient.MorkF/ViewModel/DebugViewModel.cs @@ -2,7 +2,7 @@ using BPASmartClient.Device; using BPASmartClient.Helper; using BPASmartClient.MorkF.Model; -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.MorkF.ViewModel { - internal class DebugViewModel : ObservableObject + internal class DebugViewModel : NotifyBase { public bool SimOrderEnable { get { return General_Config.SimOrderAllow; } set { General_Config.SimOrderAllow = value; OnPropertyChanged(); } } /// diff --git a/BPASmartClient.MorkF/ViewModel/LocalMenuViewModel.cs b/BPASmartClient.MorkF/ViewModel/LocalMenuViewModel.cs index 67d12347..c6c2098d 100644 --- a/BPASmartClient.MorkF/ViewModel/LocalMenuViewModel.cs +++ b/BPASmartClient.MorkF/ViewModel/LocalMenuViewModel.cs @@ -4,7 +4,7 @@ using BPASmartClient.Model; using BPASmartClient.Model.小炒机; using BPASmartClient.MorkF.Model; using BPASmartClient.ViewModel; -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.Windows.Threading; namespace BPASmartClient.MorkF.ViewModel { - partial class LocalMenuViewModel:ObservableObject + partial class LocalMenuViewModel:NotifyBase { /// /// 单个菜品流程 diff --git a/BPASmartClient.MorkF/ViewModel/MaterialCalibrationViewModel.cs b/BPASmartClient.MorkF/ViewModel/MaterialCalibrationViewModel.cs index ab0449ea..36579447 100644 --- a/BPASmartClient.MorkF/ViewModel/MaterialCalibrationViewModel.cs +++ b/BPASmartClient.MorkF/ViewModel/MaterialCalibrationViewModel.cs @@ -1,7 +1,7 @@ using BPASmartClient.Helper; using BPASmartClient.MorkF.Model; using Google.Protobuf.WellKnownTypes; -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.Windows; namespace BPASmartClient.MorkF.ViewModel { - internal class MaterialCalibrationViewModel : ObservableObject + internal class MaterialCalibrationViewModel : NotifyBase { #region 菜品库控制 #region 点位1 diff --git a/BPASmartClient.MorkM/Model/MorksPar.cs b/BPASmartClient.MorkM/Model/MorksPar.cs index 6f97207c..d12e5c7b 100644 --- a/BPASmartClient.MorkM/Model/MorksPar.cs +++ b/BPASmartClient.MorkM/Model/MorksPar.cs @@ -5,7 +5,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Text; using System.Threading.Tasks; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; namespace BPASmartClient.MorkM.Model { diff --git a/BPASmartClient.MorkM/ViewModel/DebugViewModel.cs b/BPASmartClient.MorkM/ViewModel/DebugViewModel.cs index 64c29816..cab27227 100644 --- a/BPASmartClient.MorkM/ViewModel/DebugViewModel.cs +++ b/BPASmartClient.MorkM/ViewModel/DebugViewModel.cs @@ -2,7 +2,7 @@ using BPASmartClient.Model; using BPASmartClient.MorkM.Model; using BPASmartClient.MorkM.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.MorkM.ViewModel { - internal class DebugViewModel : ObservableObject + internal class DebugViewModel : NotifyBase { public DebugViewModel() { diff --git a/BPASmartClient.MorkM/ViewModel/MonitorViewModel.cs b/BPASmartClient.MorkM/ViewModel/MonitorViewModel.cs index 53869073..6d823cd2 100644 --- a/BPASmartClient.MorkM/ViewModel/MonitorViewModel.cs +++ b/BPASmartClient.MorkM/ViewModel/MonitorViewModel.cs @@ -1,6 +1,6 @@ using BPASmartClient.Business; using BPASmartClient.Device; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -10,7 +10,7 @@ using System.Threading.Tasks; namespace BPASmartClient.MorkM.ViewModel { - internal class MonitorViewModel : ObservableObject + internal class MonitorViewModel : NotifyBase { public MonitorViewModel() { diff --git a/BPASmartClient.MorkM/ViewModel/ParSetViewModel.cs b/BPASmartClient.MorkM/ViewModel/ParSetViewModel.cs index 35af0e00..dda4c3b3 100644 --- a/BPASmartClient.MorkM/ViewModel/ParSetViewModel.cs +++ b/BPASmartClient.MorkM/ViewModel/ParSetViewModel.cs @@ -1,6 +1,6 @@ using BPASmartClient.Helper; using BPASmartClient.MorkM.Model; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -10,7 +10,7 @@ using System.Threading.Tasks; namespace BPASmartClient.MorkM.ViewModel { - internal class ParSetViewModel: ObservableObject + internal class ParSetViewModel: NotifyBase { public ParSetViewModel() { diff --git a/BPASmartClient.MorkM/ViewModel/SimOrderConfitViewModel.cs b/BPASmartClient.MorkM/ViewModel/SimOrderConfitViewModel.cs index 19f6ac26..2cafe910 100644 --- a/BPASmartClient.MorkM/ViewModel/SimOrderConfitViewModel.cs +++ b/BPASmartClient.MorkM/ViewModel/SimOrderConfitViewModel.cs @@ -1,7 +1,7 @@ using BPASmartClient.Helper; using BPASmartClient.Model; using BPASmartClient.MorkM.Model; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; using System; using System.Collections.Generic; @@ -11,7 +11,7 @@ using System.Threading.Tasks; namespace BPASmartClient.MorkM.ViewModel { - internal class SimOrderConfitViewModel: ObservableObject + internal class SimOrderConfitViewModel: NotifyBase { bool IsEdit = false; SimOrderVisibleData simOrderVisibleData; diff --git a/BPASmartClient.MorkMOC/Model/LocalMaterail.cs b/BPASmartClient.MorkMOC/Model/LocalMaterail.cs index bb0595a8..c138fd4d 100644 --- a/BPASmartClient.MorkMOC/Model/LocalMaterail.cs +++ b/BPASmartClient.MorkMOC/Model/LocalMaterail.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.MorkMOC { - public partial class LocalMaterail:ObservableObject + public partial class LocalMaterail:NotifyBase { /// /// 物料ID @@ -35,7 +35,7 @@ namespace BPASmartClient.MorkMOC } - public partial class LocalRecipe:ObservableObject + public partial class LocalRecipe:NotifyBase { /// /// 配方ID diff --git a/BPASmartClient.MorkMV1/BPASmartClient.MorkMV1.csproj b/BPASmartClient.MorkMV1/BPASmartClient.MorkMV1.csproj index ed88b17f..0c954af8 100644 --- a/BPASmartClient.MorkMV1/BPASmartClient.MorkMV1.csproj +++ b/BPASmartClient.MorkMV1/BPASmartClient.MorkMV1.csproj @@ -10,7 +10,6 @@ - diff --git a/BPASmartClient.MorkMV1/Model/MorksPar.cs b/BPASmartClient.MorkMV1/Model/MorksPar.cs index 661857f4..5c9b2a06 100644 --- a/BPASmartClient.MorkMV1/Model/MorksPar.cs +++ b/BPASmartClient.MorkMV1/Model/MorksPar.cs @@ -5,7 +5,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Text; using System.Threading.Tasks; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; namespace BPASmartClient.MorkMV1.Model { diff --git a/BPASmartClient.MorkMV1/ViewModel/DebugViewModel.cs b/BPASmartClient.MorkMV1/ViewModel/DebugViewModel.cs index 63b2470e..2a3beab2 100644 --- a/BPASmartClient.MorkMV1/ViewModel/DebugViewModel.cs +++ b/BPASmartClient.MorkMV1/ViewModel/DebugViewModel.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using BPASmartClient.Helper; using BPASmartClient.Model; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; using BPASmartClient.EventBus; using BPASmartClient.MorkMV1.Model; @@ -14,7 +14,7 @@ using BPASmartClient.Message; namespace BPASmartClient.MorkMV1.ViewModel { - public class DebugViewModel : ObservableObject + public class DebugViewModel : NotifyBase { public DebugViewModel() { diff --git a/BPASmartClient.MorkMV1/ViewModel/MonitorViewModel.cs b/BPASmartClient.MorkMV1/ViewModel/MonitorViewModel.cs index 76e6d1ad..281041ad 100644 --- a/BPASmartClient.MorkMV1/ViewModel/MonitorViewModel.cs +++ b/BPASmartClient.MorkMV1/ViewModel/MonitorViewModel.cs @@ -5,12 +5,12 @@ using System.Text; using System.Threading.Tasks; using BPASmartClient.Business; using BPASmartClient.Device; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System.Collections.ObjectModel; namespace BPASmartClient.MorkMV1.ViewModel { - public class MonitorViewModel : ObservableObject + public class MonitorViewModel : NotifyBase { public MonitorViewModel() { diff --git a/BPASmartClient.MorkMV1/ViewModel/ParSetViewModel.cs b/BPASmartClient.MorkMV1/ViewModel/ParSetViewModel.cs index 7c67fb49..b2c690b9 100644 --- a/BPASmartClient.MorkMV1/ViewModel/ParSetViewModel.cs +++ b/BPASmartClient.MorkMV1/ViewModel/ParSetViewModel.cs @@ -7,12 +7,12 @@ using System.Threading.Tasks; using BPASmartClient.Helper; using BPASmartClient.Model; using BPASmartClient.MorkMV1.Model; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; namespace BPASmartClient.MorkMV1.ViewModel { - public class ParSetViewModel : ObservableObject + public class ParSetViewModel : NotifyBase { public ParSetViewModel() { diff --git a/BPASmartClient.MorkMW/Model/VaribleModel.cs b/BPASmartClient.MorkMW/Model/VaribleModel.cs index 69886603..9c7a4ca6 100644 --- a/BPASmartClient.MorkMW/Model/VaribleModel.cs +++ b/BPASmartClient.MorkMW/Model/VaribleModel.cs @@ -1,5 +1,5 @@ using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.Linq; @@ -9,7 +9,7 @@ using System.Windows.Documents; namespace BPASmartClient.MorkMW.Model { - public class VaribleModel:ObservableObject + public class VaribleModel:NotifyBase { private int _id; public int Id { get { return _id; }set { _id = value; OnPropertyChanged(); } } diff --git a/BPASmartClient.MorkMW/ViewModel/DebugViewModel.cs b/BPASmartClient.MorkMW/ViewModel/DebugViewModel.cs index 3797c893..a0df63a7 100644 --- a/BPASmartClient.MorkMW/ViewModel/DebugViewModel.cs +++ b/BPASmartClient.MorkMW/ViewModel/DebugViewModel.cs @@ -2,7 +2,7 @@ using BPASmartClient.Model; using BPASmartClient.Model.订单; using BPASmartClient.MorkMW.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.MorkMW.ViewModel { - public class DebugViewModel:ObservableObject + public class DebugViewModel:NotifyBase { public DebugViewModel() { diff --git a/BPASmartClient.MorkMW/ViewModel/MonitorViewModel.cs b/BPASmartClient.MorkMW/ViewModel/MonitorViewModel.cs index fc67bfec..1993677f 100644 --- a/BPASmartClient.MorkMW/ViewModel/MonitorViewModel.cs +++ b/BPASmartClient.MorkMW/ViewModel/MonitorViewModel.cs @@ -1,5 +1,5 @@ using BPASmartClient.MorkMW.Model; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -9,7 +9,7 @@ using System.Threading.Tasks; namespace BPASmartClient.MorkMW.ViewModel { - internal class MonitorViewModel:ObservableObject + internal class MonitorViewModel:NotifyBase { public MonitorViewModel() { } public ObservableCollection vars { get; set; } = GVL_MorkMW.varibleInfos; diff --git a/BPASmartClient.MorkS/BPASmartClient.MorkS.csproj b/BPASmartClient.MorkS/BPASmartClient.MorkS.csproj index 7b7a7d77..316a6727 100644 --- a/BPASmartClient.MorkS/BPASmartClient.MorkS.csproj +++ b/BPASmartClient.MorkS/BPASmartClient.MorkS.csproj @@ -19,7 +19,6 @@ - diff --git a/BPASmartClient.MorkS/Model/MorksPar.cs b/BPASmartClient.MorkS/Model/MorksPar.cs index 2e53c17f..584a22d5 100644 --- a/BPASmartClient.MorkS/Model/MorksPar.cs +++ b/BPASmartClient.MorkS/Model/MorksPar.cs @@ -5,7 +5,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Text; using System.Threading.Tasks; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; namespace BPASmartClient.MorkS.Model { diff --git a/BPASmartClient.MorkS/ViewModel/DebugViewModel.cs b/BPASmartClient.MorkS/ViewModel/DebugViewModel.cs index 0fc4aad0..09d8d29d 100644 --- a/BPASmartClient.MorkS/ViewModel/DebugViewModel.cs +++ b/BPASmartClient.MorkS/ViewModel/DebugViewModel.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using BPASmartClient.Helper; using BPASmartClient.Model; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; using BPASmartClient.EventBus; using BPASmartClient.MorkS.Model; @@ -14,7 +14,7 @@ using BPASmartClient.Message; namespace BPASmartClient.MorkS.ViewModel { - public class DebugViewModel : ObservableObject + public class DebugViewModel : NotifyBase { public DebugViewModel() { diff --git a/BPASmartClient.MorkS/ViewModel/MonitorViewModel.cs b/BPASmartClient.MorkS/ViewModel/MonitorViewModel.cs index 1e975f3e..5b3aeac9 100644 --- a/BPASmartClient.MorkS/ViewModel/MonitorViewModel.cs +++ b/BPASmartClient.MorkS/ViewModel/MonitorViewModel.cs @@ -5,12 +5,12 @@ using System.Text; using System.Threading.Tasks; using BPASmartClient.Business; using BPASmartClient.Device; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System.Collections.ObjectModel; namespace BPASmartClient.MorkS.ViewModel { - public class MonitorViewModel : ObservableObject + public class MonitorViewModel : NotifyBase { public MonitorViewModel() { diff --git a/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs b/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs index fa396d5a..833220ed 100644 --- a/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs +++ b/BPASmartClient.MorkS/ViewModel/ParSetViewModel.cs @@ -8,13 +8,13 @@ using BPASmartClient.CustomResource; using BPASmartClient.Helper; using BPASmartClient.Model; using BPASmartClient.MorkS.Model; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; using Org.BouncyCastle.Utilities; namespace BPASmartClient.MorkS.ViewModel { - public class ParSetViewModel : ObservableObject + public class ParSetViewModel : NotifyBase { public ParSetViewModel() { diff --git a/BPASmartClient.MorkS3/BPASmartClient.MorkS3.csproj b/BPASmartClient.MorkS3/BPASmartClient.MorkS3.csproj index c781b773..84b8b433 100644 --- a/BPASmartClient.MorkS3/BPASmartClient.MorkS3.csproj +++ b/BPASmartClient.MorkS3/BPASmartClient.MorkS3.csproj @@ -20,7 +20,6 @@ - diff --git a/BPASmartClient.MorkS3/Model/MorksPar.cs b/BPASmartClient.MorkS3/Model/MorksPar.cs index 5d499d39..6b917db4 100644 --- a/BPASmartClient.MorkS3/Model/MorksPar.cs +++ b/BPASmartClient.MorkS3/Model/MorksPar.cs @@ -5,7 +5,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Text; using System.Threading.Tasks; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; namespace BPASmartClient.MorkS3.Model { diff --git a/BPASmartClient.MorkS3/ViewModel/DebugViewModel.cs b/BPASmartClient.MorkS3/ViewModel/DebugViewModel.cs index c51de0b1..94d70f4a 100644 --- a/BPASmartClient.MorkS3/ViewModel/DebugViewModel.cs +++ b/BPASmartClient.MorkS3/ViewModel/DebugViewModel.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using BPASmartClient.Helper; using BPASmartClient.Model; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; using BPASmartClient.EventBus; using BPASmartClient.MorkS3.Model; @@ -14,7 +14,7 @@ using BPASmartClient.Message; namespace BPASmartClient.MorkS3.ViewModel { - public class DebugViewModel : ObservableObject + public class DebugViewModel : NotifyBase { public DebugViewModel() { diff --git a/BPASmartClient.MorkS3/ViewModel/MonitorViewModel.cs b/BPASmartClient.MorkS3/ViewModel/MonitorViewModel.cs index b129dec0..1243b6ee 100644 --- a/BPASmartClient.MorkS3/ViewModel/MonitorViewModel.cs +++ b/BPASmartClient.MorkS3/ViewModel/MonitorViewModel.cs @@ -5,12 +5,12 @@ using System.Text; using System.Threading.Tasks; using BPASmartClient.Business; using BPASmartClient.Device; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System.Collections.ObjectModel; namespace BPASmartClient.MorkS3.ViewModel { - public class MonitorViewModel : ObservableObject + public class MonitorViewModel : NotifyBase { public MonitorViewModel() { diff --git a/BPASmartClient.MorkS3/ViewModel/ParSetViewModel.cs b/BPASmartClient.MorkS3/ViewModel/ParSetViewModel.cs index 42ffe812..9aa6f571 100644 --- a/BPASmartClient.MorkS3/ViewModel/ParSetViewModel.cs +++ b/BPASmartClient.MorkS3/ViewModel/ParSetViewModel.cs @@ -7,12 +7,12 @@ using System.Threading.Tasks; using BPASmartClient.Helper; using BPASmartClient.Model; using BPASmartClient.MorkS3.Model; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; namespace BPASmartClient.MorkS3.ViewModel { - public class ParSetViewModel : ObservableObject + public class ParSetViewModel : NotifyBase { public ParSetViewModel() { diff --git a/BPASmartClient.MorkSUpgradedVer/BPASmartClient.MorkSUpgradedVer.csproj b/BPASmartClient.MorkSUpgradedVer/BPASmartClient.MorkSUpgradedVer.csproj index 3b7fef9c..e954ff6a 100644 --- a/BPASmartClient.MorkSUpgradedVer/BPASmartClient.MorkSUpgradedVer.csproj +++ b/BPASmartClient.MorkSUpgradedVer/BPASmartClient.MorkSUpgradedVer.csproj @@ -15,7 +15,6 @@ - diff --git a/BPASmartClient.MorkSUpgradedVer/Model/MorksPar.cs b/BPASmartClient.MorkSUpgradedVer/Model/MorksPar.cs index 4b50dfa5..365a5078 100644 --- a/BPASmartClient.MorkSUpgradedVer/Model/MorksPar.cs +++ b/BPASmartClient.MorkSUpgradedVer/Model/MorksPar.cs @@ -5,7 +5,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Text; using System.Threading.Tasks; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; namespace BPASmartClient.MorkSUpgradedVer.Model { diff --git a/BPASmartClient.MorkSUpgradedVer/ViewModel/DebugViewModel.cs b/BPASmartClient.MorkSUpgradedVer/ViewModel/DebugViewModel.cs index 3316d1d9..2b5eef6c 100644 --- a/BPASmartClient.MorkSUpgradedVer/ViewModel/DebugViewModel.cs +++ b/BPASmartClient.MorkSUpgradedVer/ViewModel/DebugViewModel.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using BPASmartClient.Helper; using BPASmartClient.Model; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; using BPASmartClient.EventBus; using BPASmartClient.MorkSUpgradedVer.Model; @@ -14,7 +14,7 @@ using BPASmartClient.Message; namespace BPASmartClient.MorkSUpgradedVer.ViewModel { - public class DebugViewModel : ObservableObject + public class DebugViewModel : NotifyBase { public DebugViewModel() { diff --git a/BPASmartClient.MorkSUpgradedVer/ViewModel/MonitorViewModel.cs b/BPASmartClient.MorkSUpgradedVer/ViewModel/MonitorViewModel.cs index 365ee581..9b85a611 100644 --- a/BPASmartClient.MorkSUpgradedVer/ViewModel/MonitorViewModel.cs +++ b/BPASmartClient.MorkSUpgradedVer/ViewModel/MonitorViewModel.cs @@ -5,12 +5,12 @@ using System.Text; using System.Threading.Tasks; using BPASmartClient.Business; using BPASmartClient.Device; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System.Collections.ObjectModel; namespace BPASmartClient.MorkSUpgradedVer.ViewModel { - public class MonitorViewModel : ObservableObject + public class MonitorViewModel : NotifyBase { public MonitorViewModel() { diff --git a/BPASmartClient.MorkSUpgradedVer/ViewModel/ParSetViewModel.cs b/BPASmartClient.MorkSUpgradedVer/ViewModel/ParSetViewModel.cs index 03a8c2b4..48bab6b6 100644 --- a/BPASmartClient.MorkSUpgradedVer/ViewModel/ParSetViewModel.cs +++ b/BPASmartClient.MorkSUpgradedVer/ViewModel/ParSetViewModel.cs @@ -7,12 +7,12 @@ using System.Threading.Tasks; using BPASmartClient.Helper; using BPASmartClient.Model; using BPASmartClient.MorkSUpgradedVer.Model; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; namespace BPASmartClient.MorkSUpgradedVer.ViewModel { - public class ParSetViewModel : ObservableObject + public class ParSetViewModel : NotifyBase { public ParSetViewModel() { diff --git a/BPASmartClient.MorkT.Lebai.JC/ViewModel/DebugViewModel.cs b/BPASmartClient.MorkT.Lebai.JC/ViewModel/DebugViewModel.cs index 9b4dd088..f417ba61 100644 --- a/BPASmartClient.MorkT.Lebai.JC/ViewModel/DebugViewModel.cs +++ b/BPASmartClient.MorkT.Lebai.JC/ViewModel/DebugViewModel.cs @@ -12,7 +12,7 @@ using BPASmartClient.Model.冰淇淋.Enum; using BPASmartClient.Model.单片机; using BPASmartClient.Model.单片机.Enum; using BPASmartClient.Model.咖啡机.Enum; -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.Collections.ObjectModel; using System.Linq; using System.Threading; namespace BPASmartClient.MorkTLebaiJC.ViewModel; - public class DebugViewModel : ObservableObject + public class DebugViewModel : NotifyBase { #region 乐白机器人 diff --git a/BPASmartClient.MorkT.Lebai.JC/ViewModel/MonitorViewModel.cs b/BPASmartClient.MorkT.Lebai.JC/ViewModel/MonitorViewModel.cs index 2a61a967..2330e680 100644 --- a/BPASmartClient.MorkT.Lebai.JC/ViewModel/MonitorViewModel.cs +++ b/BPASmartClient.MorkT.Lebai.JC/ViewModel/MonitorViewModel.cs @@ -1,7 +1,7 @@ using BPASmartClient.Business; using BPASmartClient.Helper; using BPASmartClient.Model.乐白机器人; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.Globalization; @@ -15,7 +15,7 @@ using System.Windows.Media; namespace BPASmartClient.MorkTLebaiJC.ViewModel { - public class MonitorViewModel: ObservableObject + public class MonitorViewModel: NotifyBase { #region 传感器 /// diff --git a/BPASmartClient.MorkT/ViewModel/DebugViewModel.cs b/BPASmartClient.MorkT/ViewModel/DebugViewModel.cs index 60c3c099..6a8efff5 100644 --- a/BPASmartClient.MorkT/ViewModel/DebugViewModel.cs +++ b/BPASmartClient.MorkT/ViewModel/DebugViewModel.cs @@ -12,7 +12,7 @@ using BPASmartClient.Model.冰淇淋.Enum; using BPASmartClient.Model.单片机; using BPASmartClient.Model.单片机.Enum; using BPASmartClient.Model.咖啡机.Enum; -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.Collections.ObjectModel; using System.Linq; using System.Threading; namespace BPASmartClient.MorkT.ViewModel; - public class DebugViewModel : ObservableObject + public class DebugViewModel : NotifyBase { #region 乐白机器人 diff --git a/BPASmartClient.MorkT/ViewModel/MonitorViewModel.cs b/BPASmartClient.MorkT/ViewModel/MonitorViewModel.cs index dc645679..813fabe7 100644 --- a/BPASmartClient.MorkT/ViewModel/MonitorViewModel.cs +++ b/BPASmartClient.MorkT/ViewModel/MonitorViewModel.cs @@ -1,7 +1,7 @@ using BPASmartClient.Business; using BPASmartClient.Helper; using BPASmartClient.Model.乐白机器人; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.Globalization; @@ -15,7 +15,7 @@ using System.Windows.Media; namespace BPASmartClient.MorkT.ViewModel { - public class MonitorViewModel: ObservableObject + public class MonitorViewModel: NotifyBase { #region 传感器 /// diff --git a/BPASmartClient.MorkTM/Model/LocalTeaWithMilkConfig.cs b/BPASmartClient.MorkTM/Model/LocalTeaWithMilkConfig.cs index f807b408..52f23022 100644 --- a/BPASmartClient.MorkTM/Model/LocalTeaWithMilkConfig.cs +++ b/BPASmartClient.MorkTM/Model/LocalTeaWithMilkConfig.cs @@ -1,5 +1,5 @@ using BPASmartClient.MorkTM; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -7,7 +7,7 @@ using System.Text; namespace Model { - public class LocalTeaWithMilkConfig: ObservableObject + public class LocalTeaWithMilkConfig: NotifyBase { /// /// 奶茶名称 @@ -21,7 +21,7 @@ namespace Model } - public class MaterialRecipe:ObservableObject + public class MaterialRecipe:NotifyBase { /// /// 物料ID @@ -46,7 +46,7 @@ namespace Model } - public class MaterailNameAndPosion: ObservableObject + public class MaterailNameAndPosion: NotifyBase { public string MaterialPosion { get { return _materaiPosion; } set { _materaiPosion = value; OnPropertyChanged(); } } private string _materaiPosion; diff --git a/BPASmartClient.MorkTM/ViewModel/DebugViewModel.cs b/BPASmartClient.MorkTM/ViewModel/DebugViewModel.cs index 4855dba0..f72d33a1 100644 --- a/BPASmartClient.MorkTM/ViewModel/DebugViewModel.cs +++ b/BPASmartClient.MorkTM/ViewModel/DebugViewModel.cs @@ -1,4 +1,4 @@ -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; using System; using System.Collections.Generic; @@ -9,7 +9,7 @@ using System.Threading.Tasks; namespace BPASmartClient.MorkTM.ViewModel { - public class DebugViewModel : ObservableObject + public class DebugViewModel : NotifyBase { /// /// 出料口集合 diff --git a/BPASmartClient.MorkTM/ViewModel/RecipeViewModel.cs b/BPASmartClient.MorkTM/ViewModel/RecipeViewModel.cs index 12c2b7da..77fca436 100644 --- a/BPASmartClient.MorkTM/ViewModel/RecipeViewModel.cs +++ b/BPASmartClient.MorkTM/ViewModel/RecipeViewModel.cs @@ -1,5 +1,5 @@ using BPASmartClient.MorkTM; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; using Model; using Newtonsoft.Json; @@ -12,7 +12,7 @@ using System.Windows; namespace ViewModel { - public class RecipeViewModel : ObservableObject + public class RecipeViewModel : NotifyBase { //路径 string recipePath = string.Empty; diff --git a/BPASmartClient.MorkTSingle/ViewModel/DebugViewModel.cs b/BPASmartClient.MorkTSingle/ViewModel/DebugViewModel.cs index a4d1b7ad..455e0371 100644 --- a/BPASmartClient.MorkTSingle/ViewModel/DebugViewModel.cs +++ b/BPASmartClient.MorkTSingle/ViewModel/DebugViewModel.cs @@ -9,7 +9,7 @@ using BPASmartClient.Model.冰淇淋.Enum; using BPASmartClient.Model.单片机; using BPASmartClient.Model.单片机.Enum; using BPASmartClient.Model.咖啡机.Enum; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; using System; using System.Collections.Generic; @@ -17,7 +17,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Threading; namespace BPASmartClient.MorkTSingle.ViewModel; - public class DebugViewModel : ObservableObject + public class DebugViewModel : NotifyBase { public RelayCommand SimOrderMakeCoffee { get; set; } /// diff --git a/BPASmartClient.MorkT_BarCounter/ViewModel/DebugViewModel.cs b/BPASmartClient.MorkT_BarCounter/ViewModel/DebugViewModel.cs index 4ea1237d..9bc55fb7 100644 --- a/BPASmartClient.MorkT_BarCounter/ViewModel/DebugViewModel.cs +++ b/BPASmartClient.MorkT_BarCounter/ViewModel/DebugViewModel.cs @@ -13,7 +13,7 @@ using BPASmartClient.Model.单片机.Enum; using BPASmartClient.Model.咖啡机.Enum; using BPASmartClient.Model.奶茶味魔方; using BPASmartClient.Model.电夹爪; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; using System; using System.Collections.Generic; @@ -21,7 +21,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Threading; namespace BPASmartClient.MorkT_BarCounter.ViewModel; -public class DebugViewModel : ObservableObject +public class DebugViewModel : NotifyBase { public DebugViewModel() { diff --git a/BPASmartClient.MorkT_BarCounter/ViewModel/TestViewModel.cs b/BPASmartClient.MorkT_BarCounter/ViewModel/TestViewModel.cs index 194eb312..91e3b5ec 100644 --- a/BPASmartClient.MorkT_BarCounter/ViewModel/TestViewModel.cs +++ b/BPASmartClient.MorkT_BarCounter/ViewModel/TestViewModel.cs @@ -11,7 +11,7 @@ using BPASmartClient.Model.冰淇淋.Enum; using BPASmartClient.Model.单片机; using BPASmartClient.Model.单片机.Enum; using BPASmartClient.Model.咖啡机.Enum; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; using System; using System.Collections.Generic; @@ -19,7 +19,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Threading; namespace BPASmartClient.MorkT_BarCounter.ViewModel; - public class TestViewModel : ObservableObject + public class TestViewModel : NotifyBase { #region 乐白机器人 diff --git a/BPASmartClient.MorkT_Container/ViewModel/DebugViewModel.cs b/BPASmartClient.MorkT_Container/ViewModel/DebugViewModel.cs index 6eec0a34..2b24c1e8 100644 --- a/BPASmartClient.MorkT_Container/ViewModel/DebugViewModel.cs +++ b/BPASmartClient.MorkT_Container/ViewModel/DebugViewModel.cs @@ -11,7 +11,7 @@ using BPASmartClient.Model.冰淇淋.Enum; using BPASmartClient.Model.单片机; using BPASmartClient.Model.单片机.Enum; using BPASmartClient.Model.咖啡机.Enum; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; using System; using System.Collections.Generic; @@ -19,7 +19,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Threading; namespace BPASmartClient.MorkT_Container.ViewModel; - public class DebugViewModel : ObservableObject + public class DebugViewModel : NotifyBase { #region 乐白机器人 diff --git a/BPASmartClient.MorkT_HQ/ViewModel/DebugViewModel.cs b/BPASmartClient.MorkT_HQ/ViewModel/DebugViewModel.cs index 9f90fa68..c749032d 100644 --- a/BPASmartClient.MorkT_HQ/ViewModel/DebugViewModel.cs +++ b/BPASmartClient.MorkT_HQ/ViewModel/DebugViewModel.cs @@ -12,7 +12,7 @@ using BPASmartClient.Model.冰淇淋.Enum; using BPASmartClient.Model.单片机; using BPASmartClient.Model.单片机.Enum; using BPASmartClient.Model.咖啡机.Enum; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; using System; using System.Collections.Generic; @@ -22,7 +22,7 @@ using System.Threading; namespace BPASmartClient.MorkTHQ.ViewModel { - public class DebugViewModel : ObservableObject + public class DebugViewModel : NotifyBase { #region 乐白机器人 diff --git a/BPASmartClient.MorkT_HQ/ViewModel/MonitorViewModel.cs b/BPASmartClient.MorkT_HQ/ViewModel/MonitorViewModel.cs index 722758bd..198c0c24 100644 --- a/BPASmartClient.MorkT_HQ/ViewModel/MonitorViewModel.cs +++ b/BPASmartClient.MorkT_HQ/ViewModel/MonitorViewModel.cs @@ -1,7 +1,7 @@ using BPASmartClient.Business; using BPASmartClient.Helper; using BPASmartClient.Model.乐白机器人; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.Globalization; @@ -15,7 +15,7 @@ using System.Windows.Media; namespace BPASmartClient.MorkTHQ.ViewModel { - public class MonitorViewModel: ObservableObject + public class MonitorViewModel: NotifyBase { #region 传感器 /// diff --git a/BPASmartClient.Morkt.JAKA.JC/ViewModel/DebugViewModel.cs b/BPASmartClient.Morkt.JAKA.JC/ViewModel/DebugViewModel.cs index 35951331..71508b02 100644 --- a/BPASmartClient.Morkt.JAKA.JC/ViewModel/DebugViewModel.cs +++ b/BPASmartClient.Morkt.JAKA.JC/ViewModel/DebugViewModel.cs @@ -12,7 +12,7 @@ using BPASmartClient.Model.冰淇淋.Enum; using BPASmartClient.Model.单片机; using BPASmartClient.Model.单片机.Enum; using BPASmartClient.Model.咖啡机.Enum; -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.Collections.ObjectModel; using System.Linq; using System.Threading; namespace BPASmartClient.MorkTJAKAJC.ViewModel; - public class DebugViewModel : ObservableObject + public class DebugViewModel : NotifyBase { #region 乐白机器人 diff --git a/BPASmartClient.Morkt.JAKA.JC/ViewModel/MonitorViewModel.cs b/BPASmartClient.Morkt.JAKA.JC/ViewModel/MonitorViewModel.cs index 78dd38bf..75896d2d 100644 --- a/BPASmartClient.Morkt.JAKA.JC/ViewModel/MonitorViewModel.cs +++ b/BPASmartClient.Morkt.JAKA.JC/ViewModel/MonitorViewModel.cs @@ -1,7 +1,7 @@ using BPASmartClient.Business; using BPASmartClient.Helper; using BPASmartClient.Model.乐白机器人; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.Globalization; @@ -15,7 +15,7 @@ using System.Windows.Media; namespace BPASmartClient.MorkTJAKAJC.ViewModel { - public class MonitorViewModel: ObservableObject + public class MonitorViewModel: NotifyBase { #region 传感器 /// diff --git a/BPASmartClient.Nfc/BPASmartClient.Nfc.csproj b/BPASmartClient.Nfc/BPASmartClient.Nfc.csproj index 2cce1ae6..aa29a685 100644 --- a/BPASmartClient.Nfc/BPASmartClient.Nfc.csproj +++ b/BPASmartClient.Nfc/BPASmartClient.Nfc.csproj @@ -21,8 +21,7 @@ - - + diff --git a/BPASmartClient.Nfc/NFCHelper.cs b/BPASmartClient.Nfc/NFCHelper.cs index ffc32ef7..7d509c70 100644 --- a/BPASmartClient.Nfc/NFCHelper.cs +++ b/BPASmartClient.Nfc/NFCHelper.cs @@ -1,5 +1,4 @@ -using BPASmartClient.Helper; -using BPASmartClient.Message; +using BPA.Helper; using System.Text.RegularExpressions; namespace BPASmartClient.Nfc @@ -182,7 +181,7 @@ namespace BPASmartClient.Nfc ThreadManage.GetInstance().StartLong(new Action(() => { Read(); - if (GetReadResult.ErrorInfo.Length > 0) MessageLog.GetInstance.ShowDebugLog(GetReadResult.ErrorInfo); + if (GetReadResult.ErrorInfo.Length > 0) MessageLog.GetInstance.Show(GetReadResult.ErrorInfo); Thread.Sleep(1000); }), "NFC数据读取"); } @@ -231,7 +230,7 @@ namespace BPASmartClient.Nfc { GetReadResult.CardNum = string.Empty; GetReadResult.Data = string.Empty; - MessageLog.GetInstance.ShowDebugLog(ex.ToString()); + MessageLog.GetInstance.Show(ex.ToString()); } finally { diff --git a/BPASmartClient.S7Net/BPASmartClient.S7Net.csproj b/BPASmartClient.S7Net/BPASmartClient.S7Net.csproj index 8d98876d..abd3d301 100644 --- a/BPASmartClient.S7Net/BPASmartClient.S7Net.csproj +++ b/BPASmartClient.S7Net/BPASmartClient.S7Net.csproj @@ -7,6 +7,7 @@ + diff --git a/BPASmartClient.SerialPort/BPASmartClient.SerialPort.csproj b/BPASmartClient.SerialPort/BPASmartClient.SerialPort.csproj index 2b322195..8425c6a8 100644 --- a/BPASmartClient.SerialPort/BPASmartClient.SerialPort.csproj +++ b/BPASmartClient.SerialPort/BPASmartClient.SerialPort.csproj @@ -5,11 +5,8 @@ + - - - - diff --git a/BPASmartClient.SerialPort/GlobalUsing.cs b/BPASmartClient.SerialPort/GlobalUsing.cs new file mode 100644 index 00000000..2a40cd4f --- /dev/null +++ b/BPASmartClient.SerialPort/GlobalUsing.cs @@ -0,0 +1,7 @@ +global using System; +global using System.Collections.Generic; +global using System.Linq; +global using System.Text; +global using System.Threading.Tasks; +global using BPA.Helper; + diff --git a/BPASmartClient.SerialPort/IceMakerHelper.cs b/BPASmartClient.SerialPort/IceMakerHelper.cs index 0cf1fb22..30e24c36 100644 --- a/BPASmartClient.SerialPort/IceMakerHelper.cs +++ b/BPASmartClient.SerialPort/IceMakerHelper.cs @@ -1,5 +1,4 @@ -using BPASmartClient.Helper; -using BPASmartClient.Message; +using BPA.Helper; using System; using System.Collections.Concurrent; using System.Collections.Generic; diff --git a/BPASmartClient.SerialPort/JuicerHelper.cs b/BPASmartClient.SerialPort/JuicerHelper.cs index 4a3b5589..e8c6890e 100644 --- a/BPASmartClient.SerialPort/JuicerHelper.cs +++ b/BPASmartClient.SerialPort/JuicerHelper.cs @@ -1,5 +1,4 @@ -using BPASmartClient.Helper; -using BPASmartClient.Message; +using BPA.Helper; using System; using System.Collections.Concurrent; using System.Collections.Generic; @@ -102,8 +101,8 @@ namespace BPASmartClient.SerialPort comPort.Read(receive, 0, receive.Length); if (receive.Length == 33) { - res.Add(receive.Skip(24).Take(4).ToArray().BytesToInt()); - res.Add(receive.Skip(28).Take(4).ToArray().BytesToInt()); + res.Add(receive.Skip(24).Take(4).ToArray().ToInt()); + res.Add(receive.Skip(28).Take(4).ToArray().ToInt()); } return res.ToArray(); } diff --git a/BPASmartClient.SerialPort/MCUSerialHelper.cs b/BPASmartClient.SerialPort/MCUSerialHelper.cs index 135e40c6..54cf41d3 100644 --- a/BPASmartClient.SerialPort/MCUSerialHelper.cs +++ b/BPASmartClient.SerialPort/MCUSerialHelper.cs @@ -7,7 +7,7 @@ using System.IO; using System.IO.Ports; using System.Threading; using System.Collections.Concurrent; -using BPASmartClient.Message; + namespace BPASmartClient.SerialPort { diff --git a/BPASmartClient.SerialPort/RobotGripperHelper.cs b/BPASmartClient.SerialPort/RobotGripperHelper.cs index 9e285a25..b2bdf875 100644 --- a/BPASmartClient.SerialPort/RobotGripperHelper.cs +++ b/BPASmartClient.SerialPort/RobotGripperHelper.cs @@ -7,8 +7,7 @@ using System.IO; using System.IO.Ports; using System.Threading; using System.Collections.Concurrent; -using BPASmartClient.Message; -using BPASmartClient.Helper; +using BPA.Helper; namespace BPASmartClient.SerialPort { @@ -45,11 +44,11 @@ namespace BPASmartClient.SerialPort MessageLog.GetInstance.ShowEx(ex.ToString()); } } - /* ThreadManage.GetInstance().StartLong(new Action(() => - { - - Thread.Sleep(5000); - }), $"开启电爪设备通讯", true);*/ + /* ThreadManage.GetInstance().StartLong(new Action(() => + { + + Thread.Sleep(5000); + }), $"开启电爪设备通讯", true);*/ MessageLog.GetInstance.Show($"{portName} 串口打开成功"); return comPort.IsOpen; } @@ -65,12 +64,12 @@ namespace BPASmartClient.SerialPort /// 通道号 0 - 5 /// 夹爪幅度 0500 - 2500 /// 夹爪时间 0000-9999 - public void Write(byte index,string value,string time ="1000") + public void Write(byte index, string value, string time = "1000") { byte[] PwmNumber = Encoding.ASCII.GetBytes(value); byte[] Times = Encoding.ASCII.GetBytes(time); //byte[] buffers = new byte[15] { 0x23, 0x30, 0x30, 0x30, 0x50, PwmNumber[0], PwmNumber[1], PwmNumber[2], PwmNumber[3], 0x54, Times[0], Times[1], Times[2], Times[3], 0x21 }; - byte[] buffers = new byte[15] { 0x23, 0x30, 0x30, 0x30, 0x50, 0x31, 0x30, 0x35,0x30, 0x54, 0x31,0x30,0x30,0x30, 0x21 }; + byte[] buffers = new byte[15] { 0x23, 0x30, 0x30, 0x30, 0x50, 0x31, 0x30, 0x35, 0x30, 0x54, 0x31, 0x30, 0x30, 0x30, 0x21 }; if (IsOpen) comPort.Write(buffers, 0, buffers.Length); } } diff --git a/BPASmartClient.SerialPort/SerialPortClient.cs b/BPASmartClient.SerialPort/SerialPortClient.cs index 633c3372..87965bbc 100644 --- a/BPASmartClient.SerialPort/SerialPortClient.cs +++ b/BPASmartClient.SerialPort/SerialPortClient.cs @@ -1,5 +1,5 @@ -using BPASmartClient.Helper; -using BPASmartClient.Message; + + using System; using System.IO.Ports; using System.Linq; @@ -143,7 +143,7 @@ namespace BPASmartClient.SerialPort /// 判断是否有这个串口 /// public bool IsHavePort => System.IO.Ports.SerialPort.GetPortNames().Contains(PortName); - + /// /// 打开端口 /// @@ -203,7 +203,7 @@ namespace BPASmartClient.SerialPort } } - + /// /// 读取数据 /// @@ -216,7 +216,7 @@ namespace BPASmartClient.SerialPort if (!(comPort.IsOpen)) comPort.Open(); byte[] buffer = new byte[1024]; comPort.Read(buffer, 0, buffer.Length); - return buffer; + return buffer; } } public void Start() @@ -237,8 +237,8 @@ namespace BPASmartClient.SerialPort /// 发送数据 public void SendData(byte[] data) { - lock(objLock) - Write(data, 0, data.Length); + lock (objLock) + Write(data, 0, data.Length); } public void SetDataStorage(DataStorage dataStorage) diff --git a/BPASmartClient.SmallBatchingSystem/BPASmartClient.SmallBatchingSystem.csproj b/BPASmartClient.SmallBatchingSystem/BPASmartClient.SmallBatchingSystem.csproj index 3a434956..2abf7c2f 100644 --- a/BPASmartClient.SmallBatchingSystem/BPASmartClient.SmallBatchingSystem.csproj +++ b/BPASmartClient.SmallBatchingSystem/BPASmartClient.SmallBatchingSystem.csproj @@ -21,8 +21,8 @@ - - + + diff --git a/BPASmartClient.SmallBatchingSystem/Models/BaseModel.cs b/BPASmartClient.SmallBatchingSystem/Models/BaseModel.cs index c18c63e7..5ac99731 100644 --- a/BPASmartClient.SmallBatchingSystem/Models/BaseModel.cs +++ b/BPASmartClient.SmallBatchingSystem/Models/BaseModel.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.SmallBatchingSystem { - public class BaseModel : ObservableObject + public class BaseModel : NotifyBase { public int Index { get; set; } = -1; public RelayCommand AddCommand { get; set; } diff --git a/BPASmartClient.SmallBatchingSystem/Models/OutletInfoModel.cs b/BPASmartClient.SmallBatchingSystem/Models/OutletInfoModel.cs index 8fa1213d..e0ecbf19 100644 --- a/BPASmartClient.SmallBatchingSystem/Models/OutletInfoModel.cs +++ b/BPASmartClient.SmallBatchingSystem/Models/OutletInfoModel.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; namespace BPASmartClient.SmallBatchingSystem @@ -11,7 +11,7 @@ namespace BPASmartClient.SmallBatchingSystem /// /// 出料口信息 /// - public class OutletInfoModel : ObservableObject + public class OutletInfoModel : NotifyBase { /// /// 出料口名称 diff --git a/BPASmartClient.SmallBatchingSystem/Models/RecipeInfo.cs b/BPASmartClient.SmallBatchingSystem/Models/RecipeInfo.cs index ee51e6e4..d856e7ad 100644 --- a/BPASmartClient.SmallBatchingSystem/Models/RecipeInfo.cs +++ b/BPASmartClient.SmallBatchingSystem/Models/RecipeInfo.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; using System.Collections.ObjectModel; namespace BPASmartClient.SmallBatchingSystem { - public class RecipeInfo : ObservableObject + public class RecipeInfo : NotifyBase { public string RecipeName { get { return _mRecipeName; } set { _mRecipeName = value; OnPropertyChanged(); } } diff --git a/BPASmartClient.SmallBatchingSystem/Models/RecipeRawMaterialInfo.cs b/BPASmartClient.SmallBatchingSystem/Models/RecipeRawMaterialInfo.cs index 2e054f80..a5c7f8fa 100644 --- a/BPASmartClient.SmallBatchingSystem/Models/RecipeRawMaterialInfo.cs +++ b/BPASmartClient.SmallBatchingSystem/Models/RecipeRawMaterialInfo.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.SmallBatchingSystem { - public class RecipeRawMaterialInfo : ObservableObject + public class RecipeRawMaterialInfo : NotifyBase { /// /// 原料名称 diff --git a/BPASmartClient.SmallBatchingSystem/Models/RecipeStatus.cs b/BPASmartClient.SmallBatchingSystem/Models/RecipeStatus.cs index d73da174..d2a68e55 100644 --- a/BPASmartClient.SmallBatchingSystem/Models/RecipeStatus.cs +++ b/BPASmartClient.SmallBatchingSystem/Models/RecipeStatus.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.SmallBatchingSystem { - public class RecipeStatus : ObservableObject + public class RecipeStatus : NotifyBase { public string RawMaterialName { get { return _mRawMaterialName; } set { _mRawMaterialName = value; OnPropertyChanged(); } } diff --git a/BPASmartClient.SmallBatchingSystem/Models/SiloInfoModel.cs b/BPASmartClient.SmallBatchingSystem/Models/SiloInfoModel.cs index d2efedb7..0e497bd5 100644 --- a/BPASmartClient.SmallBatchingSystem/Models/SiloInfoModel.cs +++ b/BPASmartClient.SmallBatchingSystem/Models/SiloInfoModel.cs @@ -3,14 +3,14 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; namespace BPASmartClient.SmallBatchingSystem { /// /// 原料仓信息 /// - public class SiloInfoModel : ObservableObject + public class SiloInfoModel : NotifyBase { /// /// 原料名称 diff --git a/BPASmartClient.SmallBatchingSystem/ViewModels/NewOutletViewModel.cs b/BPASmartClient.SmallBatchingSystem/ViewModels/NewOutletViewModel.cs index e14513e2..960b9888 100644 --- a/BPASmartClient.SmallBatchingSystem/ViewModels/NewOutletViewModel.cs +++ b/BPASmartClient.SmallBatchingSystem/ViewModels/NewOutletViewModel.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; using BPA.Helper; using BPASmartClient.SmallBatchingSystem.Views; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; namespace BPASmartClient.SmallBatchingSystem.ViewModels @@ -105,7 +105,7 @@ namespace BPASmartClient.SmallBatchingSystem.ViewModels public ObservableCollection SileName { get; set; } = new ObservableCollection(); } - public class RawMaterialInfo : ObservableObject + public class RawMaterialInfo : NotifyBase { public string RawMaterialName { get { return _mRawMaterialName; } set { _mRawMaterialName = value; OnPropertyChanged(); } } diff --git a/BPASmartClient.SmallBatchingSystem/ViewModels/NewRecipeViewModel.cs b/BPASmartClient.SmallBatchingSystem/ViewModels/NewRecipeViewModel.cs index 6c49bdd9..44beb688 100644 --- a/BPASmartClient.SmallBatchingSystem/ViewModels/NewRecipeViewModel.cs +++ b/BPASmartClient.SmallBatchingSystem/ViewModels/NewRecipeViewModel.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 BPA.Helper; diff --git a/BPASmartClient.SmallBatchingSystem/ViewModels/NewSiloViewModel.cs b/BPASmartClient.SmallBatchingSystem/ViewModels/NewSiloViewModel.cs index 7dffab8c..52ec097a 100644 --- a/BPASmartClient.SmallBatchingSystem/ViewModels/NewSiloViewModel.cs +++ b/BPASmartClient.SmallBatchingSystem/ViewModels/NewSiloViewModel.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 BPA.Helper; diff --git a/BPASmartClient.SmallBatchingSystem/ViewModels/OutletManagementViewModel.cs b/BPASmartClient.SmallBatchingSystem/ViewModels/OutletManagementViewModel.cs index a04e6123..30642cdd 100644 --- a/BPASmartClient.SmallBatchingSystem/ViewModels/OutletManagementViewModel.cs +++ b/BPASmartClient.SmallBatchingSystem/ViewModels/OutletManagementViewModel.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using BPA.Helper; using BPASmartClient.CustomResource.Pages.Model; using BPASmartClient.SmallBatchingSystem.Views; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; namespace BPASmartClient.SmallBatchingSystem.ViewModels diff --git a/BPASmartClient.SmallBatchingSystem/ViewModels/RecipeControlViewModel.cs b/BPASmartClient.SmallBatchingSystem/ViewModels/RecipeControlViewModel.cs index 86b83e0d..f4e4f118 100644 --- a/BPASmartClient.SmallBatchingSystem/ViewModels/RecipeControlViewModel.cs +++ b/BPASmartClient.SmallBatchingSystem/ViewModels/RecipeControlViewModel.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using BPA.Helper; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; using BPASmartClient.SmallBatchingSystem.Views; using BPASmartClient.CustomResource.UserControls.MessageShow; @@ -14,7 +14,7 @@ using BPASmartClient.CustomResource.Pages.Model; namespace BPASmartClient.SmallBatchingSystem.ViewModels { - public class RecipeControlViewModel : ObservableObject + public class RecipeControlViewModel : NotifyBase { public RecipeControlViewModel() { diff --git a/BPASmartClient.SmallBatchingSystem/ViewModels/RecipeViewModel.cs b/BPASmartClient.SmallBatchingSystem/ViewModels/RecipeViewModel.cs index df7c2382..aa9b7ba4 100644 --- a/BPASmartClient.SmallBatchingSystem/ViewModels/RecipeViewModel.cs +++ b/BPASmartClient.SmallBatchingSystem/ViewModels/RecipeViewModel.cs @@ -9,7 +9,7 @@ using BPASmartClient.CustomResource.Pages.Model; using BPASmartClient.CustomResource.UserControls; using BPASmartClient.CustomResource.UserControls.MessageShow; using BPASmartClient.SmallBatchingSystem.Views; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; namespace BPASmartClient.SmallBatchingSystem.ViewModels diff --git a/BPASmartClient.SmallBatchingSystem/ViewModels/SiloManagementViewModel.cs b/BPASmartClient.SmallBatchingSystem/ViewModels/SiloManagementViewModel.cs index 113af5ae..591ca18f 100644 --- a/BPASmartClient.SmallBatchingSystem/ViewModels/SiloManagementViewModel.cs +++ b/BPASmartClient.SmallBatchingSystem/ViewModels/SiloManagementViewModel.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 BPASmartClient.SmallBatchingSystem.Views; using System.Collections.ObjectModel; diff --git a/BPASmartClient.TourismCollege/App.xaml.cs b/BPASmartClient.TourismCollege/App.xaml.cs index 95bbf17c..ab955f06 100644 --- a/BPASmartClient.TourismCollege/App.xaml.cs +++ b/BPASmartClient.TourismCollege/App.xaml.cs @@ -17,7 +17,6 @@ namespace BPASmartClient.TourismCollege public partial class App : Application { public static Window MainWindow; - //你好 protected override void OnStartup(StartupEventArgs e) { bool createNew; diff --git a/BPASmartClient.TourismCollege/BPASmartClient.TourismCollege.csproj b/BPASmartClient.TourismCollege/BPASmartClient.TourismCollege.csproj index 079995df..385bef00 100644 --- a/BPASmartClient.TourismCollege/BPASmartClient.TourismCollege.csproj +++ b/BPASmartClient.TourismCollege/BPASmartClient.TourismCollege.csproj @@ -18,7 +18,7 @@ - + diff --git a/BPASmartClient.Update/BPASmartClient.Update.csproj b/BPASmartClient.Update/BPASmartClient.Update.csproj index 01761f98..ffcff80a 100644 --- a/BPASmartClient.Update/BPASmartClient.Update.csproj +++ b/BPASmartClient.Update/BPASmartClient.Update.csproj @@ -8,7 +8,7 @@ - + diff --git a/BPASmartClient.ViewModel/AdminstratorsViewModel.cs b/BPASmartClient.ViewModel/AdminstratorsViewModel.cs index 4b069cfd..d8f615a0 100644 --- a/BPASmartClient.ViewModel/AdminstratorsViewModel.cs +++ b/BPASmartClient.ViewModel/AdminstratorsViewModel.cs @@ -1,5 +1,5 @@ using BPASmartClient.Helper; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; using System; using System.Collections.Generic; @@ -9,7 +9,7 @@ using System.Threading.Tasks; namespace BPASmartClient.ViewModel { - public class AdminstratorsViewModel:ObservableObject + public class AdminstratorsViewModel:NotifyBase { public string Admin { get { return _admin; } set { _admin = value; OnPropertyChanged(); } } private string _admin; diff --git a/BPASmartClient.ViewModel/AlarmViewModel.cs b/BPASmartClient.ViewModel/AlarmViewModel.cs index 11cfd13b..b4a37368 100644 --- a/BPASmartClient.ViewModel/AlarmViewModel.cs +++ b/BPASmartClient.ViewModel/AlarmViewModel.cs @@ -7,7 +7,7 @@ using Microsoft.Toolkit.Mvvm.Input; using System.Collections.ObjectModel; using System.Windows; using System.Threading; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using BPASmartClient.Device; using BPASmartClient.Helper; using BPASmartClient.Business; @@ -15,7 +15,7 @@ using BPASmartClient.Model; namespace BPASmartClient.ViewModel { - public class AlarmViewModel : ObservableObject + public class AlarmViewModel : NotifyBase { public AlarmViewModel() { diff --git a/BPASmartClient.ViewModel/BPASmartClient.ViewModel.csproj b/BPASmartClient.ViewModel/BPASmartClient.ViewModel.csproj index aab4265c..499bd52b 100644 --- a/BPASmartClient.ViewModel/BPASmartClient.ViewModel.csproj +++ b/BPASmartClient.ViewModel/BPASmartClient.ViewModel.csproj @@ -7,7 +7,7 @@ - + @@ -17,7 +17,6 @@ - diff --git a/BPASmartClient.ViewModel/DataVViewModel.cs b/BPASmartClient.ViewModel/DataVViewModel.cs index f5732291..058ea78b 100644 --- a/BPASmartClient.ViewModel/DataVViewModel.cs +++ b/BPASmartClient.ViewModel/DataVViewModel.cs @@ -3,7 +3,7 @@ using BPASmartClient.Business; using BPASmartClient.Helper; using BPASmartClient.IoT; using DataVAPI.Tool.IOT; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -13,7 +13,7 @@ using System.Threading.Tasks; namespace BPASmartClient.ViewModel { - public class DataVViewModel : ObservableObject + public class DataVViewModel : NotifyBase { #region 单一变量 private volatile static DataVViewModel _Instance; diff --git a/BPASmartClient.ViewModel/DebugViewModel.cs b/BPASmartClient.ViewModel/DebugViewModel.cs index 48ed633f..8363fdbf 100644 --- a/BPASmartClient.ViewModel/DebugViewModel.cs +++ b/BPASmartClient.ViewModel/DebugViewModel.cs @@ -1,5 +1,5 @@ using BPASmartClient.Helper; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; using System; using System.Collections.Generic; @@ -9,7 +9,7 @@ using System.Threading.Tasks; namespace BPASmartClient.ViewModel { - public class DebugViewModel : ObservableObject + public class DebugViewModel : NotifyBase { public RelayCommand PlcInite { get; set; } public RelayCommand SimulateOrder { get; set; } diff --git a/BPASmartClient.ViewModel/DeviceMonitorViewModel.cs b/BPASmartClient.ViewModel/DeviceMonitorViewModel.cs index b8995ac8..d940e96c 100644 --- a/BPASmartClient.ViewModel/DeviceMonitorViewModel.cs +++ b/BPASmartClient.ViewModel/DeviceMonitorViewModel.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.Helper; using System.IO; @@ -16,7 +16,7 @@ using BPASmartClient.Business; namespace BPASmartClient.ViewModel { - public class DeviceMonitorViewModel : ObservableObject + public class DeviceMonitorViewModel : NotifyBase { public DeviceMonitorViewModel() { @@ -90,7 +90,7 @@ namespace BPASmartClient.ViewModel } - public class ControlDevice : ObservableObject + public class ControlDevice : NotifyBase { public string Name { get { return _mName; } set { _mName = value; OnPropertyChanged(); } } private string _mName; @@ -106,7 +106,7 @@ namespace BPASmartClient.ViewModel public ObservableCollection DeviceMonitors { get; set; } = new ObservableCollection(); } - public class Device : ObservableObject + public class Device : NotifyBase { public string Name { get { return _mName; } set { _mName = value; OnPropertyChanged(); } } diff --git a/BPASmartClient.ViewModel/FoodMenuViewModel.cs b/BPASmartClient.ViewModel/FoodMenuViewModel.cs index 68efee72..708976f2 100644 --- a/BPASmartClient.ViewModel/FoodMenuViewModel.cs +++ b/BPASmartClient.ViewModel/FoodMenuViewModel.cs @@ -1,7 +1,7 @@ using BPASmartClient.Helper; using BPASmartClient.Model; using BPASmartClient.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.ViewModel { - public class FoodMenuViewModel: ObservableObject + public class FoodMenuViewModel: NotifyBase { /// /// 菜单 diff --git a/BPASmartClient.ViewModel/LogOrAlarmIOTViewModel.cs b/BPASmartClient.ViewModel/LogOrAlarmIOTViewModel.cs index 323b49ff..af39a533 100644 --- a/BPASmartClient.ViewModel/LogOrAlarmIOTViewModel.cs +++ b/BPASmartClient.ViewModel/LogOrAlarmIOTViewModel.cs @@ -4,7 +4,7 @@ using BPASmartClient.CustomResource.UserControls.MessageShow; using BPASmartClient.Helper; using BPASmartClient.IoT; using DataVAPI.Tool.IOT; -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.Windows.Media; namespace BPASmartClient.ViewModel { - public class LogOrAlarmIOTViewModel : ObservableObject + public class LogOrAlarmIOTViewModel : NotifyBase { #region 单一变量 @@ -88,7 +88,7 @@ namespace BPASmartClient.ViewModel #endregion } - public class FileModel : ObservableObject + public class FileModel : NotifyBase { public string downloadUrl { get; set; } public string fileId { get; set; } diff --git a/BPASmartClient.ViewModel/LogOrAlarmViewModel.cs b/BPASmartClient.ViewModel/LogOrAlarmViewModel.cs index 4cd4744d..8f0e4b82 100644 --- a/BPASmartClient.ViewModel/LogOrAlarmViewModel.cs +++ b/BPASmartClient.ViewModel/LogOrAlarmViewModel.cs @@ -2,7 +2,7 @@ using BPASmartClient.CustomResource.UserControls.MessageShow; 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; @@ -21,7 +21,7 @@ namespace BPASmartClient.ViewModel /// /// 告警/日志查询界面 /// - public class LogOrAlarmViewModel : ObservableObject + public class LogOrAlarmViewModel : NotifyBase { #region 单一变量 private volatile static LogOrAlarmViewModel _Instance; diff --git a/BPASmartClient.ViewModel/LogViewModel.cs b/BPASmartClient.ViewModel/LogViewModel.cs index aeef16f1..486c4fe2 100644 --- a/BPASmartClient.ViewModel/LogViewModel.cs +++ b/BPASmartClient.ViewModel/LogViewModel.cs @@ -3,7 +3,7 @@ using BPASmartClient.Helper; using BPASmartClient.IoT; using BPASmartClient.Message; using BPASmartClient.Model; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; using Microsoft.Win32; using System; @@ -24,7 +24,7 @@ namespace BPASmartClient.ViewModel /// /// 日志界面 /// - public class LogViewModel : ObservableObject + public class LogViewModel : NotifyBase { #region 变量 //定时上报文件到阿里云 @@ -362,7 +362,7 @@ namespace BPASmartClient.ViewModel #endregion } - public class LogModel : ObservableObject + public class LogModel : NotifyBase { public string time { get; set; } private string _type; diff --git a/BPASmartClient.ViewModel/MainViewModel.cs b/BPASmartClient.ViewModel/MainViewModel.cs index 0ddab07a..5b267450 100644 --- a/BPASmartClient.ViewModel/MainViewModel.cs +++ b/BPASmartClient.ViewModel/MainViewModel.cs @@ -2,7 +2,7 @@ using BPASmartClient.Helper; using BPASmartClient.Message; using BPASmartClient.Model; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; using System; using System.Collections.Generic; @@ -19,7 +19,7 @@ namespace BPASmartClient.ViewModel /// /// 主界面 /// - public class MainViewModel : ObservableObject + public class MainViewModel : NotifyBase { /// /// 网络连接状态 @@ -90,7 +90,7 @@ namespace BPASmartClient.ViewModel } - public class AlarmModel : ObservableObject + public class AlarmModel : NotifyBase { /// /// 是否告警 diff --git a/BPASmartClient.ViewModel/NewShopWindowModel.cs b/BPASmartClient.ViewModel/NewShopWindowModel.cs index 49787d3b..c195f737 100644 --- a/BPASmartClient.ViewModel/NewShopWindowModel.cs +++ b/BPASmartClient.ViewModel/NewShopWindowModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using BPASmartClient.Helper; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; using Microsoft.Toolkit.Mvvm.Messaging; using System.Windows; @@ -12,7 +12,7 @@ using System.IO; namespace BPASmartClient.ViewModel { - public class NewShopWindowModel : ObservableObject + public class NewShopWindowModel : NotifyBase { public NewShopWindowModel() diff --git a/BPASmartClient.ViewModel/OrderListDialogViewModel.cs b/BPASmartClient.ViewModel/OrderListDialogViewModel.cs index 7482c6e9..0f691754 100644 --- a/BPASmartClient.ViewModel/OrderListDialogViewModel.cs +++ b/BPASmartClient.ViewModel/OrderListDialogViewModel.cs @@ -6,13 +6,13 @@ using BPA.Message; using BPA.Message.Enum; using BPASmartClient.Helper; using BPASmartClient.Model; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; using Microsoft.Toolkit.Mvvm.Messaging; namespace BPASmartClient.ViewModel { - public class OrderListDialogViewModel : ObservableObject + public class OrderListDialogViewModel : NotifyBase { public static bool IsAutoClose = false; public OrderListDialogViewModel() diff --git a/BPASmartClient.ViewModel/OrderStatusViewModel.cs b/BPASmartClient.ViewModel/OrderStatusViewModel.cs index fcdfee84..269527a0 100644 --- a/BPASmartClient.ViewModel/OrderStatusViewModel.cs +++ b/BPASmartClient.ViewModel/OrderStatusViewModel.cs @@ -11,11 +11,11 @@ using BPASmartClient.Device; using BPASmartClient.EventBus; using BPASmartClient.Helper; using BPASmartClient.Model; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; namespace BPASmartClient.ViewModel { - public class OrderStatusViewModel : ObservableObject + public class OrderStatusViewModel : NotifyBase { public OrderStatusViewModel() { diff --git a/BPASmartClient.ViewModel/ShopDeviceConfigViewModel.cs b/BPASmartClient.ViewModel/ShopDeviceConfigViewModel.cs index 4442540f..5cd86d46 100644 --- a/BPASmartClient.ViewModel/ShopDeviceConfigViewModel.cs +++ b/BPASmartClient.ViewModel/ShopDeviceConfigViewModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using BPASmartClient.Helper; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; using System.Collections.ObjectModel; using System.ComponentModel; @@ -17,7 +17,7 @@ using BPASmartClient.Model; namespace BPASmartClient.ViewModel { - public class ShopDeviceConfigViewModel : ObservableObject + public class ShopDeviceConfigViewModel : NotifyBase { private DeviceConfigModelJson configModel = new DeviceConfigModelJson(); string FileName => deviceConfig.Count > 0 ? deviceConfig[0].ShopName : string.Empty; diff --git a/BPASmartClient.ViewModel/SystemSetViewModel.cs b/BPASmartClient.ViewModel/SystemSetViewModel.cs index 4226b414..bcb10ac5 100644 --- a/BPASmartClient.ViewModel/SystemSetViewModel.cs +++ b/BPASmartClient.ViewModel/SystemSetViewModel.cs @@ -6,12 +6,12 @@ using System.Text; using System.Threading.Tasks; using BPASmartClient.Helper; using BPASmartClient.Model; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; namespace BPASmartClient.ViewModel { - public class SystemSetViewModel : ObservableObject + public class SystemSetViewModel : NotifyBase { public SystemSetViewModel() { diff --git a/DosingSystem/BPASmartClient.DosingSystem.csproj b/DosingSystem/BPASmartClient.DosingSystem.csproj index 897021d5..6efcd166 100644 --- a/DosingSystem/BPASmartClient.DosingSystem.csproj +++ b/DosingSystem/BPASmartClient.DosingSystem.csproj @@ -21,7 +21,7 @@ - + diff --git a/FryPot_DosingSystem/FryPotStatus/PotFiveStatus.cs b/FryPot_DosingSystem/FryPotStatus/PotFiveStatus.cs index 7bc5138c..c6529daa 100644 --- a/FryPot_DosingSystem/FryPotStatus/PotFiveStatus.cs +++ b/FryPot_DosingSystem/FryPotStatus/PotFiveStatus.cs @@ -1,5 +1,5 @@ using FryPot_DosingSystem.Attributes; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/FryPot_DosingSystem/FryPotStatus/PotFourStatus.cs b/FryPot_DosingSystem/FryPotStatus/PotFourStatus.cs index 7fe929ed..6102fe2a 100644 --- a/FryPot_DosingSystem/FryPotStatus/PotFourStatus.cs +++ b/FryPot_DosingSystem/FryPotStatus/PotFourStatus.cs @@ -1,5 +1,5 @@ using FryPot_DosingSystem.Attributes; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/FryPot_DosingSystem/FryPotStatus/PotOneStatus.cs b/FryPot_DosingSystem/FryPotStatus/PotOneStatus.cs index 7d5b8902..0478caf2 100644 --- a/FryPot_DosingSystem/FryPotStatus/PotOneStatus.cs +++ b/FryPot_DosingSystem/FryPotStatus/PotOneStatus.cs @@ -1,5 +1,5 @@ using FryPot_DosingSystem.Attributes; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/FryPot_DosingSystem/FryPotStatus/PotThreeStatus.cs b/FryPot_DosingSystem/FryPotStatus/PotThreeStatus.cs index e90e5cc9..5645124d 100644 --- a/FryPot_DosingSystem/FryPotStatus/PotThreeStatus.cs +++ b/FryPot_DosingSystem/FryPotStatus/PotThreeStatus.cs @@ -1,5 +1,5 @@ using FryPot_DosingSystem.Attributes; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/FryPot_DosingSystem/FryPotStatus/PotTwoStatus.cs b/FryPot_DosingSystem/FryPotStatus/PotTwoStatus.cs index a11410b4..1d9b60cf 100644 --- a/FryPot_DosingSystem/FryPotStatus/PotTwoStatus.cs +++ b/FryPot_DosingSystem/FryPotStatus/PotTwoStatus.cs @@ -1,5 +1,5 @@ using FryPot_DosingSystem.Attributes; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; diff --git a/FryPot_DosingSystem/FryPot_DosingSystem.csproj b/FryPot_DosingSystem/FryPot_DosingSystem.csproj index 13520670..8fabe29c 100644 --- a/FryPot_DosingSystem/FryPot_DosingSystem.csproj +++ b/FryPot_DosingSystem/FryPot_DosingSystem.csproj @@ -29,7 +29,6 @@ - diff --git a/FryPot_DosingSystem/Model/ActionMenu.cs b/FryPot_DosingSystem/Model/ActionMenu.cs index 41aca262..856e84e8 100644 --- a/FryPot_DosingSystem/Model/ActionMenu.cs +++ b/FryPot_DosingSystem/Model/ActionMenu.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 FryPot_DosingSystem.Model { - public class ActionMenu:ObservableObject + public class ActionMenu:NotifyBase { private string commandParmeter; public string CommandParameter { get { return commandParmeter; }set { commandParmeter = value; OnPropertyChanged(); } } diff --git a/FryPot_DosingSystem/Model/DeviceInfo.cs b/FryPot_DosingSystem/Model/DeviceInfo.cs index 4415a4f0..8aff3cd0 100644 --- a/FryPot_DosingSystem/Model/DeviceInfo.cs +++ b/FryPot_DosingSystem/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 FryPot_DosingSystem.Model { - internal class DeviceInfo : ObservableObject + internal class DeviceInfo : NotifyBase { private string _deviceNum; public string DeviceNum { get { return _deviceNum; }set { _deviceNum = value;OnPropertyChanged(); } } diff --git a/FryPot_DosingSystem/Model/DeviceManage.cs b/FryPot_DosingSystem/Model/DeviceManage.cs index 48f4ee2e..30d695da 100644 --- a/FryPot_DosingSystem/Model/DeviceManage.cs +++ b/FryPot_DosingSystem/Model/DeviceManage.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 FryPot_DosingSystem.Model { - internal class DeviceManage:ObservableObject + internal class DeviceManage:NotifyBase { public ObservableCollection Devices { get; set; } = new ObservableCollection(); } diff --git a/FryPot_DosingSystem/Model/FlowProcessManage.cs b/FryPot_DosingSystem/Model/FlowProcessManage.cs index 11e70b46..750f23cd 100644 --- a/FryPot_DosingSystem/Model/FlowProcessManage.cs +++ b/FryPot_DosingSystem/Model/FlowProcessManage.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 FryPot_DosingSystem.Model { - internal class FlowProcessManage:ObservableObject + internal class FlowProcessManage:NotifyBase { public string RecipeName { get; set; } public float targetWeightOffset { get { return _targetWeightOffset; } set { _targetWeightOffset = value;OnPropertyChanged(); }} diff --git a/FryPot_DosingSystem/Model/FlowProcessModel.cs b/FryPot_DosingSystem/Model/FlowProcessModel.cs index d47070e1..151c611f 100644 --- a/FryPot_DosingSystem/Model/FlowProcessModel.cs +++ b/FryPot_DosingSystem/Model/FlowProcessModel.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 FryPot_DosingSystem.Model { - internal class FlowProcessModel:ObservableObject,ICloneable + internal class FlowProcessModel:NotifyBase,ICloneable { ///// ///// 工艺步骤对应名称 diff --git a/FryPot_DosingSystem/Model/FlowProcessNames.cs b/FryPot_DosingSystem/Model/FlowProcessNames.cs index e7394e94..7a25cbf1 100644 --- a/FryPot_DosingSystem/Model/FlowProcessNames.cs +++ b/FryPot_DosingSystem/Model/FlowProcessNames.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 FryPot_DosingSystem.Model { - internal class FlowProcessNames : ObservableObject + internal class FlowProcessNames : NotifyBase { private static FlowProcessNames _instance; public static FlowProcessNames GetInstance => _instance ?? (_instance = new FlowProcessNames()); diff --git a/FryPot_DosingSystem/Model/FryPotInfoManage.cs b/FryPot_DosingSystem/Model/FryPotInfoManage.cs index 4dd7dc50..696f7db0 100644 --- a/FryPot_DosingSystem/Model/FryPotInfoManage.cs +++ b/FryPot_DosingSystem/Model/FryPotInfoManage.cs @@ -1,5 +1,5 @@ using FryPot_DosingSystem.Attributes; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -10,7 +10,7 @@ using System.Threading.Tasks; namespace FryPot_DosingSystem.Model { - internal class FryPotInfoManage:ObservableObject + internal class FryPotInfoManage:NotifyBase { public static FryPotInfoManage GetInstance => _instance ?? (_instance = new FryPotInfoManage()); private static FryPotInfoManage _instance; diff --git a/FryPot_DosingSystem/Model/LogModel.cs b/FryPot_DosingSystem/Model/LogModel.cs index 2ae71166..07f0a823 100644 --- a/FryPot_DosingSystem/Model/LogModel.cs +++ b/FryPot_DosingSystem/Model/LogModel.cs @@ -1,4 +1,4 @@ -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.Linq; @@ -8,7 +8,7 @@ using System.Windows.Media; namespace FryPot_DosingSystem.Model { - internal class LogModel:ObservableObject + internal class LogModel:NotifyBase { private string _logTime; public string LogTime { get { return _logTime; } set { _logTime = value; OnPropertyChanged(); } } diff --git a/FryPot_DosingSystem/Model/MaterialNames.cs b/FryPot_DosingSystem/Model/MaterialNames.cs index 56dbd017..b21f7736 100644 --- a/FryPot_DosingSystem/Model/MaterialNames.cs +++ b/FryPot_DosingSystem/Model/MaterialNames.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 FryPot_DosingSystem.Model { - public class MaterialNames:ObservableObject + public class MaterialNames:NotifyBase { private static MaterialNames _instance; public static MaterialNames GetInstance=>_instance ?? (_instance = new MaterialNames()); diff --git a/FryPot_DosingSystem/Model/MaterialType.cs b/FryPot_DosingSystem/Model/MaterialType.cs index 05702ebd..33aab514 100644 --- a/FryPot_DosingSystem/Model/MaterialType.cs +++ b/FryPot_DosingSystem/Model/MaterialType.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 FryPot_DosingSystem.Model { - internal class MaterialType:ObservableObject,ICloneable + internal class MaterialType:NotifyBase,ICloneable { /// /// 原料名称 diff --git a/FryPot_DosingSystem/Model/RecipeManage.cs b/FryPot_DosingSystem/Model/RecipeManage.cs index 39bf9b6c..09bae346 100644 --- a/FryPot_DosingSystem/Model/RecipeManage.cs +++ b/FryPot_DosingSystem/Model/RecipeManage.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 FryPot_DosingSystem.Model { - internal class RecipeManage:ObservableObject + internal class RecipeManage:NotifyBase { public ObservableCollection Recipes { get; set; }=new ObservableCollection(); diff --git a/FryPot_DosingSystem/Model/RecipeModel.cs b/FryPot_DosingSystem/Model/RecipeModel.cs index 053c0dc4..cf8a9285 100644 --- a/FryPot_DosingSystem/Model/RecipeModel.cs +++ b/FryPot_DosingSystem/Model/RecipeModel.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 FryPot_DosingSystem.Model { - internal class NewRecipeModel:ObservableObject + internal class NewRecipeModel:NotifyBase { /// /// 配方唯一ID diff --git a/FryPot_DosingSystem/Model/RollerLineBarrelSerialModel.cs b/FryPot_DosingSystem/Model/RollerLineBarrelSerialModel.cs index 3f01b166..3b660530 100644 --- a/FryPot_DosingSystem/Model/RollerLineBarrelSerialModel.cs +++ b/FryPot_DosingSystem/Model/RollerLineBarrelSerialModel.cs @@ -1,4 +1,4 @@ -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.Linq; @@ -8,7 +8,7 @@ using System.Windows.Media; namespace FryPot_DosingSystem.Model { - internal class RollerLineBarrelSerialModel:ObservableObject + internal class RollerLineBarrelSerialModel:NotifyBase { private ushort _locOneRollerSerial; public ushort LocOneRollerSerial { get { return _locOneRollerSerial; } set { _locOneRollerSerial = value;OnPropertyChanged(); } } diff --git a/FryPot_DosingSystem/Model/VariableMonitorModel.cs b/FryPot_DosingSystem/Model/VariableMonitorModel.cs index ee0794d9..bdf74652 100644 --- a/FryPot_DosingSystem/Model/VariableMonitorModel.cs +++ b/FryPot_DosingSystem/Model/VariableMonitorModel.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 FryPot_DosingSystem.Model { - internal class VariableMonitorModel:ObservableObject + internal class VariableMonitorModel:NotifyBase { public int Id { get { return _mId; } set { _mId = value; OnPropertyChanged(); } } private int _mId; diff --git a/FryPot_DosingSystem/ViewModel/AdministratorLoginViewModel.cs b/FryPot_DosingSystem/ViewModel/AdministratorLoginViewModel.cs index deb6f065..4937d237 100644 --- a/FryPot_DosingSystem/ViewModel/AdministratorLoginViewModel.cs +++ b/FryPot_DosingSystem/ViewModel/AdministratorLoginViewModel.cs @@ -1,7 +1,7 @@ using BPA.Message; using BPASmartClient.Helper; using FryPot_DosingSystem.Model; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; using Newtonsoft.Json; using System; @@ -11,7 +11,7 @@ using System.Windows; namespace FryPot_DosingSystem.ViewModel { - public class AdministratorLoginViewModel : ObservableObject + public class AdministratorLoginViewModel : NotifyBase { /// /// 按钮内容修改：注册/修改 diff --git a/FryPot_DosingSystem/ViewModel/AgvViewModel.cs b/FryPot_DosingSystem/ViewModel/AgvViewModel.cs index d41f8a9c..e34049e9 100644 --- a/FryPot_DosingSystem/ViewModel/AgvViewModel.cs +++ b/FryPot_DosingSystem/ViewModel/AgvViewModel.cs @@ -1,5 +1,5 @@ using FryPot_DosingSystem.AGV; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -14,7 +14,7 @@ namespace FryPot_DosingSystem.ViewModel /// /// AGV 视图 /// - public class AgvViewModel : ObservableObject + public class AgvViewModel : NotifyBase { #region 单例模式 private volatile static AgvViewModel _Instance; @@ -739,7 +739,7 @@ namespace FryPot_DosingSystem.ViewModel /// /// 小车控制Model /// - public class CartModel : ObservableObject + public class CartModel : NotifyBase { /// /// 车上是否有物品 @@ -806,7 +806,7 @@ namespace FryPot_DosingSystem.ViewModel /// /// 停车装控制 /// - public class ParkingPileModel : ObservableObject + public class ParkingPileModel : NotifyBase { /// /// 是否有小车 @@ -842,7 +842,7 @@ namespace FryPot_DosingSystem.ViewModel /// /// 滚筒线控制 /// - public class RollerLinesModel : ObservableObject + public class RollerLinesModel : NotifyBase { /// /// 是否运行 @@ -912,7 +912,7 @@ namespace FryPot_DosingSystem.ViewModel /// /// 炒锅 流程控制 /// - public class WokModel : ObservableObject + public class WokModel : NotifyBase { /// /// id @@ -1035,7 +1035,7 @@ namespace FryPot_DosingSystem.ViewModel /// /// 工作流程 /// - public class WorkflowModel : ObservableObject + public class WorkflowModel : NotifyBase { /// /// 序号默认：1-10 diff --git a/FryPot_DosingSystem/ViewModel/CopyInfoViewModel.cs b/FryPot_DosingSystem/ViewModel/CopyInfoViewModel.cs index ca33592b..c92dc281 100644 --- a/FryPot_DosingSystem/ViewModel/CopyInfoViewModel.cs +++ b/FryPot_DosingSystem/ViewModel/CopyInfoViewModel.cs @@ -1,6 +1,6 @@  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 FryPot_DosingSystem.ViewModel { - internal class CopyInfoViewModel:ObservableObject + internal class CopyInfoViewModel:NotifyBase { private string _fryNum; public string FryNum { get { return _fryNum; } set { _fryNum = value;OnPropertyChanged(); } } diff --git a/FryPot_DosingSystem/ViewModel/DebugViewModel.cs b/FryPot_DosingSystem/ViewModel/DebugViewModel.cs index 3fb27c54..9adb442d 100644 --- a/FryPot_DosingSystem/ViewModel/DebugViewModel.cs +++ b/FryPot_DosingSystem/ViewModel/DebugViewModel.cs @@ -1,6 +1,6 @@ using BPASmartClient.Helper; using FryPot_DosingSystem.Control; -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.Windows.Input; namespace FryPot_DosingSystem.ViewModel { - internal class DebugViewModel : ObservableObject + internal class DebugViewModel : NotifyBase { public ObservableCollection LineOneRollerCode { get; set; } = new ObservableCollection() { 101,102,103,104,105,106,107,108,401,402,403,404,405,406,407,408}; public ObservableCollection LineTwoRollerCode { get; set; } = new ObservableCollection() {201,202,203,204,205,206,207,208,501,502,503,504,505,506,507,508 }; diff --git a/FryPot_DosingSystem/ViewModel/DeviceListViewModel.cs b/FryPot_DosingSystem/ViewModel/DeviceListViewModel.cs index f488a5ca..7beeca04 100644 --- a/FryPot_DosingSystem/ViewModel/DeviceListViewModel.cs +++ b/FryPot_DosingSystem/ViewModel/DeviceListViewModel.cs @@ -2,7 +2,7 @@ using BPASmartClient.CustomResource.UserControls.MessageShow; using BPASmartClient.Helper; using FryPot_DosingSystem.Model; -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 FryPot_DosingSystem.ViewModel { - internal class DeviceListViewModel : ObservableObject + internal class DeviceListViewModel : NotifyBase { public ObservableCollection DeviceName { get; set; } = new ObservableCollection(); public ObservableCollection devices { get; set; } = new ObservableCollection(); diff --git a/FryPot_DosingSystem/ViewModel/FlowProcessSetViewModel.cs b/FryPot_DosingSystem/ViewModel/FlowProcessSetViewModel.cs index cd29ab28..ebc62a38 100644 --- a/FryPot_DosingSystem/ViewModel/FlowProcessSetViewModel.cs +++ b/FryPot_DosingSystem/ViewModel/FlowProcessSetViewModel.cs @@ -3,7 +3,7 @@ using BPASmartClient.CustomResource.UserControls; using BPASmartClient.CustomResource.UserControls.MessageShow; using BPASmartClient.Helper; using FryPot_DosingSystem.Model; -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.Windows; namespace FryPot_DosingSystem.ViewModel { - internal class FlowProcessSetViewModel:ObservableObject + internal class FlowProcessSetViewModel:NotifyBase { public int Id { get; set; } = 0; diff --git a/FryPot_DosingSystem/ViewModel/FryPotMonitorViewModel.cs b/FryPot_DosingSystem/ViewModel/FryPotMonitorViewModel.cs index c0867d49..27edcc25 100644 --- a/FryPot_DosingSystem/ViewModel/FryPotMonitorViewModel.cs +++ b/FryPot_DosingSystem/ViewModel/FryPotMonitorViewModel.cs @@ -1,6 +1,6 @@ using FryPot_DosingSystem.Attributes; using FryPot_DosingSystem.Model; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -11,7 +11,7 @@ using System.Threading.Tasks; namespace FryPot_DosingSystem.ViewModel { - internal class FryPotMonitorViewModel:ObservableObject + internal class FryPotMonitorViewModel:NotifyBase { public ObservableCollection variableMonitorModels { get; set; } = new ObservableCollection(); public int id { get; set; } = 0; diff --git a/FryPot_DosingSystem/ViewModel/HardWareStatusViewModel.cs b/FryPot_DosingSystem/ViewModel/HardWareStatusViewModel.cs index 44bd2bdd..e108f64e 100644 --- a/FryPot_DosingSystem/ViewModel/HardWareStatusViewModel.cs +++ b/FryPot_DosingSystem/ViewModel/HardWareStatusViewModel.cs @@ -1,6 +1,6 @@ using BPASmartClient.Helper; using FryPot_DosingSystem.Model; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Concurrent; using System.Collections.Generic; @@ -10,7 +10,7 @@ using System.Threading.Tasks; namespace FryPot_DosingSystem.ViewModel { - internal class HardWareStatusViewModel:ObservableObject + internal class HardWareStatusViewModel:NotifyBase { private static HardWareStatusViewModel _instance; public static HardWareStatusViewModel GetInstance => _instance ??= new HardWareStatusViewModel(); diff --git a/FryPot_DosingSystem/ViewModel/LabelPrintViewModel.cs b/FryPot_DosingSystem/ViewModel/LabelPrintViewModel.cs index cf389eff..305efac6 100644 --- a/FryPot_DosingSystem/ViewModel/LabelPrintViewModel.cs +++ b/FryPot_DosingSystem/ViewModel/LabelPrintViewModel.cs @@ -1,4 +1,4 @@ -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; using System; using System.Collections.Generic; @@ -8,7 +8,7 @@ using System.Threading.Tasks; namespace FryPot_DosingSystem.ViewModel { - internal class LabelPrintViewModel:ObservableObject + internal class LabelPrintViewModel:NotifyBase { public RelayCommand PrintCommand { get; set; } diff --git a/FryPot_DosingSystem/ViewModel/LogViewModel.cs b/FryPot_DosingSystem/ViewModel/LogViewModel.cs index 15a23294..b93fd53b 100644 --- a/FryPot_DosingSystem/ViewModel/LogViewModel.cs +++ b/FryPot_DosingSystem/ViewModel/LogViewModel.cs @@ -1,6 +1,6 @@ using BPASmartClient.Message; using FryPot_DosingSystem.Model; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -11,7 +11,7 @@ using System.Windows.Media; namespace FryPot_DosingSystem.ViewModel { - internal class LogViewModel:ObservableObject + internal class LogViewModel:NotifyBase { public static LogViewModel _instance; public static LogViewModel GetInstance=>_instance?? (_instance = new LogViewModel()); diff --git a/FryPot_DosingSystem/ViewModel/MainViewModel.cs b/FryPot_DosingSystem/ViewModel/MainViewModel.cs index cc9b417a..3d8da962 100644 --- a/FryPot_DosingSystem/ViewModel/MainViewModel.cs +++ b/FryPot_DosingSystem/ViewModel/MainViewModel.cs @@ -3,7 +3,7 @@ using BPASmartClient.Helper; using FryPot_DosingSystem.Control; using FryPot_DosingSystem.Model; using FryPot_DosingSystem.View; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; using System; using System.Collections.Generic; @@ -17,7 +17,7 @@ using System.Windows.Forms; namespace FryPot_DosingSystem.ViewModel { - internal class MainViewModel : ObservableObject + internal class MainViewModel : NotifyBase { public ObservableCollection menus { get; set; } = new ObservableCollection(); diff --git a/FryPot_DosingSystem/ViewModel/NewFryPotMaterialViewModel.cs b/FryPot_DosingSystem/ViewModel/NewFryPotMaterialViewModel.cs index 7a4797b8..52293e0c 100644 --- a/FryPot_DosingSystem/ViewModel/NewFryPotMaterialViewModel.cs +++ b/FryPot_DosingSystem/ViewModel/NewFryPotMaterialViewModel.cs @@ -3,7 +3,7 @@ using BPASmartClient.CustomResource.UserControls; using BPASmartClient.CustomResource.UserControls.MessageShow; using BPASmartClient.Helper; using FryPot_DosingSystem.Model; -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 FryPot_DosingSystem.ViewModel { - internal class NewFryPotMaterialViewModel : ObservableObject + internal class NewFryPotMaterialViewModel : NotifyBase { public RelayCommand ConfimCommand { get; set; } private string _materialName; diff --git a/FryPot_DosingSystem/ViewModel/NewRecipeViewModel.cs b/FryPot_DosingSystem/ViewModel/NewRecipeViewModel.cs index e49d4d8b..740f1e11 100644 --- a/FryPot_DosingSystem/ViewModel/NewRecipeViewModel.cs +++ b/FryPot_DosingSystem/ViewModel/NewRecipeViewModel.cs @@ -3,7 +3,7 @@ using BPASmartClient.CustomResource.UserControls; using BPASmartClient.CustomResource.UserControls.MessageShow; using BPASmartClient.Helper; using FryPot_DosingSystem.Model; -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.Windows.Forms; namespace FryPot_DosingSystem.ViewModel { - internal class NewRecipeViewModel : ObservableObject + internal class NewRecipeViewModel : NotifyBase { /// /// 配方唯一编码，用于编辑配方 diff --git a/FryPot_DosingSystem/ViewModel/RecipeSetDownViewModel.cs b/FryPot_DosingSystem/ViewModel/RecipeSetDownViewModel.cs index 2eed55e7..fcb87bf4 100644 --- a/FryPot_DosingSystem/ViewModel/RecipeSetDownViewModel.cs +++ b/FryPot_DosingSystem/ViewModel/RecipeSetDownViewModel.cs @@ -3,7 +3,7 @@ using BPASmartClient.CustomResource.UserControls.MessageShow; using BPASmartClient.Helper; using BPASmartClient.Message; using FryPot_DosingSystem.Model; -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 FryPot_DosingSystem.ViewModel { - internal class RecipeSetDownViewModel : ObservableObject + internal class RecipeSetDownViewModel : NotifyBase { diff --git a/FryPot_DosingSystem/ViewModel/RecipeSetViewModel.cs b/FryPot_DosingSystem/ViewModel/RecipeSetViewModel.cs index 340c80f7..7f99146d 100644 --- a/FryPot_DosingSystem/ViewModel/RecipeSetViewModel.cs +++ b/FryPot_DosingSystem/ViewModel/RecipeSetViewModel.cs @@ -4,7 +4,7 @@ using BPASmartClient.CustomResource.UserControls.MessageShow; using BPASmartClient.Helper; using FryPot_DosingSystem.Model; using FryPot_DosingSystem.View; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using Microsoft.Toolkit.Mvvm.Input; using System; using System.Collections.Generic; @@ -17,7 +17,7 @@ using System.Windows.Media.Media3D; namespace FryPot_DosingSystem.ViewModel { - internal class RecipeSetViewModel : ObservableObject + internal class RecipeSetViewModel : NotifyBase { ///// ///// 配方编号 diff --git a/FryPot_DosingSystem/ViewModel/SqliteDataViewModel.cs b/FryPot_DosingSystem/ViewModel/SqliteDataViewModel.cs index 4a21135e..2f43241b 100644 --- a/FryPot_DosingSystem/ViewModel/SqliteDataViewModel.cs +++ b/FryPot_DosingSystem/ViewModel/SqliteDataViewModel.cs @@ -1,6 +1,6 @@ using BPASmartClient.Helper; using FryPot_DosingSystem.FryPotStatus; -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.Windows.Forms; namespace FryPot_DosingSystem.ViewModel { - internal class SqliteDataViewModel : ObservableObject + internal class SqliteDataViewModel : NotifyBase { public ObservableCollection StatusOne { get; set; } = new ObservableCollection(); diff --git a/FryPot_DosingSystem/ViewModel/UserManageViewModel.cs b/FryPot_DosingSystem/ViewModel/UserManageViewModel.cs index e20a5b34..b426a013 100644 --- a/FryPot_DosingSystem/ViewModel/UserManageViewModel.cs +++ b/FryPot_DosingSystem/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 FryPot_DosingSystem.ViewModel { - internal class UserManageViewModel : ObservableObject + internal class UserManageViewModel : NotifyBase { private static UserManageViewModel _instance; public static UserManageViewModel GetInstance=>_instance??= new UserManageViewModel(); diff --git a/SmartClient.sln b/SmartClient.sln index 39b4d934..e901218e 100644 --- a/SmartClient.sln +++ b/SmartClient.sln @@ -37,10 +37,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1.UI", "1.UI", "{8712125E-1 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "6.Uitility", "6.Uitility", "{1A9920BA-7C8D-4BDC-8D7D-6544A71AF3CF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.Helper", "BPASmartClient.Helper\BPASmartClient.Helper.csproj", "{A2A5CB83-11C7-4534-A65D-6F957B60EEFF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.Message", "BPASmartClient.Message\BPASmartClient.Message.csproj", "{C517D33F-8800-405E-9D59-E1F6CA201431}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.IoT", "BPASmartClient.IoT\BPASmartClient.IoT.csproj", "{D3DBCC2D-086E-4E3A-B70A-22A79FB295CF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient", "BPASmartClient\BPASmartClient.csproj", "{2BA531E8-7F85-4EBF-AE97-811CD7C83EF2}" @@ -49,16 +45,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.ViewModel", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.Device", "BPASmartClient.Device\BPASmartClient.Device.csproj", "{FFECD10B-FE66-4331-A915-409F5BE04480}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MQTT", "BPASmartClient.MQTT\BPASmartClient.MQTT.csproj", "{7D290C8E-ACA7-4F03-91DF-D507FB3E2E87}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.Socket", "BPASmartClient.Socket\BPASmartClient.Socket.csproj", "{F9AD1657-7FF9-470F-BE7F-2379ADAC0BB0}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.Peripheral", "BPASmartClient.Peripheral\BPASmartClient.Peripheral.csproj", "{9F5E2879-972A-45FB-913C-89E9F0CEB189}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MessageCommunication", "BPASmartClient.MessageCommunication\BPASmartClient.MessageCommunication.csproj", "{DCC07B39-E342-4841-B9E4-4D44DA2978FD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.EventBus", "BPASmartClient.EventBus\BPASmartClient.EventBus.csproj", "{C7FC5FC8-4C72-4CD3-973E-327BDA880DF5}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.Model", "BPASmartClient.Model\BPASmartClient.Model.csproj", "{268012B6-C4FC-4C40-802C-74D5FAD3CA45}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.Business", "BPASmartClient.Business\BPASmartClient.Business.csproj", "{EF5EF8EF-4A44-4E44-9594-D878CABC4182}" @@ -134,44 +124,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.JXJFoodSmall EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WPFDemo", "WPFDemo\WPFDemo.csproj", "{A456D582-D910-4CA2-8620-6D8F63344B47}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0.SCADA", "0.SCADA", "{7B0175AD-BB74-4A98-B9A7-1E289032485E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.SCADAControl", "BPASmartClient.SCADAControl\BPASmartClient.SCADAControl.csproj", "{6A3FC66D-0B89-45E8-B39B-9D81538002D1}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "可视化控件集", "可视化控件集", "{5300552F-560D-474A-8D96-0A2747D08F64}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmart.VariableManager", "BPASmart.VariableManager\BPASmart.VariableManager.csproj", "{2C17B9A9-B27B-4F07-AFB0-0F56A975D501}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DistributedHostComputer", "DistributedHostComputer", "{CDC1E762-5E1D-4AE1-9DF2-B85761539086}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmart.DataServer", "BPASmart.DataServer\BPASmart.DataServer.csproj", "{00C5B45D-9799-43F1-B07B-9F638AA9FF72}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmart.Model", "BPASmart.Model\BPASmart.Model.csproj", "{5083C91F-B23E-445D-8B7F-AF87E636E847}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmart.Server", "BPASmart.Server\BPASmart.Server.csproj", "{F67FBFAC-6C80-466D-A596-1B9B10E885FC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputerTestDemo", "ComputerTestDemo\ComputerTestDemo.csproj", "{8940F1E2-693D-407E-AD03-722718860609}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "可视化配置工具", "可视化配置工具", "{06F0B369-0483-46DD-82D2-70431FB505C1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BeDesignerSCADA", "BeDesignerSCADA\BeDesignerSCADA.csproj", "{DF8B4C38-39DE-4220-AB60-885CAE6D1E47}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmart.RecipeManagement", "BPASmart.RecipeManagement\BPASmart.RecipeManagement.csproj", "{28EBFC11-184A-4B88-A7B3-84F3FD768520}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmart.ConfigurationSoftware", "BPASmart.ConfigurationSoftware\BPASmart.ConfigurationSoftware.csproj", "{897F8379-3301-4CBE-9BCA-AF7FD2F963A9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmart.UserManagement", "BPASmart.UserManagement\BPASmart.UserManagement.csproj", "{06F30619-AD37-4CA0-838F-0431867E0932}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmart.PageLoad", "BPASmart.PageLoad\BPASmart.PageLoad.csproj", "{2DB084E8-B951-4D71-A203-FD0902EBA2C6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmart.CustomResource", "BPASmart.CustomResource\BPASmart.CustomResource.csproj", "{E7CC45BF-7393-4BA7-A9AD-B1A1F5B265F3}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.SmallBatchingSystem", "BPASmartClient.SmallBatchingSystem\BPASmartClient.SmallBatchingSystem.csproj", "{BA588F22-87FB-4124-AF62-CA8DC492ED7D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MorkMOC", "BPASmartClient.MorkMOC\BPASmartClient.MorkMOC.csproj", "{D5081D7B-3EBB-42C7-8FB9-A889870D08C2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmart.MenuLoad", "BPASmart.MenuLoad\BPASmart.MenuLoad.csproj", "{7A7547D3-F2EF-4DA4-AD45-D1B49210082B}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MorkBF", "BPASmartClient.MorkBF\BPASmartClient.MorkBF.csproj", "{CD0FBCF1-9C49-4032-96AD-B9E25F86F2A7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "7.DeviceScreen", "7.DeviceScreen", "{7BE13E55-D8B1-4232-AE63-8BF122633297}" @@ -454,46 +410,6 @@ Global {B399BCFF-82E8-4940-9CE5-B7DCDDFDC696}.Release|x64.Build.0 = Release|Any CPU {B399BCFF-82E8-4940-9CE5-B7DCDDFDC696}.Release|x86.ActiveCfg = Release|Any CPU {B399BCFF-82E8-4940-9CE5-B7DCDDFDC696}.Release|x86.Build.0 = Release|Any CPU - {A2A5CB83-11C7-4534-A65D-6F957B60EEFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2A5CB83-11C7-4534-A65D-6F957B60EEFF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2A5CB83-11C7-4534-A65D-6F957B60EEFF}.Debug|ARM.ActiveCfg = Debug|Any CPU - {A2A5CB83-11C7-4534-A65D-6F957B60EEFF}.Debug|ARM.Build.0 = Debug|Any CPU - {A2A5CB83-11C7-4534-A65D-6F957B60EEFF}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {A2A5CB83-11C7-4534-A65D-6F957B60EEFF}.Debug|ARM64.Build.0 = Debug|Any CPU - {A2A5CB83-11C7-4534-A65D-6F957B60EEFF}.Debug|x64.ActiveCfg = Debug|Any CPU - {A2A5CB83-11C7-4534-A65D-6F957B60EEFF}.Debug|x64.Build.0 = Debug|Any CPU - {A2A5CB83-11C7-4534-A65D-6F957B60EEFF}.Debug|x86.ActiveCfg = Debug|Any CPU - {A2A5CB83-11C7-4534-A65D-6F957B60EEFF}.Debug|x86.Build.0 = Debug|Any CPU - {A2A5CB83-11C7-4534-A65D-6F957B60EEFF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2A5CB83-11C7-4534-A65D-6F957B60EEFF}.Release|Any CPU.Build.0 = Release|Any CPU - {A2A5CB83-11C7-4534-A65D-6F957B60EEFF}.Release|ARM.ActiveCfg = Release|Any CPU - {A2A5CB83-11C7-4534-A65D-6F957B60EEFF}.Release|ARM.Build.0 = Release|Any CPU - {A2A5CB83-11C7-4534-A65D-6F957B60EEFF}.Release|ARM64.ActiveCfg = Release|Any CPU - {A2A5CB83-11C7-4534-A65D-6F957B60EEFF}.Release|ARM64.Build.0 = Release|Any CPU - {A2A5CB83-11C7-4534-A65D-6F957B60EEFF}.Release|x64.ActiveCfg = Release|Any CPU - {A2A5CB83-11C7-4534-A65D-6F957B60EEFF}.Release|x64.Build.0 = Release|Any CPU - {A2A5CB83-11C7-4534-A65D-6F957B60EEFF}.Release|x86.ActiveCfg = Release|Any CPU - {A2A5CB83-11C7-4534-A65D-6F957B60EEFF}.Release|x86.Build.0 = Release|Any CPU - {C517D33F-8800-405E-9D59-E1F6CA201431}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C517D33F-8800-405E-9D59-E1F6CA201431}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C517D33F-8800-405E-9D59-E1F6CA201431}.Debug|ARM.ActiveCfg = Debug|Any CPU - {C517D33F-8800-405E-9D59-E1F6CA201431}.Debug|ARM.Build.0 = Debug|Any CPU - {C517D33F-8800-405E-9D59-E1F6CA201431}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {C517D33F-8800-405E-9D59-E1F6CA201431}.Debug|ARM64.Build.0 = Debug|Any CPU - {C517D33F-8800-405E-9D59-E1F6CA201431}.Debug|x64.ActiveCfg = Debug|Any CPU - {C517D33F-8800-405E-9D59-E1F6CA201431}.Debug|x64.Build.0 = Debug|Any CPU - {C517D33F-8800-405E-9D59-E1F6CA201431}.Debug|x86.ActiveCfg = Debug|Any CPU - {C517D33F-8800-405E-9D59-E1F6CA201431}.Debug|x86.Build.0 = Debug|Any CPU - {C517D33F-8800-405E-9D59-E1F6CA201431}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C517D33F-8800-405E-9D59-E1F6CA201431}.Release|Any CPU.Build.0 = Release|Any CPU - {C517D33F-8800-405E-9D59-E1F6CA201431}.Release|ARM.ActiveCfg = Release|Any CPU - {C517D33F-8800-405E-9D59-E1F6CA201431}.Release|ARM.Build.0 = Release|Any CPU - {C517D33F-8800-405E-9D59-E1F6CA201431}.Release|ARM64.ActiveCfg = Release|Any CPU - {C517D33F-8800-405E-9D59-E1F6CA201431}.Release|ARM64.Build.0 = Release|Any CPU - {C517D33F-8800-405E-9D59-E1F6CA201431}.Release|x64.ActiveCfg = Release|Any CPU - {C517D33F-8800-405E-9D59-E1F6CA201431}.Release|x64.Build.0 = Release|Any CPU - {C517D33F-8800-405E-9D59-E1F6CA201431}.Release|x86.ActiveCfg = Release|Any CPU - {C517D33F-8800-405E-9D59-E1F6CA201431}.Release|x86.Build.0 = Release|Any CPU {D3DBCC2D-086E-4E3A-B70A-22A79FB295CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D3DBCC2D-086E-4E3A-B70A-22A79FB295CF}.Debug|Any CPU.Build.0 = Debug|Any CPU {D3DBCC2D-086E-4E3A-B70A-22A79FB295CF}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -574,46 +490,6 @@ Global {FFECD10B-FE66-4331-A915-409F5BE04480}.Release|x64.Build.0 = Release|Any CPU {FFECD10B-FE66-4331-A915-409F5BE04480}.Release|x86.ActiveCfg = Release|Any CPU {FFECD10B-FE66-4331-A915-409F5BE04480}.Release|x86.Build.0 = Release|Any CPU - {7D290C8E-ACA7-4F03-91DF-D507FB3E2E87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D290C8E-ACA7-4F03-91DF-D507FB3E2E87}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D290C8E-ACA7-4F03-91DF-D507FB3E2E87}.Debug|ARM.ActiveCfg = Debug|Any CPU - {7D290C8E-ACA7-4F03-91DF-D507FB3E2E87}.Debug|ARM.Build.0 = Debug|Any CPU - {7D290C8E-ACA7-4F03-91DF-D507FB3E2E87}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {7D290C8E-ACA7-4F03-91DF-D507FB3E2E87}.Debug|ARM64.Build.0 = Debug|Any CPU - {7D290C8E-ACA7-4F03-91DF-D507FB3E2E87}.Debug|x64.ActiveCfg = Debug|Any CPU - {7D290C8E-ACA7-4F03-91DF-D507FB3E2E87}.Debug|x64.Build.0 = Debug|Any CPU - {7D290C8E-ACA7-4F03-91DF-D507FB3E2E87}.Debug|x86.ActiveCfg = Debug|Any CPU - {7D290C8E-ACA7-4F03-91DF-D507FB3E2E87}.Debug|x86.Build.0 = Debug|Any CPU - {7D290C8E-ACA7-4F03-91DF-D507FB3E2E87}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D290C8E-ACA7-4F03-91DF-D507FB3E2E87}.Release|Any CPU.Build.0 = Release|Any CPU - {7D290C8E-ACA7-4F03-91DF-D507FB3E2E87}.Release|ARM.ActiveCfg = Release|Any CPU - {7D290C8E-ACA7-4F03-91DF-D507FB3E2E87}.Release|ARM.Build.0 = Release|Any CPU - {7D290C8E-ACA7-4F03-91DF-D507FB3E2E87}.Release|ARM64.ActiveCfg = Release|Any CPU - {7D290C8E-ACA7-4F03-91DF-D507FB3E2E87}.Release|ARM64.Build.0 = Release|Any CPU - {7D290C8E-ACA7-4F03-91DF-D507FB3E2E87}.Release|x64.ActiveCfg = Release|Any CPU - {7D290C8E-ACA7-4F03-91DF-D507FB3E2E87}.Release|x64.Build.0 = Release|Any CPU - {7D290C8E-ACA7-4F03-91DF-D507FB3E2E87}.Release|x86.ActiveCfg = Release|Any CPU - {7D290C8E-ACA7-4F03-91DF-D507FB3E2E87}.Release|x86.Build.0 = Release|Any CPU - {F9AD1657-7FF9-470F-BE7F-2379ADAC0BB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F9AD1657-7FF9-470F-BE7F-2379ADAC0BB0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F9AD1657-7FF9-470F-BE7F-2379ADAC0BB0}.Debug|ARM.ActiveCfg = Debug|Any CPU - {F9AD1657-7FF9-470F-BE7F-2379ADAC0BB0}.Debug|ARM.Build.0 = Debug|Any CPU - {F9AD1657-7FF9-470F-BE7F-2379ADAC0BB0}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {F9AD1657-7FF9-470F-BE7F-2379ADAC0BB0}.Debug|ARM64.Build.0 = Debug|Any CPU - {F9AD1657-7FF9-470F-BE7F-2379ADAC0BB0}.Debug|x64.ActiveCfg = Debug|Any CPU - {F9AD1657-7FF9-470F-BE7F-2379ADAC0BB0}.Debug|x64.Build.0 = Debug|Any CPU - {F9AD1657-7FF9-470F-BE7F-2379ADAC0BB0}.Debug|x86.ActiveCfg = Debug|Any CPU - {F9AD1657-7FF9-470F-BE7F-2379ADAC0BB0}.Debug|x86.Build.0 = Debug|Any CPU - {F9AD1657-7FF9-470F-BE7F-2379ADAC0BB0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F9AD1657-7FF9-470F-BE7F-2379ADAC0BB0}.Release|Any CPU.Build.0 = Release|Any CPU - {F9AD1657-7FF9-470F-BE7F-2379ADAC0BB0}.Release|ARM.ActiveCfg = Release|Any CPU - {F9AD1657-7FF9-470F-BE7F-2379ADAC0BB0}.Release|ARM.Build.0 = Release|Any CPU - {F9AD1657-7FF9-470F-BE7F-2379ADAC0BB0}.Release|ARM64.ActiveCfg = Release|Any CPU - {F9AD1657-7FF9-470F-BE7F-2379ADAC0BB0}.Release|ARM64.Build.0 = Release|Any CPU - {F9AD1657-7FF9-470F-BE7F-2379ADAC0BB0}.Release|x64.ActiveCfg = Release|Any CPU - {F9AD1657-7FF9-470F-BE7F-2379ADAC0BB0}.Release|x64.Build.0 = Release|Any CPU - {F9AD1657-7FF9-470F-BE7F-2379ADAC0BB0}.Release|x86.ActiveCfg = Release|Any CPU - {F9AD1657-7FF9-470F-BE7F-2379ADAC0BB0}.Release|x86.Build.0 = Release|Any CPU {9F5E2879-972A-45FB-913C-89E9F0CEB189}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9F5E2879-972A-45FB-913C-89E9F0CEB189}.Debug|Any CPU.Build.0 = Debug|Any CPU {9F5E2879-972A-45FB-913C-89E9F0CEB189}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -654,26 +530,6 @@ Global {DCC07B39-E342-4841-B9E4-4D44DA2978FD}.Release|x64.Build.0 = Release|Any CPU {DCC07B39-E342-4841-B9E4-4D44DA2978FD}.Release|x86.ActiveCfg = Release|Any CPU {DCC07B39-E342-4841-B9E4-4D44DA2978FD}.Release|x86.Build.0 = Release|Any CPU - {C7FC5FC8-4C72-4CD3-973E-327BDA880DF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7FC5FC8-4C72-4CD3-973E-327BDA880DF5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C7FC5FC8-4C72-4CD3-973E-327BDA880DF5}.Debug|ARM.ActiveCfg = Debug|Any CPU - {C7FC5FC8-4C72-4CD3-973E-327BDA880DF5}.Debug|ARM.Build.0 = Debug|Any CPU - {C7FC5FC8-4C72-4CD3-973E-327BDA880DF5}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {C7FC5FC8-4C72-4CD3-973E-327BDA880DF5}.Debug|ARM64.Build.0 = Debug|Any CPU - {C7FC5FC8-4C72-4CD3-973E-327BDA880DF5}.Debug|x64.ActiveCfg = Debug|Any CPU - {C7FC5FC8-4C72-4CD3-973E-327BDA880DF5}.Debug|x64.Build.0 = Debug|Any CPU - {C7FC5FC8-4C72-4CD3-973E-327BDA880DF5}.Debug|x86.ActiveCfg = Debug|Any CPU - {C7FC5FC8-4C72-4CD3-973E-327BDA880DF5}.Debug|x86.Build.0 = Debug|Any CPU - {C7FC5FC8-4C72-4CD3-973E-327BDA880DF5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C7FC5FC8-4C72-4CD3-973E-327BDA880DF5}.Release|Any CPU.Build.0 = Release|Any CPU - {C7FC5FC8-4C72-4CD3-973E-327BDA880DF5}.Release|ARM.ActiveCfg = Release|Any CPU - {C7FC5FC8-4C72-4CD3-973E-327BDA880DF5}.Release|ARM.Build.0 = Release|Any CPU - {C7FC5FC8-4C72-4CD3-973E-327BDA880DF5}.Release|ARM64.ActiveCfg = Release|Any CPU - {C7FC5FC8-4C72-4CD3-973E-327BDA880DF5}.Release|ARM64.Build.0 = Release|Any CPU - {C7FC5FC8-4C72-4CD3-973E-327BDA880DF5}.Release|x64.ActiveCfg = Release|Any CPU - {C7FC5FC8-4C72-4CD3-973E-327BDA880DF5}.Release|x64.Build.0 = Release|Any CPU - {C7FC5FC8-4C72-4CD3-973E-327BDA880DF5}.Release|x86.ActiveCfg = Release|Any CPU - {C7FC5FC8-4C72-4CD3-973E-327BDA880DF5}.Release|x86.Build.0 = Release|Any CPU {268012B6-C4FC-4C40-802C-74D5FAD3CA45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {268012B6-C4FC-4C40-802C-74D5FAD3CA45}.Debug|Any CPU.Build.0 = Debug|Any CPU {268012B6-C4FC-4C40-802C-74D5FAD3CA45}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -1374,246 +1230,6 @@ Global {A456D582-D910-4CA2-8620-6D8F63344B47}.Release|x64.Build.0 = Release|Any CPU {A456D582-D910-4CA2-8620-6D8F63344B47}.Release|x86.ActiveCfg = Release|Any CPU {A456D582-D910-4CA2-8620-6D8F63344B47}.Release|x86.Build.0 = Release|Any CPU - {6A3FC66D-0B89-45E8-B39B-9D81538002D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A3FC66D-0B89-45E8-B39B-9D81538002D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A3FC66D-0B89-45E8-B39B-9D81538002D1}.Debug|ARM.ActiveCfg = Debug|Any CPU - {6A3FC66D-0B89-45E8-B39B-9D81538002D1}.Debug|ARM.Build.0 = Debug|Any CPU - {6A3FC66D-0B89-45E8-B39B-9D81538002D1}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {6A3FC66D-0B89-45E8-B39B-9D81538002D1}.Debug|ARM64.Build.0 = Debug|Any CPU - {6A3FC66D-0B89-45E8-B39B-9D81538002D1}.Debug|x64.ActiveCfg = Debug|Any CPU - {6A3FC66D-0B89-45E8-B39B-9D81538002D1}.Debug|x64.Build.0 = Debug|Any CPU - {6A3FC66D-0B89-45E8-B39B-9D81538002D1}.Debug|x86.ActiveCfg = Debug|Any CPU - {6A3FC66D-0B89-45E8-B39B-9D81538002D1}.Debug|x86.Build.0 = Debug|Any CPU - {6A3FC66D-0B89-45E8-B39B-9D81538002D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A3FC66D-0B89-45E8-B39B-9D81538002D1}.Release|Any CPU.Build.0 = Release|Any CPU - {6A3FC66D-0B89-45E8-B39B-9D81538002D1}.Release|ARM.ActiveCfg = Release|Any CPU - {6A3FC66D-0B89-45E8-B39B-9D81538002D1}.Release|ARM.Build.0 = Release|Any CPU - {6A3FC66D-0B89-45E8-B39B-9D81538002D1}.Release|ARM64.ActiveCfg = Release|Any CPU - {6A3FC66D-0B89-45E8-B39B-9D81538002D1}.Release|ARM64.Build.0 = Release|Any CPU - {6A3FC66D-0B89-45E8-B39B-9D81538002D1}.Release|x64.ActiveCfg = Release|Any CPU - {6A3FC66D-0B89-45E8-B39B-9D81538002D1}.Release|x64.Build.0 = Release|Any CPU - {6A3FC66D-0B89-45E8-B39B-9D81538002D1}.Release|x86.ActiveCfg = Release|Any CPU - {6A3FC66D-0B89-45E8-B39B-9D81538002D1}.Release|x86.Build.0 = Release|Any CPU - {2C17B9A9-B27B-4F07-AFB0-0F56A975D501}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2C17B9A9-B27B-4F07-AFB0-0F56A975D501}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2C17B9A9-B27B-4F07-AFB0-0F56A975D501}.Debug|ARM.ActiveCfg = Debug|Any CPU - {2C17B9A9-B27B-4F07-AFB0-0F56A975D501}.Debug|ARM.Build.0 = Debug|Any CPU - {2C17B9A9-B27B-4F07-AFB0-0F56A975D501}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {2C17B9A9-B27B-4F07-AFB0-0F56A975D501}.Debug|ARM64.Build.0 = Debug|Any CPU - {2C17B9A9-B27B-4F07-AFB0-0F56A975D501}.Debug|x64.ActiveCfg = Debug|Any CPU - {2C17B9A9-B27B-4F07-AFB0-0F56A975D501}.Debug|x64.Build.0 = Debug|Any CPU - {2C17B9A9-B27B-4F07-AFB0-0F56A975D501}.Debug|x86.ActiveCfg = Debug|Any CPU - {2C17B9A9-B27B-4F07-AFB0-0F56A975D501}.Debug|x86.Build.0 = Debug|Any CPU - {2C17B9A9-B27B-4F07-AFB0-0F56A975D501}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2C17B9A9-B27B-4F07-AFB0-0F56A975D501}.Release|Any CPU.Build.0 = Release|Any CPU - {2C17B9A9-B27B-4F07-AFB0-0F56A975D501}.Release|ARM.ActiveCfg = Release|Any CPU - {2C17B9A9-B27B-4F07-AFB0-0F56A975D501}.Release|ARM.Build.0 = Release|Any CPU - {2C17B9A9-B27B-4F07-AFB0-0F56A975D501}.Release|ARM64.ActiveCfg = Release|Any CPU - {2C17B9A9-B27B-4F07-AFB0-0F56A975D501}.Release|ARM64.Build.0 = Release|Any CPU - {2C17B9A9-B27B-4F07-AFB0-0F56A975D501}.Release|x64.ActiveCfg = Release|Any CPU - {2C17B9A9-B27B-4F07-AFB0-0F56A975D501}.Release|x64.Build.0 = Release|Any CPU - {2C17B9A9-B27B-4F07-AFB0-0F56A975D501}.Release|x86.ActiveCfg = Release|Any CPU - {2C17B9A9-B27B-4F07-AFB0-0F56A975D501}.Release|x86.Build.0 = Release|Any CPU - {00C5B45D-9799-43F1-B07B-9F638AA9FF72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {00C5B45D-9799-43F1-B07B-9F638AA9FF72}.Debug|Any CPU.Build.0 = Debug|Any CPU - {00C5B45D-9799-43F1-B07B-9F638AA9FF72}.Debug|ARM.ActiveCfg = Debug|Any CPU - {00C5B45D-9799-43F1-B07B-9F638AA9FF72}.Debug|ARM.Build.0 = Debug|Any CPU - {00C5B45D-9799-43F1-B07B-9F638AA9FF72}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {00C5B45D-9799-43F1-B07B-9F638AA9FF72}.Debug|ARM64.Build.0 = Debug|Any CPU - {00C5B45D-9799-43F1-B07B-9F638AA9FF72}.Debug|x64.ActiveCfg = Debug|Any CPU - {00C5B45D-9799-43F1-B07B-9F638AA9FF72}.Debug|x64.Build.0 = Debug|Any CPU - {00C5B45D-9799-43F1-B07B-9F638AA9FF72}.Debug|x86.ActiveCfg = Debug|Any CPU - {00C5B45D-9799-43F1-B07B-9F638AA9FF72}.Debug|x86.Build.0 = Debug|Any CPU - {00C5B45D-9799-43F1-B07B-9F638AA9FF72}.Release|Any CPU.ActiveCfg = Release|Any CPU - {00C5B45D-9799-43F1-B07B-9F638AA9FF72}.Release|Any CPU.Build.0 = Release|Any CPU - {00C5B45D-9799-43F1-B07B-9F638AA9FF72}.Release|ARM.ActiveCfg = Release|Any CPU - {00C5B45D-9799-43F1-B07B-9F638AA9FF72}.Release|ARM.Build.0 = Release|Any CPU - {00C5B45D-9799-43F1-B07B-9F638AA9FF72}.Release|ARM64.ActiveCfg = Release|Any CPU - {00C5B45D-9799-43F1-B07B-9F638AA9FF72}.Release|ARM64.Build.0 = Release|Any CPU - {00C5B45D-9799-43F1-B07B-9F638AA9FF72}.Release|x64.ActiveCfg = Release|Any CPU - {00C5B45D-9799-43F1-B07B-9F638AA9FF72}.Release|x64.Build.0 = Release|Any CPU - {00C5B45D-9799-43F1-B07B-9F638AA9FF72}.Release|x86.ActiveCfg = Release|Any CPU - {00C5B45D-9799-43F1-B07B-9F638AA9FF72}.Release|x86.Build.0 = Release|Any CPU - {5083C91F-B23E-445D-8B7F-AF87E636E847}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5083C91F-B23E-445D-8B7F-AF87E636E847}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5083C91F-B23E-445D-8B7F-AF87E636E847}.Debug|ARM.ActiveCfg = Debug|Any CPU - {5083C91F-B23E-445D-8B7F-AF87E636E847}.Debug|ARM.Build.0 = Debug|Any CPU - {5083C91F-B23E-445D-8B7F-AF87E636E847}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {5083C91F-B23E-445D-8B7F-AF87E636E847}.Debug|ARM64.Build.0 = Debug|Any CPU - {5083C91F-B23E-445D-8B7F-AF87E636E847}.Debug|x64.ActiveCfg = Debug|Any CPU - {5083C91F-B23E-445D-8B7F-AF87E636E847}.Debug|x64.Build.0 = Debug|Any CPU - {5083C91F-B23E-445D-8B7F-AF87E636E847}.Debug|x86.ActiveCfg = Debug|Any CPU - {5083C91F-B23E-445D-8B7F-AF87E636E847}.Debug|x86.Build.0 = Debug|Any CPU - {5083C91F-B23E-445D-8B7F-AF87E636E847}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5083C91F-B23E-445D-8B7F-AF87E636E847}.Release|Any CPU.Build.0 = Release|Any CPU - {5083C91F-B23E-445D-8B7F-AF87E636E847}.Release|ARM.ActiveCfg = Release|Any CPU - {5083C91F-B23E-445D-8B7F-AF87E636E847}.Release|ARM.Build.0 = Release|Any CPU - {5083C91F-B23E-445D-8B7F-AF87E636E847}.Release|ARM64.ActiveCfg = Release|Any CPU - {5083C91F-B23E-445D-8B7F-AF87E636E847}.Release|ARM64.Build.0 = Release|Any CPU - {5083C91F-B23E-445D-8B7F-AF87E636E847}.Release|x64.ActiveCfg = Release|Any CPU - {5083C91F-B23E-445D-8B7F-AF87E636E847}.Release|x64.Build.0 = Release|Any CPU - {5083C91F-B23E-445D-8B7F-AF87E636E847}.Release|x86.ActiveCfg = Release|Any CPU - {5083C91F-B23E-445D-8B7F-AF87E636E847}.Release|x86.Build.0 = Release|Any CPU - {F67FBFAC-6C80-466D-A596-1B9B10E885FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F67FBFAC-6C80-466D-A596-1B9B10E885FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F67FBFAC-6C80-466D-A596-1B9B10E885FC}.Debug|ARM.ActiveCfg = Debug|Any CPU - {F67FBFAC-6C80-466D-A596-1B9B10E885FC}.Debug|ARM.Build.0 = Debug|Any CPU - {F67FBFAC-6C80-466D-A596-1B9B10E885FC}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {F67FBFAC-6C80-466D-A596-1B9B10E885FC}.Debug|ARM64.Build.0 = Debug|Any CPU - {F67FBFAC-6C80-466D-A596-1B9B10E885FC}.Debug|x64.ActiveCfg = Debug|Any CPU - {F67FBFAC-6C80-466D-A596-1B9B10E885FC}.Debug|x64.Build.0 = Debug|Any CPU - {F67FBFAC-6C80-466D-A596-1B9B10E885FC}.Debug|x86.ActiveCfg = Debug|Any CPU - {F67FBFAC-6C80-466D-A596-1B9B10E885FC}.Debug|x86.Build.0 = Debug|Any CPU - {F67FBFAC-6C80-466D-A596-1B9B10E885FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F67FBFAC-6C80-466D-A596-1B9B10E885FC}.Release|Any CPU.Build.0 = Release|Any CPU - {F67FBFAC-6C80-466D-A596-1B9B10E885FC}.Release|ARM.ActiveCfg = Release|Any CPU - {F67FBFAC-6C80-466D-A596-1B9B10E885FC}.Release|ARM.Build.0 = Release|Any CPU - {F67FBFAC-6C80-466D-A596-1B9B10E885FC}.Release|ARM64.ActiveCfg = Release|Any CPU - {F67FBFAC-6C80-466D-A596-1B9B10E885FC}.Release|ARM64.Build.0 = Release|Any CPU - {F67FBFAC-6C80-466D-A596-1B9B10E885FC}.Release|x64.ActiveCfg = Release|Any CPU - {F67FBFAC-6C80-466D-A596-1B9B10E885FC}.Release|x64.Build.0 = Release|Any CPU - {F67FBFAC-6C80-466D-A596-1B9B10E885FC}.Release|x86.ActiveCfg = Release|Any CPU - {F67FBFAC-6C80-466D-A596-1B9B10E885FC}.Release|x86.Build.0 = Release|Any CPU - {8940F1E2-693D-407E-AD03-722718860609}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8940F1E2-693D-407E-AD03-722718860609}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8940F1E2-693D-407E-AD03-722718860609}.Debug|ARM.ActiveCfg = Debug|Any CPU - {8940F1E2-693D-407E-AD03-722718860609}.Debug|ARM.Build.0 = Debug|Any CPU - {8940F1E2-693D-407E-AD03-722718860609}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {8940F1E2-693D-407E-AD03-722718860609}.Debug|ARM64.Build.0 = Debug|Any CPU - {8940F1E2-693D-407E-AD03-722718860609}.Debug|x64.ActiveCfg = Debug|Any CPU - {8940F1E2-693D-407E-AD03-722718860609}.Debug|x64.Build.0 = Debug|Any CPU - {8940F1E2-693D-407E-AD03-722718860609}.Debug|x86.ActiveCfg = Debug|Any CPU - {8940F1E2-693D-407E-AD03-722718860609}.Debug|x86.Build.0 = Debug|Any CPU - {8940F1E2-693D-407E-AD03-722718860609}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8940F1E2-693D-407E-AD03-722718860609}.Release|Any CPU.Build.0 = Release|Any CPU - {8940F1E2-693D-407E-AD03-722718860609}.Release|ARM.ActiveCfg = Release|Any CPU - {8940F1E2-693D-407E-AD03-722718860609}.Release|ARM.Build.0 = Release|Any CPU - {8940F1E2-693D-407E-AD03-722718860609}.Release|ARM64.ActiveCfg = Release|Any CPU - {8940F1E2-693D-407E-AD03-722718860609}.Release|ARM64.Build.0 = Release|Any CPU - {8940F1E2-693D-407E-AD03-722718860609}.Release|x64.ActiveCfg = Release|Any CPU - {8940F1E2-693D-407E-AD03-722718860609}.Release|x64.Build.0 = Release|Any CPU - {8940F1E2-693D-407E-AD03-722718860609}.Release|x86.ActiveCfg = Release|Any CPU - {8940F1E2-693D-407E-AD03-722718860609}.Release|x86.Build.0 = Release|Any CPU - {DF8B4C38-39DE-4220-AB60-885CAE6D1E47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DF8B4C38-39DE-4220-AB60-885CAE6D1E47}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DF8B4C38-39DE-4220-AB60-885CAE6D1E47}.Debug|ARM.ActiveCfg = Debug|Any CPU - {DF8B4C38-39DE-4220-AB60-885CAE6D1E47}.Debug|ARM.Build.0 = Debug|Any CPU - {DF8B4C38-39DE-4220-AB60-885CAE6D1E47}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {DF8B4C38-39DE-4220-AB60-885CAE6D1E47}.Debug|ARM64.Build.0 = Debug|Any CPU - {DF8B4C38-39DE-4220-AB60-885CAE6D1E47}.Debug|x64.ActiveCfg = Debug|Any CPU - {DF8B4C38-39DE-4220-AB60-885CAE6D1E47}.Debug|x64.Build.0 = Debug|Any CPU - {DF8B4C38-39DE-4220-AB60-885CAE6D1E47}.Debug|x86.ActiveCfg = Debug|Any CPU - {DF8B4C38-39DE-4220-AB60-885CAE6D1E47}.Debug|x86.Build.0 = Debug|Any CPU - {DF8B4C38-39DE-4220-AB60-885CAE6D1E47}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DF8B4C38-39DE-4220-AB60-885CAE6D1E47}.Release|Any CPU.Build.0 = Release|Any CPU - {DF8B4C38-39DE-4220-AB60-885CAE6D1E47}.Release|ARM.ActiveCfg = Release|Any CPU - {DF8B4C38-39DE-4220-AB60-885CAE6D1E47}.Release|ARM.Build.0 = Release|Any CPU - {DF8B4C38-39DE-4220-AB60-885CAE6D1E47}.Release|ARM64.ActiveCfg = Release|Any CPU - {DF8B4C38-39DE-4220-AB60-885CAE6D1E47}.Release|ARM64.Build.0 = Release|Any CPU - {DF8B4C38-39DE-4220-AB60-885CAE6D1E47}.Release|x64.ActiveCfg = Release|Any CPU - {DF8B4C38-39DE-4220-AB60-885CAE6D1E47}.Release|x64.Build.0 = Release|Any CPU - {DF8B4C38-39DE-4220-AB60-885CAE6D1E47}.Release|x86.ActiveCfg = Release|Any CPU - {DF8B4C38-39DE-4220-AB60-885CAE6D1E47}.Release|x86.Build.0 = Release|Any CPU - {28EBFC11-184A-4B88-A7B3-84F3FD768520}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {28EBFC11-184A-4B88-A7B3-84F3FD768520}.Debug|Any CPU.Build.0 = Debug|Any CPU - {28EBFC11-184A-4B88-A7B3-84F3FD768520}.Debug|ARM.ActiveCfg = Debug|Any CPU - {28EBFC11-184A-4B88-A7B3-84F3FD768520}.Debug|ARM.Build.0 = Debug|Any CPU - {28EBFC11-184A-4B88-A7B3-84F3FD768520}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {28EBFC11-184A-4B88-A7B3-84F3FD768520}.Debug|ARM64.Build.0 = Debug|Any CPU - {28EBFC11-184A-4B88-A7B3-84F3FD768520}.Debug|x64.ActiveCfg = Debug|Any CPU - {28EBFC11-184A-4B88-A7B3-84F3FD768520}.Debug|x64.Build.0 = Debug|Any CPU - {28EBFC11-184A-4B88-A7B3-84F3FD768520}.Debug|x86.ActiveCfg = Debug|Any CPU - {28EBFC11-184A-4B88-A7B3-84F3FD768520}.Debug|x86.Build.0 = Debug|Any CPU - {28EBFC11-184A-4B88-A7B3-84F3FD768520}.Release|Any CPU.ActiveCfg = Release|Any CPU - {28EBFC11-184A-4B88-A7B3-84F3FD768520}.Release|Any CPU.Build.0 = Release|Any CPU - {28EBFC11-184A-4B88-A7B3-84F3FD768520}.Release|ARM.ActiveCfg = Release|Any CPU - {28EBFC11-184A-4B88-A7B3-84F3FD768520}.Release|ARM.Build.0 = Release|Any CPU - {28EBFC11-184A-4B88-A7B3-84F3FD768520}.Release|ARM64.ActiveCfg = Release|Any CPU - {28EBFC11-184A-4B88-A7B3-84F3FD768520}.Release|ARM64.Build.0 = Release|Any CPU - {28EBFC11-184A-4B88-A7B3-84F3FD768520}.Release|x64.ActiveCfg = Release|Any CPU - {28EBFC11-184A-4B88-A7B3-84F3FD768520}.Release|x64.Build.0 = Release|Any CPU - {28EBFC11-184A-4B88-A7B3-84F3FD768520}.Release|x86.ActiveCfg = Release|Any CPU - {28EBFC11-184A-4B88-A7B3-84F3FD768520}.Release|x86.Build.0 = Release|Any CPU - {897F8379-3301-4CBE-9BCA-AF7FD2F963A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {897F8379-3301-4CBE-9BCA-AF7FD2F963A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {897F8379-3301-4CBE-9BCA-AF7FD2F963A9}.Debug|ARM.ActiveCfg = Debug|Any CPU - {897F8379-3301-4CBE-9BCA-AF7FD2F963A9}.Debug|ARM.Build.0 = Debug|Any CPU - {897F8379-3301-4CBE-9BCA-AF7FD2F963A9}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {897F8379-3301-4CBE-9BCA-AF7FD2F963A9}.Debug|ARM64.Build.0 = Debug|Any CPU - {897F8379-3301-4CBE-9BCA-AF7FD2F963A9}.Debug|x64.ActiveCfg = Debug|Any CPU - {897F8379-3301-4CBE-9BCA-AF7FD2F963A9}.Debug|x64.Build.0 = Debug|Any CPU - {897F8379-3301-4CBE-9BCA-AF7FD2F963A9}.Debug|x86.ActiveCfg = Debug|Any CPU - {897F8379-3301-4CBE-9BCA-AF7FD2F963A9}.Debug|x86.Build.0 = Debug|Any CPU - {897F8379-3301-4CBE-9BCA-AF7FD2F963A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {897F8379-3301-4CBE-9BCA-AF7FD2F963A9}.Release|Any CPU.Build.0 = Release|Any CPU - {897F8379-3301-4CBE-9BCA-AF7FD2F963A9}.Release|ARM.ActiveCfg = Release|Any CPU - {897F8379-3301-4CBE-9BCA-AF7FD2F963A9}.Release|ARM.Build.0 = Release|Any CPU - {897F8379-3301-4CBE-9BCA-AF7FD2F963A9}.Release|ARM64.ActiveCfg = Release|Any CPU - {897F8379-3301-4CBE-9BCA-AF7FD2F963A9}.Release|ARM64.Build.0 = Release|Any CPU - {897F8379-3301-4CBE-9BCA-AF7FD2F963A9}.Release|x64.ActiveCfg = Release|Any CPU - {897F8379-3301-4CBE-9BCA-AF7FD2F963A9}.Release|x64.Build.0 = Release|Any CPU - {897F8379-3301-4CBE-9BCA-AF7FD2F963A9}.Release|x86.ActiveCfg = Release|Any CPU - {897F8379-3301-4CBE-9BCA-AF7FD2F963A9}.Release|x86.Build.0 = Release|Any CPU - {06F30619-AD37-4CA0-838F-0431867E0932}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {06F30619-AD37-4CA0-838F-0431867E0932}.Debug|Any CPU.Build.0 = Debug|Any CPU - {06F30619-AD37-4CA0-838F-0431867E0932}.Debug|ARM.ActiveCfg = Debug|Any CPU - {06F30619-AD37-4CA0-838F-0431867E0932}.Debug|ARM.Build.0 = Debug|Any CPU - {06F30619-AD37-4CA0-838F-0431867E0932}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {06F30619-AD37-4CA0-838F-0431867E0932}.Debug|ARM64.Build.0 = Debug|Any CPU - {06F30619-AD37-4CA0-838F-0431867E0932}.Debug|x64.ActiveCfg = Debug|Any CPU - {06F30619-AD37-4CA0-838F-0431867E0932}.Debug|x64.Build.0 = Debug|Any CPU - {06F30619-AD37-4CA0-838F-0431867E0932}.Debug|x86.ActiveCfg = Debug|Any CPU - {06F30619-AD37-4CA0-838F-0431867E0932}.Debug|x86.Build.0 = Debug|Any CPU - {06F30619-AD37-4CA0-838F-0431867E0932}.Release|Any CPU.ActiveCfg = Release|Any CPU - {06F30619-AD37-4CA0-838F-0431867E0932}.Release|Any CPU.Build.0 = Release|Any CPU - {06F30619-AD37-4CA0-838F-0431867E0932}.Release|ARM.ActiveCfg = Release|Any CPU - {06F30619-AD37-4CA0-838F-0431867E0932}.Release|ARM.Build.0 = Release|Any CPU - {06F30619-AD37-4CA0-838F-0431867E0932}.Release|ARM64.ActiveCfg = Release|Any CPU - {06F30619-AD37-4CA0-838F-0431867E0932}.Release|ARM64.Build.0 = Release|Any CPU - {06F30619-AD37-4CA0-838F-0431867E0932}.Release|x64.ActiveCfg = Release|Any CPU - {06F30619-AD37-4CA0-838F-0431867E0932}.Release|x64.Build.0 = Release|Any CPU - {06F30619-AD37-4CA0-838F-0431867E0932}.Release|x86.ActiveCfg = Release|Any CPU - {06F30619-AD37-4CA0-838F-0431867E0932}.Release|x86.Build.0 = Release|Any CPU - {2DB084E8-B951-4D71-A203-FD0902EBA2C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2DB084E8-B951-4D71-A203-FD0902EBA2C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2DB084E8-B951-4D71-A203-FD0902EBA2C6}.Debug|ARM.ActiveCfg = Debug|Any CPU - {2DB084E8-B951-4D71-A203-FD0902EBA2C6}.Debug|ARM.Build.0 = Debug|Any CPU - {2DB084E8-B951-4D71-A203-FD0902EBA2C6}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {2DB084E8-B951-4D71-A203-FD0902EBA2C6}.Debug|ARM64.Build.0 = Debug|Any CPU - {2DB084E8-B951-4D71-A203-FD0902EBA2C6}.Debug|x64.ActiveCfg = Debug|Any CPU - {2DB084E8-B951-4D71-A203-FD0902EBA2C6}.Debug|x64.Build.0 = Debug|Any CPU - {2DB084E8-B951-4D71-A203-FD0902EBA2C6}.Debug|x86.ActiveCfg = Debug|Any CPU - {2DB084E8-B951-4D71-A203-FD0902EBA2C6}.Debug|x86.Build.0 = Debug|Any CPU - {2DB084E8-B951-4D71-A203-FD0902EBA2C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2DB084E8-B951-4D71-A203-FD0902EBA2C6}.Release|Any CPU.Build.0 = Release|Any CPU - {2DB084E8-B951-4D71-A203-FD0902EBA2C6}.Release|ARM.ActiveCfg = Release|Any CPU - {2DB084E8-B951-4D71-A203-FD0902EBA2C6}.Release|ARM.Build.0 = Release|Any CPU - {2DB084E8-B951-4D71-A203-FD0902EBA2C6}.Release|ARM64.ActiveCfg = Release|Any CPU - {2DB084E8-B951-4D71-A203-FD0902EBA2C6}.Release|ARM64.Build.0 = Release|Any CPU - {2DB084E8-B951-4D71-A203-FD0902EBA2C6}.Release|x64.ActiveCfg = Release|Any CPU - {2DB084E8-B951-4D71-A203-FD0902EBA2C6}.Release|x64.Build.0 = Release|Any CPU - {2DB084E8-B951-4D71-A203-FD0902EBA2C6}.Release|x86.ActiveCfg = Release|Any CPU - {2DB084E8-B951-4D71-A203-FD0902EBA2C6}.Release|x86.Build.0 = Release|Any CPU - {E7CC45BF-7393-4BA7-A9AD-B1A1F5B265F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7CC45BF-7393-4BA7-A9AD-B1A1F5B265F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7CC45BF-7393-4BA7-A9AD-B1A1F5B265F3}.Debug|ARM.ActiveCfg = Debug|Any CPU - {E7CC45BF-7393-4BA7-A9AD-B1A1F5B265F3}.Debug|ARM.Build.0 = Debug|Any CPU - {E7CC45BF-7393-4BA7-A9AD-B1A1F5B265F3}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {E7CC45BF-7393-4BA7-A9AD-B1A1F5B265F3}.Debug|ARM64.Build.0 = Debug|Any CPU - {E7CC45BF-7393-4BA7-A9AD-B1A1F5B265F3}.Debug|x64.ActiveCfg = Debug|Any CPU - {E7CC45BF-7393-4BA7-A9AD-B1A1F5B265F3}.Debug|x64.Build.0 = Debug|Any CPU - {E7CC45BF-7393-4BA7-A9AD-B1A1F5B265F3}.Debug|x86.ActiveCfg = Debug|Any CPU - {E7CC45BF-7393-4BA7-A9AD-B1A1F5B265F3}.Debug|x86.Build.0 = Debug|Any CPU - {E7CC45BF-7393-4BA7-A9AD-B1A1F5B265F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7CC45BF-7393-4BA7-A9AD-B1A1F5B265F3}.Release|Any CPU.Build.0 = Release|Any CPU - {E7CC45BF-7393-4BA7-A9AD-B1A1F5B265F3}.Release|ARM.ActiveCfg = Release|Any CPU - {E7CC45BF-7393-4BA7-A9AD-B1A1F5B265F3}.Release|ARM.Build.0 = Release|Any CPU - {E7CC45BF-7393-4BA7-A9AD-B1A1F5B265F3}.Release|ARM64.ActiveCfg = Release|Any CPU - {E7CC45BF-7393-4BA7-A9AD-B1A1F5B265F3}.Release|ARM64.Build.0 = Release|Any CPU - {E7CC45BF-7393-4BA7-A9AD-B1A1F5B265F3}.Release|x64.ActiveCfg = Release|Any CPU - {E7CC45BF-7393-4BA7-A9AD-B1A1F5B265F3}.Release|x64.Build.0 = Release|Any CPU - {E7CC45BF-7393-4BA7-A9AD-B1A1F5B265F3}.Release|x86.ActiveCfg = Release|Any CPU - {E7CC45BF-7393-4BA7-A9AD-B1A1F5B265F3}.Release|x86.Build.0 = Release|Any CPU {BA588F22-87FB-4124-AF62-CA8DC492ED7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BA588F22-87FB-4124-AF62-CA8DC492ED7D}.Debug|Any CPU.Build.0 = Debug|Any CPU {BA588F22-87FB-4124-AF62-CA8DC492ED7D}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -1654,26 +1270,6 @@ Global {D5081D7B-3EBB-42C7-8FB9-A889870D08C2}.Release|x64.Build.0 = Release|Any CPU {D5081D7B-3EBB-42C7-8FB9-A889870D08C2}.Release|x86.ActiveCfg = Release|Any CPU {D5081D7B-3EBB-42C7-8FB9-A889870D08C2}.Release|x86.Build.0 = Release|Any CPU - {7A7547D3-F2EF-4DA4-AD45-D1B49210082B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7A7547D3-F2EF-4DA4-AD45-D1B49210082B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7A7547D3-F2EF-4DA4-AD45-D1B49210082B}.Debug|ARM.ActiveCfg = Debug|Any CPU - {7A7547D3-F2EF-4DA4-AD45-D1B49210082B}.Debug|ARM.Build.0 = Debug|Any CPU - {7A7547D3-F2EF-4DA4-AD45-D1B49210082B}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {7A7547D3-F2EF-4DA4-AD45-D1B49210082B}.Debug|ARM64.Build.0 = Debug|Any CPU - {7A7547D3-F2EF-4DA4-AD45-D1B49210082B}.Debug|x64.ActiveCfg = Debug|Any CPU - {7A7547D3-F2EF-4DA4-AD45-D1B49210082B}.Debug|x64.Build.0 = Debug|Any CPU - {7A7547D3-F2EF-4DA4-AD45-D1B49210082B}.Debug|x86.ActiveCfg = Debug|Any CPU - {7A7547D3-F2EF-4DA4-AD45-D1B49210082B}.Debug|x86.Build.0 = Debug|Any CPU - {7A7547D3-F2EF-4DA4-AD45-D1B49210082B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7A7547D3-F2EF-4DA4-AD45-D1B49210082B}.Release|Any CPU.Build.0 = Release|Any CPU - {7A7547D3-F2EF-4DA4-AD45-D1B49210082B}.Release|ARM.ActiveCfg = Release|Any CPU - {7A7547D3-F2EF-4DA4-AD45-D1B49210082B}.Release|ARM.Build.0 = Release|Any CPU - {7A7547D3-F2EF-4DA4-AD45-D1B49210082B}.Release|ARM64.ActiveCfg = Release|Any CPU - {7A7547D3-F2EF-4DA4-AD45-D1B49210082B}.Release|ARM64.Build.0 = Release|Any CPU - {7A7547D3-F2EF-4DA4-AD45-D1B49210082B}.Release|x64.ActiveCfg = Release|Any CPU - {7A7547D3-F2EF-4DA4-AD45-D1B49210082B}.Release|x64.Build.0 = Release|Any CPU - {7A7547D3-F2EF-4DA4-AD45-D1B49210082B}.Release|x86.ActiveCfg = Release|Any CPU - {7A7547D3-F2EF-4DA4-AD45-D1B49210082B}.Release|x86.Build.0 = Release|Any CPU {CD0FBCF1-9C49-4032-96AD-B9E25F86F2A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CD0FBCF1-9C49-4032-96AD-B9E25F86F2A7}.Debug|Any CPU.Build.0 = Debug|Any CPU {CD0FBCF1-9C49-4032-96AD-B9E25F86F2A7}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -2090,17 +1686,12 @@ Global {0827FA85-8180-4A85-BE58-9483AC4BB3BA} = {9FB27073-61A0-4FE3-94DB-5FDDE062332F} {8878BCFD-AC5E-4D84-8C63-CA99DDE036EE} = {9FB27073-61A0-4FE3-94DB-5FDDE062332F} {B399BCFF-82E8-4940-9CE5-B7DCDDFDC696} = {9FB27073-61A0-4FE3-94DB-5FDDE062332F} - {A2A5CB83-11C7-4534-A65D-6F957B60EEFF} = {1A9920BA-7C8D-4BDC-8D7D-6544A71AF3CF} - {C517D33F-8800-405E-9D59-E1F6CA201431} = {1A9920BA-7C8D-4BDC-8D7D-6544A71AF3CF} {D3DBCC2D-086E-4E3A-B70A-22A79FB295CF} = {6CEA3385-6F62-452A-8275-033A6037235D} {2BA531E8-7F85-4EBF-AE97-811CD7C83EF2} = {8712125E-14CD-4E1B-A1CE-4BDE03805942} {4E393E60-D39A-4118-8BD5-427DC72E9ACE} = {8712125E-14CD-4E1B-A1CE-4BDE03805942} {FFECD10B-FE66-4331-A915-409F5BE04480} = {9FB27073-61A0-4FE3-94DB-5FDDE062332F} - {7D290C8E-ACA7-4F03-91DF-D507FB3E2E87} = {3D1D0E04-03FD-480A-8CF8-6E01A2E28625} - {F9AD1657-7FF9-470F-BE7F-2379ADAC0BB0} = {3D1D0E04-03FD-480A-8CF8-6E01A2E28625} {9F5E2879-972A-45FB-913C-89E9F0CEB189} = {666CB1A9-562E-453A-A2C7-FD9D77CFDFDD} {DCC07B39-E342-4841-B9E4-4D44DA2978FD} = {3D1D0E04-03FD-480A-8CF8-6E01A2E28625} - {C7FC5FC8-4C72-4CD3-973E-327BDA880DF5} = {1A9920BA-7C8D-4BDC-8D7D-6544A71AF3CF} {268012B6-C4FC-4C40-802C-74D5FAD3CA45} = {1A9920BA-7C8D-4BDC-8D7D-6544A71AF3CF} {EF5EF8EF-4A44-4E44-9594-D878CABC4182} = {6CEA3385-6F62-452A-8275-033A6037235D} {CB1BC55F-D267-4724-89BE-96E3A5E432A6} = {8712125E-14CD-4E1B-A1CE-4BDE03805942} @@ -2136,23 +1727,8 @@ Global {FA695D7E-6F12-4483-A16D-8494609FAE68} = {8712125E-14CD-4E1B-A1CE-4BDE03805942} {D609C4CF-FA5C-4D39-B12F-07A60FFE5E40} = {8712125E-14CD-4E1B-A1CE-4BDE03805942} {A456D582-D910-4CA2-8620-6D8F63344B47} = {8712125E-14CD-4E1B-A1CE-4BDE03805942} - {6A3FC66D-0B89-45E8-B39B-9D81538002D1} = {5300552F-560D-474A-8D96-0A2747D08F64} - {5300552F-560D-474A-8D96-0A2747D08F64} = {7B0175AD-BB74-4A98-B9A7-1E289032485E} - {2C17B9A9-B27B-4F07-AFB0-0F56A975D501} = {CDC1E762-5E1D-4AE1-9DF2-B85761539086} - {00C5B45D-9799-43F1-B07B-9F638AA9FF72} = {CDC1E762-5E1D-4AE1-9DF2-B85761539086} - {5083C91F-B23E-445D-8B7F-AF87E636E847} = {CDC1E762-5E1D-4AE1-9DF2-B85761539086} - {F67FBFAC-6C80-466D-A596-1B9B10E885FC} = {CDC1E762-5E1D-4AE1-9DF2-B85761539086} - {8940F1E2-693D-407E-AD03-722718860609} = {CDC1E762-5E1D-4AE1-9DF2-B85761539086} - {06F0B369-0483-46DD-82D2-70431FB505C1} = {7B0175AD-BB74-4A98-B9A7-1E289032485E} - {DF8B4C38-39DE-4220-AB60-885CAE6D1E47} = {06F0B369-0483-46DD-82D2-70431FB505C1} - {28EBFC11-184A-4B88-A7B3-84F3FD768520} = {CDC1E762-5E1D-4AE1-9DF2-B85761539086} - {897F8379-3301-4CBE-9BCA-AF7FD2F963A9} = {CDC1E762-5E1D-4AE1-9DF2-B85761539086} - {06F30619-AD37-4CA0-838F-0431867E0932} = {CDC1E762-5E1D-4AE1-9DF2-B85761539086} - {2DB084E8-B951-4D71-A203-FD0902EBA2C6} = {CDC1E762-5E1D-4AE1-9DF2-B85761539086} - {E7CC45BF-7393-4BA7-A9AD-B1A1F5B265F3} = {CDC1E762-5E1D-4AE1-9DF2-B85761539086} {BA588F22-87FB-4124-AF62-CA8DC492ED7D} = {8712125E-14CD-4E1B-A1CE-4BDE03805942} {D5081D7B-3EBB-42C7-8FB9-A889870D08C2} = {9FB27073-61A0-4FE3-94DB-5FDDE062332F} - {7A7547D3-F2EF-4DA4-AD45-D1B49210082B} = {06F0B369-0483-46DD-82D2-70431FB505C1} {CD0FBCF1-9C49-4032-96AD-B9E25F86F2A7} = {9FB27073-61A0-4FE3-94DB-5FDDE062332F} {C6984F48-A0FE-47A4-B63B-E4E5BCFCD6D3} = {7BE13E55-D8B1-4232-AE63-8BF122633297} {C5968A90-F4CF-4904-88C4-62C77C820A04} = {7BE13E55-D8B1-4232-AE63-8BF122633297} diff --git a/TestDemo/TestDemo.csproj b/TestDemo/TestDemo.csproj index 0c4f1d71..511d455c 100644 --- a/TestDemo/TestDemo.csproj +++ b/TestDemo/TestDemo.csproj @@ -19,7 +19,6 @@ - diff --git a/WPFDemo/Bb/ViewModel.cs b/WPFDemo/Bb/ViewModel.cs index bf6ba8c3..ff69c30b 100644 --- a/WPFDemo/Bb/ViewModel.cs +++ b/WPFDemo/Bb/ViewModel.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; using System.Collections.ObjectModel; namespace WPFDemo.Bb { - public class ViewModel : ObservableObject + public class ViewModel : NotifyBase { public ViewModel() { diff --git a/WPFDemo/Class1.cs b/WPFDemo/Class1.cs index 99daede0..5329ce77 100644 --- a/WPFDemo/Class1.cs +++ b/WPFDemo/Class1.cs @@ -4,13 +4,13 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using BPASmartClient.Helper; -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System.Collections.ObjectModel; using Microsoft.Toolkit.Mvvm.Input; namespace WPFDemo { - public class Class1 : ObservableObject + public class Class1 : NotifyBase { public Class1() { diff --git a/WPFDemo/TheListBox.xaml.cs b/WPFDemo/TheListBox.xaml.cs index 0deb7f72..92e67f11 100644 --- a/WPFDemo/TheListBox.xaml.cs +++ b/WPFDemo/TheListBox.xaml.cs @@ -1,4 +1,4 @@ -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -254,7 +254,7 @@ namespace WPFDemo /// /// 当前项数据Model /// - public class ListBoxDataModel : ObservableObject + public class ListBoxDataModel : NotifyBase { private ObservableCollection _ViewItems; public ObservableCollection ViewItems @@ -277,7 +277,7 @@ namespace WPFDemo /// /// 行数据Model /// - public class ItemModel : ObservableObject + public class ItemModel : NotifyBase { private string _Name; public string Name diff --git a/WPFDemo/WPFDemo.csproj b/WPFDemo/WPFDemo.csproj index 8924ae6f..d70773e3 100644 --- a/WPFDemo/WPFDemo.csproj +++ b/WPFDemo/WPFDemo.csproj @@ -21,7 +21,6 @@ - diff --git a/WPFDemo/Window2.xaml.cs b/WPFDemo/Window2.xaml.cs index 9e4a9e90..dd33a498 100644 --- a/WPFDemo/Window2.xaml.cs +++ b/WPFDemo/Window2.xaml.cs @@ -1,4 +1,4 @@ -using Microsoft.Toolkit.Mvvm.ComponentModel; +using BPA.Helper; using System; using System.Collections.Generic; using System.Collections.ObjectModel;