From 8d95c34a505c8b9fbd4e919d41b62bbd96c7e710 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 20:34:06 +0800 Subject: [PATCH] 1 --- BPASmartClient.Business/Plugin/DeviceMgr.cs | 2 +- BPASmartClient.MilkWithTea/MainWindow.xaml.cs | 4 ++-- .../ViewModel/PatrameterSettiongViewModel.cs | 2 +- BPASmartClient.ViewModel/LogOrAlarmViewModel.cs | 2 -- BPASmartClient.ViewModel/NewShopWindowModel.cs | 3 ++- BPASmartClient/Control/ShopDeviceConfigView.xaml.cs | 4 ++-- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/BPASmartClient.Business/Plugin/DeviceMgr.cs b/BPASmartClient.Business/Plugin/DeviceMgr.cs index c3bc92cb..2db88937 100644 --- a/BPASmartClient.Business/Plugin/DeviceMgr.cs +++ b/BPASmartClient.Business/Plugin/DeviceMgr.cs @@ -51,7 +51,7 @@ namespace BPASmartClient.Business { var result = Plugin.GetInstance().GetPlugin()?.deviceConfigModelJsons; //var text = TextHelper.GetInstance.ReadTextInfo("StartShop", "DeviceConfig"); - //string path = $"{LocaPath.GetInstance().GetDeviceConfigPath}{text}.json"; + //string path = $"{LocaPath.GetDeviceConfigPath}{text}.json"; //if (File.Exists(path)) //{ //string JsonString = File.ReadAllText(path); diff --git a/BPASmartClient.MilkWithTea/MainWindow.xaml.cs b/BPASmartClient.MilkWithTea/MainWindow.xaml.cs index f2a56017..cafe065c 100644 --- a/BPASmartClient.MilkWithTea/MainWindow.xaml.cs +++ b/BPASmartClient.MilkWithTea/MainWindow.xaml.cs @@ -50,7 +50,7 @@ namespace BPASmartClient.MilkWithTea private void CreateDevice() { - DirectoryInfo directoryInfo = new DirectoryInfo(LocaPath.GetInstance().GetDeviceConfigPath); + DirectoryInfo directoryInfo = new DirectoryInfo(LocaPath.GetDeviceConfigPath); if(!File.Exists($"{directoryInfo}Moc.json")) { File.WriteAllText($"{directoryInfo}Moc.json", JsonConvert.SerializeObject(GLobal.deviceConfig)); @@ -89,7 +89,7 @@ namespace BPASmartClient.MilkWithTea ReadLeng = 0 }); } - File.WriteAllText($"{LocaPath.GetInstance().GetDeviceConfigPath}MOC.json", JsonConvert.SerializeObject(GLobal.deviceConfig)); + File.WriteAllText($"{LocaPath.GetDeviceConfigPath}MOC.json", JsonConvert.SerializeObject(GLobal.deviceConfig)); } } diff --git a/BPASmartClient.MilkWithTea/ViewModel/PatrameterSettiongViewModel.cs b/BPASmartClient.MilkWithTea/ViewModel/PatrameterSettiongViewModel.cs index 783a64c9..1aea5b26 100644 --- a/BPASmartClient.MilkWithTea/ViewModel/PatrameterSettiongViewModel.cs +++ b/BPASmartClient.MilkWithTea/ViewModel/PatrameterSettiongViewModel.cs @@ -187,7 +187,7 @@ namespace BPASmartClient.MilkWithTea.ViewModel GLobal.deviceConfig.ElementAtOrDefault(0).deviceModels.ElementAtOrDefault(0).communicationDevcies.ElementAtOrDefault(0).communicationPar.IPAddress = PLCAdress; } } - File.WriteAllText($"{LocaPath.GetInstance().GetDeviceConfigPath}MOC.json", JsonConvert.SerializeObject(GLobal.deviceConfig)); + File.WriteAllText($"{LocaPath.GetDeviceConfigPath}MOC.json", JsonConvert.SerializeObject(GLobal.deviceConfig)); } diff --git a/BPASmartClient.ViewModel/LogOrAlarmViewModel.cs b/BPASmartClient.ViewModel/LogOrAlarmViewModel.cs index b4860588..73fb4776 100644 --- a/BPASmartClient.ViewModel/LogOrAlarmViewModel.cs +++ b/BPASmartClient.ViewModel/LogOrAlarmViewModel.cs @@ -2,8 +2,6 @@ using BPASmartClient.CustomResource.UserControls.MessageShow; using BPA.Helper; using BPASmartClient.Model; -using BPA.Helper; - using System; using System.Collections.Generic; using System.Collections.ObjectModel; diff --git a/BPASmartClient.ViewModel/NewShopWindowModel.cs b/BPASmartClient.ViewModel/NewShopWindowModel.cs index e8100931..4c0dd42f 100644 --- a/BPASmartClient.ViewModel/NewShopWindowModel.cs +++ b/BPASmartClient.ViewModel/NewShopWindowModel.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using BPA.Helper; using System.Windows; using System.IO; +using BPASmartClient.Model; namespace BPASmartClient.ViewModel { @@ -17,7 +18,7 @@ namespace BPASmartClient.ViewModel CancelCommand = new BPARelayCommand(() => { ActionManage.GetInstance.Send("CloseWindow"); }); DefineCommand = new BPARelayCommand(() => { - DirectoryInfo directoryInfo = new DirectoryInfo(LocaPath.GetInstance().GetDeviceConfigPath); + DirectoryInfo directoryInfo = new DirectoryInfo(LocaPath.GetDeviceConfigPath); var files = directoryInfo.GetFiles(); if (files != null && files.FirstOrDefault(p => p.FullName.Contains(ShopName)) != null) { diff --git a/BPASmartClient/Control/ShopDeviceConfigView.xaml.cs b/BPASmartClient/Control/ShopDeviceConfigView.xaml.cs index df14e231..4b0887b0 100644 --- a/BPASmartClient/Control/ShopDeviceConfigView.xaml.cs +++ b/BPASmartClient/Control/ShopDeviceConfigView.xaml.cs @@ -139,7 +139,7 @@ namespace BPASmartClient.Control private void ComboBox_DropDownOpened(object sender, EventArgs e) { ShopDeviceConfigViewModel.Shops.Clear(); - DirectoryInfo directoryInfo = new DirectoryInfo(LocaPath.GetInstance().GetDeviceConfigPath); + DirectoryInfo directoryInfo = new DirectoryInfo(LocaPath.GetDeviceConfigPath); var files = directoryInfo.GetFiles(); foreach (var item in files) { @@ -152,7 +152,7 @@ namespace BPASmartClient.Control { var text = TextHelper.GetInstance.ReadTextInfo("StartShop", "DeviceConfig"); if (this.shop.Items.Contains(text)) this.shop.SelectedValue = text; - DirectoryInfo directoryInfo = new DirectoryInfo(LocaPath.GetInstance().GetDeviceConfigPath); + DirectoryInfo directoryInfo = new DirectoryInfo(LocaPath.GetDeviceConfigPath); var files = directoryInfo.GetFiles(); if (files != null && this.shop.SelectedValue != null && this.shop.SelectedValue.ToString().Length > 0) {