From d54eb8816ecb8e6ed46ede1c81f455bc3eaa8e9a 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: Mon, 16 May 2022 09:47:49 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../RecDictionarys/GlobalStyle.xaml | 12 +-
BPASmartClient/App.config | 14 +-
BPASmartClient/App.xaml | 2 +
.../Control/ShopDeviceConfigView.xaml | 1399 ++++++++---------
BPASmartClient/DeviceInfo.xml | 2 +-
BPASmartClient/MainWindow.xaml | 2 +-
6 files changed, 686 insertions(+), 745 deletions(-)
diff --git a/BPASmartClient.CustomResource/RecDictionarys/GlobalStyle.xaml b/BPASmartClient.CustomResource/RecDictionarys/GlobalStyle.xaml
index 2426ffba..8b6a4b0d 100644
--- a/BPASmartClient.CustomResource/RecDictionarys/GlobalStyle.xaml
+++ b/BPASmartClient.CustomResource/RecDictionarys/GlobalStyle.xaml
@@ -4,5 +4,15 @@
xmlns:con="clr-namespace:BPASmartClient.CustomResource.Converters">
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/BPASmartClient/App.config b/BPASmartClient/App.config
index 2fb2713f..1caea14f 100644
--- a/BPASmartClient/App.config
+++ b/BPASmartClient/App.config
@@ -3,7 +3,7 @@
-
+
@@ -16,8 +16,10 @@
-
- -->
+ -->
+
+
+
@@ -37,10 +39,10 @@
-
-
+
+
-
+
diff --git a/BPASmartClient/App.xaml b/BPASmartClient/App.xaml
index 29cb2e65..a85b3559 100644
--- a/BPASmartClient/App.xaml
+++ b/BPASmartClient/App.xaml
@@ -13,6 +13,8 @@
+
+
diff --git a/BPASmartClient/Control/ShopDeviceConfigView.xaml b/BPASmartClient/Control/ShopDeviceConfigView.xaml
index 358590c6..a242d89d 100644
--- a/BPASmartClient/Control/ShopDeviceConfigView.xaml
+++ b/BPASmartClient/Control/ShopDeviceConfigView.xaml
@@ -7,8 +7,8 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
xmlns:vm="clr-namespace:BPASmartClient.ViewModel;assembly=BPASmartClient.ViewModel"
- d:DesignHeight="450"
- d:DesignWidth="800"
+ d:DesignHeight="900"
+ d:DesignWidth="1200"
mc:Ignorable="d">
@@ -19,6 +19,7 @@
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -72,193 +323,204 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+ FontSize="20"
+ Foreground="#ff23caca"
+ IsEditable="False"
+ ItemsSource="{Binding ClientDevices}"
+ SelectedIndex="0"
+ Style="{StaticResource ComboBoxStyle}"
+ Text="{Binding ClientDeviceType}" />
-
+
-
-
+
-
-
-
-
-
+
-
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+ Grid.Column="5"
+ Width="170"
+ HorizontalAlignment="Left"
+ Style="{StaticResource TextBoxStyle}"
+ Text="" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Text="请选择设备模块：" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
+ Text="IP地址：" />
+ Width="170"
+ HorizontalAlignment="Left"
+ Style="{StaticResource TextBoxStyle}"
+ Text="{Binding Path=Device.IP}" />
-
+ Text="端口号：" />
+ Width="170"
+ HorizontalAlignment="Left"
+ Style="{StaticResource TextBoxStyle}"
+ Text="{Binding Path=Device.PortNum}" />
-
-
-
-
-
+ HorizontalAlignment="Right"
+ Style="{StaticResource TextBlockStyle}"
+ Text="站号：" />
+
+
-
+
- -->
-
-
+
-
-
-
-
+
+
+
+
- -->
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- -->
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- -->
-
-
+
+
+
+
+
+
+
-
diff --git a/BPASmartClient/DeviceInfo.xml b/BPASmartClient/DeviceInfo.xml
index 89e636c8..48d28f7c 100644
--- a/BPASmartClient/DeviceInfo.xml
+++ b/BPASmartClient/DeviceInfo.xml
@@ -38,7 +38,7 @@
-->
-
+
diff --git a/BPASmartClient/MainWindow.xaml b/BPASmartClient/MainWindow.xaml
index dc110869..f68747fa 100644
--- a/BPASmartClient/MainWindow.xaml
+++ b/BPASmartClient/MainWindow.xaml
@@ -13,7 +13,7 @@
Height="800"
AllowsTransparency="True"
Background="{x:Null}"
- Topmost="True"
+ Topmost="False"
WindowStartupLocation="CenterScreen"
WindowStyle="None"
mc:Ignorable="d">
From 73de27797a749ba5b3389a063368978a0b04fa23 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: Mon, 16 May 2022 13:50:34 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Model/DeviceConfigModel.cs | 4 +
.../NewShopWindowModel.cs | 26 +-
.../ShopDeviceConfigViewModel.cs | 47 ++-
.../Control/ShopDeviceConfigView.xaml | 82 +++--
.../DialogWindow/NewShopWindow.xaml | 312 ++++++------------
.../DialogWindow/NewShopWindow.xaml.cs | 18 +-
BPASmartClient/MainWindow.xaml.cs | 2 +-
7 files changed, 238 insertions(+), 253 deletions(-)
diff --git a/BPASmartClient.ViewModel/Model/DeviceConfigModel.cs b/BPASmartClient.ViewModel/Model/DeviceConfigModel.cs
index 8301b3ca..49e9d013 100644
--- a/BPASmartClient.ViewModel/Model/DeviceConfigModel.cs
+++ b/BPASmartClient.ViewModel/Model/DeviceConfigModel.cs
@@ -73,6 +73,10 @@ namespace BPASmartClient.ViewModel.Model
private string _mCommunicationModule = string.Empty;
+ public string CommunicationName { get { return _mCommunicationName; } set { _mCommunicationName = value; OnPropertyChanged(); } }
+ private string _mCommunicationName = string.Empty;
+
+
}
diff --git a/BPASmartClient.ViewModel/NewShopWindowModel.cs b/BPASmartClient.ViewModel/NewShopWindowModel.cs
index 7c2e1cc7..cef93844 100644
--- a/BPASmartClient.ViewModel/NewShopWindowModel.cs
+++ b/BPASmartClient.ViewModel/NewShopWindowModel.cs
@@ -3,7 +3,10 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using BPASmartClient.Helper;
using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using Microsoft.Toolkit.Mvvm.Messaging;
namespace BPASmartClient.ViewModel
{
@@ -11,7 +14,28 @@ namespace BPASmartClient.ViewModel
{
public NewShopWindowModel()
{
-
+ CloseWindowCommand = new RelayCommand(() => { WeakReferenceMessenger.Default.Send("", "CloseWindow"); });
+ CancelCommand = new RelayCommand(() => { WeakReferenceMessenger.Default.Send("", "CloseWindow"); });
+ DefineCommand = new RelayCommand(() =>
+ {
+ ActionManage.GetInstance.Send("ShopPar", new string[] { ShopName, ShopId });
+ WeakReferenceMessenger.Default.Send("", "CloseWindow");
+ });
}
+
+ public RelayCommand CloseWindowCommand { get; set; }
+
+ public RelayCommand CancelCommand { get; set; }
+
+ public RelayCommand DefineCommand { get; set; }
+
+ public string ShopName { get { return _mShopName; } set { _mShopName = value; OnPropertyChanged(); } }
+ private string _mShopName;
+
+ public string ShopId { get { return _mShopId; } set { _mShopId = value; OnPropertyChanged(); } }
+ private string _mShopId;
+
+
+
}
}
diff --git a/BPASmartClient.ViewModel/ShopDeviceConfigViewModel.cs b/BPASmartClient.ViewModel/ShopDeviceConfigViewModel.cs
index 51572f95..e7e0de7c 100644
--- a/BPASmartClient.ViewModel/ShopDeviceConfigViewModel.cs
+++ b/BPASmartClient.ViewModel/ShopDeviceConfigViewModel.cs
@@ -3,7 +3,11 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using BPASmartClient.Helper;
using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using BPASmartClient.ViewModel.Model;
+using System.Collections.ObjectModel;
namespace BPASmartClient.ViewModel
{
@@ -11,9 +15,50 @@ namespace BPASmartClient.ViewModel
{
public ShopDeviceConfigViewModel()
{
- //NewCommand = new Action(() => {ActionManager });
+ ActionManage.GetInstance.Register(new Action((o) =>
+ {
+ if (o != null && o is string[] par)
+ {
+ if (par.Length == 2)
+ {
+ ShopName = par[0];
+ ShopId = par[1];
+ }
+ }
+ }), "ShopPar");
+
+ ObservableCollection deviceModels = new ObservableCollection();
+ ObservableCollection communicationModels = new ObservableCollection();
+ communicationModels.Add(new CommunicationModel() { CommunicationName = "通讯1", CommunicationModule = "qidong" });
+ deviceModels.Add(new DeviceModel() { DeviceName = "设备1", DeviceId = "10", DeviceModule = "aa", communicationDevcies = communicationModels });
+ deviceConfig = new DeviceConfigModel()
+ {
+ ShopName = "且时且多",
+ ShopId = "10",
+ deviceModels = deviceModels
+ };
+
+ NewDeviceCommand = new RelayCommand((o) =>
+ {
+
+ });
}
public Action NewCommand { get; set; }
+
+ public RelayCommand NewDeviceCommand { get; set; }
+
+ public string ShopName { get { return _mShopName; } set { _mShopName = value; OnPropertyChanged(); } }
+ private string _mShopName = "店铺名称";
+
+ public string ShopId { get { return _mShopId; } set { _mShopId = value; OnPropertyChanged(); } }
+ private string _mShopId;
+
+ public ObservableCollection deviceConfig = new ObservableCollection();
+
+ //public DeviceConfigModel deviceConfig { get { return _mdeviceConfig; } set { _mdeviceConfig = value; OnPropertyChanged(); } }
+ //private DeviceConfigModel _mdeviceConfig;
+
+
}
}
diff --git a/BPASmartClient/Control/ShopDeviceConfigView.xaml b/BPASmartClient/Control/ShopDeviceConfigView.xaml
index a242d89d..c43c33c0 100644
--- a/BPASmartClient/Control/ShopDeviceConfigView.xaml
+++ b/BPASmartClient/Control/ShopDeviceConfigView.xaml
@@ -7,6 +7,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
xmlns:vm="clr-namespace:BPASmartClient.ViewModel;assembly=BPASmartClient.ViewModel"
+ xmlns:vmm="clr-namespace:BPASmartClient.ViewModel.Model;assembly=BPASmartClient.ViewModel"
d:DesignHeight="900"
d:DesignWidth="1200"
mc:Ignorable="d">
@@ -399,32 +400,70 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+ -->
+
+
+
+
+
+
@@ -482,7 +522,7 @@
Width="170"
HorizontalAlignment="Left"
Style="{StaticResource TextBoxStyle}"
- Text="{Binding Minute}" />
+ Text="{Binding ShopName}" />
+ Text="{Binding ShopId}" />
diff --git a/BPASmartClient/DialogWindow/NewShopWindow.xaml b/BPASmartClient/DialogWindow/NewShopWindow.xaml
index 37795b52..838849c1 100644
--- a/BPASmartClient/DialogWindow/NewShopWindow.xaml
+++ b/BPASmartClient/DialogWindow/NewShopWindow.xaml
@@ -8,8 +8,8 @@
xmlns:pry="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
xmlns:vm="clr-namespace:BPASmartClient.ViewModel;assembly=BPASmartClient.ViewModel"
Title="NewShopWindow"
- Width="850"
- Height="450"
+ Width="400"
+ Height="300"
AllowsTransparency="True"
Background="{x:Null}"
Opacity="0.8"
@@ -85,7 +85,6 @@
-
@@ -126,238 +125,111 @@
Visibility="Hidden" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/BPASmartClient/DialogWindow/NewShopWindow.xaml.cs b/BPASmartClient/DialogWindow/NewShopWindow.xaml.cs
index 26a6b069..1176065d 100644
--- a/BPASmartClient/DialogWindow/NewShopWindow.xaml.cs
+++ b/BPASmartClient/DialogWindow/NewShopWindow.xaml.cs
@@ -1,4 +1,5 @@
-using System;
+using Microsoft.Toolkit.Mvvm.Messaging;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -27,14 +28,13 @@ namespace BPASmartClient.DialogWindow
this.DragMove();
};
- //WeakReferenceMessenger.Default.Register(this, "Close", (o, e) =>
- //{
- // App.Current.Dispatcher.Invoke(new Action(() =>
- // {
- // this.DialogResult = Convert.ToBoolean(e);
- // this.Close();
- // }));
- //});
+ WeakReferenceMessenger.Default.Register(this, "CloseWindow", (o, e) =>
+ {
+ App.Current.Dispatcher.Invoke(new Action(() =>
+ {
+ this.Close();
+ }));
+ });
}
diff --git a/BPASmartClient/MainWindow.xaml.cs b/BPASmartClient/MainWindow.xaml.cs
index 3720f443..8832020d 100644
--- a/BPASmartClient/MainWindow.xaml.cs
+++ b/BPASmartClient/MainWindow.xaml.cs
@@ -55,7 +55,7 @@ namespace BPASmartClient
else if (this.WindowState == WindowState.Normal)
this.WindowState = WindowState.Maximized;
}
- this.DragMove();
+ if (e.LeftButton == MouseButtonState.Pressed) this.DragMove();
};
MenuItem_Click(new MenuItem() { Tag = "LogView", Header = "日志监视" }, null);
From 8f083f9acd079ff8e791e416a5f3813d90151229 Mon Sep 17 00:00:00 2001
From: fyf
Date: Mon, 16 May 2022 13:54:13 +0800
Subject: [PATCH 03/14] 77777
---
BPASmartClient.ViewModel/LogOrAlarmViewModel.cs | 8 ++++----
BPASmartClient.ViewModel/LogViewModel.cs | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/BPASmartClient.ViewModel/LogOrAlarmViewModel.cs b/BPASmartClient.ViewModel/LogOrAlarmViewModel.cs
index 4e097ed9..39c1c7e4 100644
--- a/BPASmartClient.ViewModel/LogOrAlarmViewModel.cs
+++ b/BPASmartClient.ViewModel/LogOrAlarmViewModel.cs
@@ -158,8 +158,8 @@ namespace BPASmartClient.ViewModel
LogDataGrid.Clear();
//2.根据选中查询日志
DataTable dataTable = ReadFile(path);
- DataRow[] datas = dataTable.Select(sql);
- if (datas.Count() <= 0)
+ List datas = dataTable.Select($"({sql})").OrderByDescending(o => o["TIME"])?.ToList();
+ if (datas==null || datas.Count() <= 0)
{
NoticeDemoViewModel.OpenMsg(EnumPromptType.Info, MainViewModel.GetInstance().window, "提示", $"查询结果为空!");
return;
@@ -170,8 +170,8 @@ namespace BPASmartClient.ViewModel
{
time = item["TIME"].ToString(),
type = item["LOGGER"].ToString(),
- message = item["MESSAGE"].ToString(),
- foreground = (item["LOGGER"].ToString() == "Error" || item["LOGGER"].ToString() == "DeviceAlarm") ? new SolidColorBrush((System.Windows.Media.Color)System.Windows.Media.ColorConverter.ConvertFromString("#ed0032")) : new SolidColorBrush((System.Windows.Media.Color)System.Windows.Media.ColorConverter.ConvertFromString("#21bb2e"))
+ message = item["MESSAGE"].ToString()
+ // foreground = (item["LOGGER"].ToString() == "ERROR" || item["LOGGER"].ToString() == "DEVICEALARM") ? new SolidColorBrush((System.Windows.Media.Color)System.Windows.Media.ColorConverter.ConvertFromString("#ed0032")) : new SolidColorBrush((System.Windows.Media.Color)System.Windows.Media.ColorConverter.ConvertFromString("#21bb2e"))
});
}
}
diff --git a/BPASmartClient.ViewModel/LogViewModel.cs b/BPASmartClient.ViewModel/LogViewModel.cs
index 0088abaa..5c5e2bb8 100644
--- a/BPASmartClient.ViewModel/LogViewModel.cs
+++ b/BPASmartClient.ViewModel/LogViewModel.cs
@@ -233,7 +233,7 @@ namespace BPASmartClient.ViewModel
if (_type == value)
return;
_type = value;
- if (_type == "Error") foreground = new SolidColorBrush((System.Windows.Media.Color)System.Windows.Media.ColorConverter.ConvertFromString("#ed0032"));
+ if (_type == "Error" || _type == "Error".ToUpper() || _type == "DeviceAlarm".ToUpper() || _type == "DeviceAlarm") foreground = new SolidColorBrush((System.Windows.Media.Color)System.Windows.Media.ColorConverter.ConvertFromString("#ed0032"));
OnPropertyChanged("type");
OnPropertyChanged("foreground");
From 418a6d8b3d3e4e76a7c06d3c7d023a66763f54ea Mon Sep 17 00:00:00 2001
From: fyf
Date: Mon, 16 May 2022 14:07:55 +0800
Subject: [PATCH 04/14] 898
---
BPASmartClient.ViewModel/LogOrAlarmViewModel.cs | 10 ++++------
BPASmartClient/Control/LogOrAlarmView.xaml | 6 ++----
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/BPASmartClient.ViewModel/LogOrAlarmViewModel.cs b/BPASmartClient.ViewModel/LogOrAlarmViewModel.cs
index 39c1c7e4..7cff7fb1 100644
--- a/BPASmartClient.ViewModel/LogOrAlarmViewModel.cs
+++ b/BPASmartClient.ViewModel/LogOrAlarmViewModel.cs
@@ -128,13 +128,11 @@ namespace BPASmartClient.ViewModel
LogDataGrid = new ObservableCollection();
DateTimeStr = DateTime.Now;
BookExs.Add(new BookEx(new Book() { Name = "一般日志条件", Tag = "Info" }) { IsChecked = true });
- BookExs.Add(new BookEx(new Book() { Name = "设备日志条件", Tag = "DeviceLog" }));
- BookExs.Add(new BookEx(new Book() { Name = "错误日志条件", Tag = "Error" }));
- BookExs.Add(new BookEx(new Book() { Name = "设备告警条件", Tag = "DeviceAlarm" }));
- SelectedText = "一般日志条件";
+ BookExs.Add(new BookEx(new Book() { Name = "设备日志条件", Tag = "DeviceLog" }) { IsChecked = true });
+ BookExs.Add(new BookEx(new Book() { Name = "错误日志条件", Tag = "Error" }) { IsChecked = true });
+ BookExs.Add(new BookEx(new Book() { Name = "设备告警条件", Tag = "DeviceAlarm" }) { IsChecked = true });
SelectBookExs = new ObservableCollection();
- SelectBookExs.Add(new BookEx(new Book() { Name = "一般日志条件", Tag = "Info" }) { IsChecked = true });
-
+ ItemPropertyChanged(new BookEx(new Book() { Name = "一般日志条件", Tag = "Info" }) { IsChecked = true },new PropertyChangedEventArgs("IsChecked"));
//查询
QueryCommand = new RelayCommand(() =>
{
diff --git a/BPASmartClient/Control/LogOrAlarmView.xaml b/BPASmartClient/Control/LogOrAlarmView.xaml
index 4a690f85..23770892 100644
--- a/BPASmartClient/Control/LogOrAlarmView.xaml
+++ b/BPASmartClient/Control/LogOrAlarmView.xaml
@@ -26,12 +26,10 @@
-
+
-
-
-
+
From 79403b96f8b1b1248d2b0c3c7586b9f5f4adb02a Mon Sep 17 00:00:00 2001
From: fyf
Date: Mon, 16 May 2022 14:40:09 +0800
Subject: [PATCH 05/14] =?UTF-8?q?=E5=A2=9E=E5=8A=A0dataV=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E7=BB=B4=E6=8A=A4=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
BPASmartClient.ViewModel/DataVViewModel.cs | 189 +++++++++++++++++++++
BPASmartClient/Control/DataVView.xaml | 153 +++++++++++++++++
BPASmartClient/Control/DataVView.xaml.cs | 122 +++++++++++++
BPASmartClient/MainWindow.xaml | 7 +
4 files changed, 471 insertions(+)
create mode 100644 BPASmartClient.ViewModel/DataVViewModel.cs
create mode 100644 BPASmartClient/Control/DataVView.xaml
create mode 100644 BPASmartClient/Control/DataVView.xaml.cs
diff --git a/BPASmartClient.ViewModel/DataVViewModel.cs b/BPASmartClient.ViewModel/DataVViewModel.cs
new file mode 100644
index 00000000..ea988f98
--- /dev/null
+++ b/BPASmartClient.ViewModel/DataVViewModel.cs
@@ -0,0 +1,189 @@
+
+using BPASmartClient.Helper;
+using BPASmartClient.IoT;
+using DataVAPI.Tool.IOT;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.ViewModel
+{
+ public class DataVViewModel : ObservableObject
+ {
+ #region 单一变量
+ private volatile static DataVViewModel _Instance;
+ public static DataVViewModel GetInstance() => _Instance ?? (_Instance = new DataVViewModel());
+ private DataVViewModel()
+ {
+ deviceTable = new ObservableCollection();
+ device = new DeviceTable();
+ deviceTableSelectedItem = new DeviceTable();
+ ApiURL = System.Configuration.ConfigurationManager.AppSettings["DataVServiceUri"].ToString();
+ Refresh();
+ }
+ #endregion
+
+ #region 公有变量
+ ///
+ /// 设备表
+ ///
+ public ObservableCollection deviceTable { get; set; }
+ ///
+ /// 选中行
+ ///
+ private DeviceTable _deviceTableSelectedItem;
+
+ public DeviceTable deviceTableSelectedItem
+ {
+ get { return _deviceTableSelectedItem; }
+ set
+ {
+ if (_deviceTableSelectedItem == value)
+ return;
+ _deviceTableSelectedItem = value;
+ OnPropertyChanged("deviceTableSelectedItem");
+ }
+ }
+ ///
+ /// 当前设备
+ ///
+ private DeviceTable _device;
+
+ public DeviceTable device
+ {
+ get { return _device; }
+ set
+ {
+ if (_device == value)
+ return;
+ _device = value;
+ OnPropertyChanged("device");
+ }
+ }
+ ///
+ /// API 地址
+ ///
+ public string ApiURL { get; set; }
+ #endregion
+
+ #region 公有函数
+
+
+ ///
+ /// 刷新
+ ///
+ public void Refresh()
+ {
+ deviceTable.Clear();
+ Inquire()?.OrderBy(o => int.Parse(o.ClientId)).ToList().ForEach(d =>
+ {
+ if (int.Parse(d.ClientId) > 0)
+ {
+ deviceTable.Add(d);
+ }
+ });
+ }
+
+ ///
+ /// 根据客户端iD查询
+ ///
+ ///
+ public List Inquire(string clientId = "")
+ {
+ try
+ {
+ string url = ApiURL + "/api/Device/Query";
+ if (!string.IsNullOrEmpty(clientId)) url = ApiURL + "/api/Device/Query?clientId=" + clientId;
+ string json = HttpRequestHelper.HttpGetRequest(url);
+ JsonMsg> jsonMsg = Tools.JsonToObjectTools>>(json);
+ return jsonMsg.obj.data;
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
+
+ }
+
+ ///
+ /// 修改
+ ///
+ ///
+ public bool Update()
+ {
+ try
+ {
+ string url = ApiURL + "/api/Device/Modify";
+ string json = HttpRequestHelper.HttpPostRequest(url, Tools.JsonConvertTools(device));
+ Refresh();
+ return true;
+ }
+ catch (Exception ex)
+ {
+ return false;
+ }
+
+ }
+
+ ///
+ /// 增加
+ ///
+ ///
+ public bool Add()
+ {
+ try
+ {
+ string url = ApiURL + "/api/Device/Create";
+ string json = HttpRequestHelper.HttpPostRequest(url, Tools.JsonConvertTools(device));
+ Refresh();
+ return true;
+ }
+ catch (Exception ex)
+ {
+ return false;
+ }
+
+ }
+
+ public bool Add(DeviceTable deviceTable)
+ {
+ try
+ {
+ string url = ApiURL + "/api/Device/Create";
+ string json = HttpRequestHelper.HttpPostRequest(url, Tools.JsonConvertTools(deviceTable));
+ Refresh();
+ return true;
+ }
+ catch (Exception ex)
+ {
+ return false;
+ }
+
+ }
+
+ ///
+ /// 删除
+ ///
+ ///
+ public bool Delete()
+ {
+ try
+ {
+ string url = ApiURL + "/api/Device/DeleteDate?id=" + device.Id;
+ string json = HttpRequestHelper.HttpGetRequest(url);
+ Refresh();
+ return true;
+ }
+ catch (Exception ex)
+ {
+ return false;
+ }
+
+ }
+ #endregion
+ }
+}
diff --git a/BPASmartClient/Control/DataVView.xaml b/BPASmartClient/Control/DataVView.xaml
new file mode 100644
index 00000000..12d0d2e0
--- /dev/null
+++ b/BPASmartClient/Control/DataVView.xaml
@@ -0,0 +1,153 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ API查询地址:
+
+
+
+
+
+ 客户端ID:
+ 1
+
+
+
+
+ 客户端ID:
+
+
+
+
+ devicename:
+
+
+
+
+ productkey:
+
+
+
+
+ devicesecret:
+
+
+
+
+ 设备类型:
+
+
+
+
+ 经度:
+
+
+
+
+ 纬度:
+
+
+
+
+ 备注:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/BPASmartClient/Control/DataVView.xaml.cs b/BPASmartClient/Control/DataVView.xaml.cs
new file mode 100644
index 00000000..83c04c4f
--- /dev/null
+++ b/BPASmartClient/Control/DataVView.xaml.cs
@@ -0,0 +1,122 @@
+using BPASmartClient.CustomResource.UserControls;
+using BPASmartClient.CustomResource.UserControls.MessageShow;
+using BPASmartClient.IoT;
+using BPASmartClient.ViewModel;
+using DataVAPI.Tool.IOT;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.Control
+{
+ ///
+ /// DataVView.xaml 的交互逻辑
+ ///
+ public partial class DataVView : UserControl
+ {
+ public DataVView()
+ {
+ InitializeComponent();
+ this.DataContext = DataVViewModel.GetInstance();
+ }
+
+ private void Button_Click(object sender, RoutedEventArgs e)
+ {
+ if (sender is Button)
+ {
+ bool istrue = false;
+ Button button = sender as Button;
+ if (button.Tag != null)
+ {
+ switch (button.Tag.ToString())
+ {
+ case "Add":
+ istrue = DataVViewModel.GetInstance().Add();
+ if (istrue) NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, MainViewModel.GetInstance().window, "提示", $"增加成功!");
+ else NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, MainViewModel.GetInstance().window, "提示", $"增加失败!");
+ break;
+ case "Update":
+ if (string.IsNullOrEmpty(DataVViewModel.GetInstance().device.Id))
+ {
+ NoticeDemoViewModel.OpenMsg(EnumPromptType.Info, MainViewModel.GetInstance().window, "提示", $"请先“查询”或者“双击右侧表格行”，修改之后在点击“修改”!");
+ return;
+ }
+ istrue = DataVViewModel.GetInstance().Update();
+ if (istrue) NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, MainViewModel.GetInstance().window, "提示", $"修改成功!");
+ else NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, MainViewModel.GetInstance().window, "提示", $"修改失败!");
+ break;
+ case "Delete":
+ if (string.IsNullOrEmpty(DataVViewModel.GetInstance().device.Id))
+ {
+ NoticeDemoViewModel.OpenMsg(EnumPromptType.Info, MainViewModel.GetInstance().window, "提示", $"请先“查询”或者“双击右侧表格行”，修改之后在点击“删除”!");
+ return;
+ }
+ istrue = DataVViewModel.GetInstance().Delete();
+ if (istrue) NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, MainViewModel.GetInstance().window, "提示", $"删除成功!");
+ else NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, MainViewModel.GetInstance().window, "提示", $"删除失败!");
+ break;
+ case "SetUrl":
+ DataVViewModel.GetInstance().ApiURL = apiurl.Text;
+ DataVViewModel.GetInstance().Refresh();
+ NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, MainViewModel.GetInstance().window, "提示", $"设置成功!");
+ //MessageBox.Show("设置成功");
+ break;
+ case "Inquire":
+ DataVViewModel.GetInstance().device = DataVViewModel.GetInstance().Inquire(chen.Text)?.FirstOrDefault();
+ break;
+ case "Save":
+ System.Windows.Forms.SaveFileDialog saveFileDialog = new System.Windows.Forms.SaveFileDialog();
+ saveFileDialog.Filter = "txt文件(*.txt)|*.txt";
+ if (saveFileDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+ {
+ StreamWriter sw = File.CreateText(saveFileDialog.FileName);
+ sw.Write(Tools.JsonConvertTools(DataVViewModel.GetInstance().deviceTable)); //写入文件中
+ sw.Flush();//清理缓冲区
+ sw.Close();//关闭文件
+ }
+ NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, MainViewModel.GetInstance().window, "提示", $"导出设备成功,条数: {DataVViewModel.GetInstance().deviceTable.Count}!");
+ break;
+ case "Insert":
+ System.Windows.Forms.OpenFileDialog file = new System.Windows.Forms.OpenFileDialog();//定义新的文件打开位置控件
+ file.Filter = "txt文件(*.txt)|*.txt";//设置文件后缀的过滤
+ if (file.ShowDialog() == System.Windows.Forms.DialogResult.OK)//如果有选择打开文件
+ {
+ DeviceTable device = null;
+ FileStream fs = new FileStream(file.FileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+ StreamReader sr = new StreamReader(fs, System.Text.Encoding.UTF8); //选择编码方式
+ string str = sr.ReadToEnd();
+ if (!string.IsNullOrEmpty(str))
+ {
+ Tools.JsonToObjectTools>(str)?.ForEach(par =>
+ {
+ DataVViewModel.GetInstance().Add(par);
+ });
+ NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, MainViewModel.GetInstance().window, "提示", $"插入设备成功,条数: {Tools.JsonToObjectTools>(str)?.Count}!");
+ DataVViewModel.GetInstance().Refresh();
+ }
+ }
+
+ break;
+ }
+ }
+ }
+ }
+
+ private void DataGrid_MouseDoubleClick(object sender, MouseButtonEventArgs e)
+ {
+ DataVViewModel.GetInstance().device = DataVViewModel.GetInstance().deviceTableSelectedItem;
+ }
+ }
+}
diff --git a/BPASmartClient/MainWindow.xaml b/BPASmartClient/MainWindow.xaml
index 79af5cea..52bd20cc 100644
--- a/BPASmartClient/MainWindow.xaml
+++ b/BPASmartClient/MainWindow.xaml
@@ -76,6 +76,12 @@
FontSize="12"
Header="店铺设备配置"
Tag="ShopDeviceConfigView" />
+
+
-->
-
+
diff --git a/HBLConsole.MORKIC/BPASmartClient.MORKIC.csproj b/HBLConsole.MORKIC/BPASmartClient.MORKIC.csproj
index e444219e..0dcf2236 100644
--- a/HBLConsole.MORKIC/BPASmartClient.MORKIC.csproj
+++ b/HBLConsole.MORKIC/BPASmartClient.MORKIC.csproj
@@ -5,7 +5,7 @@
-
+
From 338de893cdcd5f8a590f0803cd11ecc9cdaac598 Mon Sep 17 00:00:00 2001
From: fyf
Date: Wed, 18 May 2022 13:48:32 +0800
Subject: [PATCH 11/14] 6
---
BPASmartClient/Control/DataVView.xaml.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/BPASmartClient/Control/DataVView.xaml.cs b/BPASmartClient/Control/DataVView.xaml.cs
index 3ffd3018..d0067c42 100644
--- a/BPASmartClient/Control/DataVView.xaml.cs
+++ b/BPASmartClient/Control/DataVView.xaml.cs
@@ -44,7 +44,7 @@ namespace BPASmartClient.Control
dispatcherTimer.Stop();
}));
};
- dispatcherTimer.Interval = TimeSpan.FromSeconds(20);
+ dispatcherTimer.Interval = TimeSpan.FromSeconds(120);
}
From b27c0a2b45049024016bcafa5d3fc1a46dd2baf0 Mon Sep 17 00:00:00 2001
From: fyf
Date: Wed, 18 May 2022 16:07:19 +0800
Subject: [PATCH 12/14] 3232
---
.../Themes/MyStyle.xaml | 64 ++++++++++++++++++-
BPASmartClient/Control/DataVView.xaml | 12 ++--
BPASmartClient/MainWindow.xaml | 16 ++---
3 files changed, 74 insertions(+), 18 deletions(-)
diff --git a/BPASmartClient.CustomResource/Themes/MyStyle.xaml b/BPASmartClient.CustomResource/Themes/MyStyle.xaml
index 5a02829c..eee7a413 100644
--- a/BPASmartClient.CustomResource/Themes/MyStyle.xaml
+++ b/BPASmartClient.CustomResource/Themes/MyStyle.xaml
@@ -957,7 +957,67 @@
-
+
+
+
-
-
-
-
+
+
+
@@ -584,7 +592,7 @@
-
+
diff --git a/BPASmartClient.Device/BPASmartClient.Device.csproj b/BPASmartClient.Device/BPASmartClient.Device.csproj
index 3164a1d8..3f4f0b9f 100644
--- a/BPASmartClient.Device/BPASmartClient.Device.csproj
+++ b/BPASmartClient.Device/BPASmartClient.Device.csproj
@@ -2,6 +2,8 @@
net6.0
+ bin\
+ portable
diff --git a/BPASmartClient.Helper/ActionManage.cs b/BPASmartClient.Helper/ActionManage.cs
index ba2f19c6..e9a8a7dd 100644
--- a/BPASmartClient.Helper/ActionManage.cs
+++ b/BPASmartClient.Helper/ActionManage.cs
@@ -72,13 +72,13 @@ namespace BPASmartClient.Helper
if (actions.ContainsKey(key))
if (par == null)
{
- if (actions[key].FuncObj != null)
- return actions[key].FuncObj;
+ //if (actions[key].FuncObj != null)
+ return actions[key].FuncObj?.Invoke();
}
else
{
- if (actions[key].FuncPar != null)
- return actions[key].FuncPar(par);
+ //if (actions[key].FuncPar != null)
+ return actions[key].FuncPar?.Invoke(par);
}
return default;
}
diff --git a/BPASmartClient.Helper/ExpandMethod.cs b/BPASmartClient.Helper/ExpandMethod.cs
index f0d1ccac..97336f6e 100644
--- a/BPASmartClient.Helper/ExpandMethod.cs
+++ b/BPASmartClient.Helper/ExpandMethod.cs
@@ -41,11 +41,13 @@ namespace BPASmartClient.Helper
/// 委托回调
public static void Invoke(this Action action, Action callback)
{
- if (action != null)
- {
- action();
- if (callback != null) callback();
- }
+ action?.Invoke();
+ callback?.Invoke();
+ //if (action != null)
+ //{
+ // action();
+ // if (callback != null) callback();
+ //}
}
///
@@ -56,20 +58,24 @@ namespace BPASmartClient.Helper
/// 委托回调
public static void Invoke(this Action
public class CommunicationPar : ObservableObject
{
+ /////
+ ///// 通讯类型，false:串口，true:网口
+ /////
+ //public bool CommunicationType { get { return _mCommunicationType; } set { _mCommunicationType = value; OnPropertyChanged(); } }
+ //private bool _mCommunicationType;
+
+ ///
+ /// 选择网口通讯
+ ///
+ public bool IsNetworkPort { get { return _mIsNetworkPort; } set { _mIsNetworkPort = value; OnPropertyChanged(); } }
+ private bool _mIsNetworkPort = false;
+
///
- /// 通讯类型，false:串口，true:网口
+ /// 选择串口通讯
///
- public bool CommunicationType { get { return _mCommunicationType; } set { _mCommunicationType = value; OnPropertyChanged(); } }
- private bool _mCommunicationType;
+ public bool IsSerialPort { get { return _mIsSerialPort; } set { _mIsSerialPort = value; OnPropertyChanged(); } }
+ private bool _mIsSerialPort = true;
+ //public Visibility NetworkVisibility { get { return _mNetworkVisibility; } set { _mNetworkVisibility = value; OnPropertyChanged(); } }
+ //private Visibility _mNetworkVisibility = Visibility.Collapsed;
+
+ //public Visibility SerialVisibility { get { return _mSerialVisibility; } set { _mSerialVisibility = value; OnPropertyChanged(); } }
+ //private Visibility _mSerialVisibility = Visibility.Visible;
///
/// IP地址
@@ -138,13 +156,13 @@ namespace BPASmartClient.ViewModel.Model
/// 数据位
///
public int DataBits { get { return _mDataBits; } set { _mDataBits = value; OnPropertyChanged(); } }
- private int _mDataBits;
+ private int _mDataBits = 8;
///
/// 停止位
///
public string StopBits { get { return _mStopBits; } set { _mStopBits = value; OnPropertyChanged(); } }
- private string _mStopBits;
+ private string _mStopBits = "1";
///
/// 校验位
@@ -152,37 +170,22 @@ namespace BPASmartClient.ViewModel.Model
public string Parity { get { return _mParity; } set { _mParity = value; OnPropertyChanged(); } }
private string _mParity;
+ public ObservableCollection variables { get; set; } = new ObservableCollection();
}
- //public enum CommunicationParType
- //{
- // ///
- // /// IP地址
- // ///
- // IPAddress,
- // ///
- // /// 端口号
- // ///
- // Port,
- // ///
- // /// 串口端口号
- // ///
- // SerialPort,
- // ///
- // /// 波特率
- // ///
- // BaudRate,
- // ///
- // /// 数据位
- // ///
- // DataBits,
- // ///
- // /// 停止位
- // ///
- // StopBits,
- // ///
- // /// 校验位
- // ///
- // Parity,
- //}
+ public class Variable : ObservableObject
+ {
+ public int Id { get { return _mId; } set { _mId = value; OnPropertyChanged(); } }
+ private int _mId;
+
+
+ public string Address { get { return _mAddress; } set { _mAddress = value; OnPropertyChanged(); } }
+ private string _mAddress;
+
+
+ public int ReadLeng { get { return _mReadLeng; } set { _mReadLeng = value; OnPropertyChanged(); } }
+ private int _mReadLeng;
+
+
+ }
}
diff --git a/BPASmartClient.ViewModel/NewShopWindowModel.cs b/BPASmartClient.ViewModel/NewShopWindowModel.cs
index cef93844..49787d3b 100644
--- a/BPASmartClient.ViewModel/NewShopWindowModel.cs
+++ b/BPASmartClient.ViewModel/NewShopWindowModel.cs
@@ -7,23 +7,32 @@ using BPASmartClient.Helper;
using Microsoft.Toolkit.Mvvm.ComponentModel;
using Microsoft.Toolkit.Mvvm.Input;
using Microsoft.Toolkit.Mvvm.Messaging;
+using System.Windows;
+using System.IO;
namespace BPASmartClient.ViewModel
{
public class NewShopWindowModel : ObservableObject
{
+
public NewShopWindowModel()
{
- CloseWindowCommand = new RelayCommand(() => { WeakReferenceMessenger.Default.Send("", "CloseWindow"); });
- CancelCommand = new RelayCommand(() => { WeakReferenceMessenger.Default.Send("", "CloseWindow"); });
+ CancelCommand = new RelayCommand(() => { ActionManage.GetInstance.Send("CloseWindow"); });
DefineCommand = new RelayCommand(() =>
{
+ DirectoryInfo directoryInfo = new DirectoryInfo(LocaPath.GetInstance().GetDeviceConfigPath);
+ var files = directoryInfo.GetFiles();
+ if (files != null && files.FirstOrDefault(p => p.FullName.Contains(ShopName)) != null)
+ {
+ ErrorInfo = "已存在该店铺，请重新输入！";
+ return;
+ }
ActionManage.GetInstance.Send("ShopPar", new string[] { ShopName, ShopId });
- WeakReferenceMessenger.Default.Send("", "CloseWindow");
+ ActionManage.GetInstance.Send("OkCloseWindow");
});
}
- public RelayCommand CloseWindowCommand { get; set; }
+ //public RelayCommand CloseWindowCommand { get; set; }
public RelayCommand CancelCommand { get; set; }
@@ -35,6 +44,10 @@ namespace BPASmartClient.ViewModel
public string ShopId { get { return _mShopId; } set { _mShopId = value; OnPropertyChanged(); } }
private string _mShopId;
+ public string ErrorInfo { get { return _mErrorInfo; } set { _mErrorInfo = value; OnPropertyChanged(); } }
+ private string _mErrorInfo;
+
+
}
diff --git a/BPASmartClient.ViewModel/ShopDeviceConfigViewModel.cs b/BPASmartClient.ViewModel/ShopDeviceConfigViewModel.cs
index a919b862..b5041e8b 100644
--- a/BPASmartClient.ViewModel/ShopDeviceConfigViewModel.cs
+++ b/BPASmartClient.ViewModel/ShopDeviceConfigViewModel.cs
@@ -11,12 +11,16 @@ using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Runtime.CompilerServices;
using System.Windows;
+using System.IO.Ports;
+using System.IO;
+using Newtonsoft.Json;
namespace BPASmartClient.ViewModel
{
public class ShopDeviceConfigViewModel : ObservableObject
{
private DeviceConfigModel configModel = new DeviceConfigModel();
+ string FileName => deviceConfig.Count > 0 ? deviceConfig[0].ShopName : string.Empty;
public ShopDeviceConfigViewModel()
{
@@ -28,6 +32,7 @@ namespace BPASmartClient.ViewModel
{
configModel.ShopName = par[0];
configModel.ShopId = par[1];
+ deviceConfig.Clear();
deviceConfig.Add(configModel);
}
}
@@ -37,8 +42,19 @@ namespace BPASmartClient.ViewModel
RemoveDeviceCommand = new RelayCommand
public RelayCommand
-->
-
+
diff --git a/BPASmartClient/DialogWindow/NewShopWindow.xaml b/BPASmartClient/DialogWindow/NewShopWindow.xaml
index 838849c1..e2cdd252 100644
--- a/BPASmartClient/DialogWindow/NewShopWindow.xaml
+++ b/BPASmartClient/DialogWindow/NewShopWindow.xaml
@@ -125,7 +125,7 @@
Visibility="Hidden" />
@@ -200,7 +200,7 @@
FontFamily="楷体"
FontSize="20"
Foreground="Red"
- Text="错误提示" />
+ Text="{Binding ErrorInfo}" />
diff --git a/BPASmartClient/DialogWindow/NewShopWindow.xaml.cs b/BPASmartClient/DialogWindow/NewShopWindow.xaml.cs
index 1176065d..b58e0f44 100644
--- a/BPASmartClient/DialogWindow/NewShopWindow.xaml.cs
+++ b/BPASmartClient/DialogWindow/NewShopWindow.xaml.cs
@@ -1,4 +1,5 @@
-using Microsoft.Toolkit.Mvvm.Messaging;
+using BPASmartClient.Helper;
+using Microsoft.Toolkit.Mvvm.Messaging;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -28,13 +29,28 @@ namespace BPASmartClient.DialogWindow
this.DragMove();
};
- WeakReferenceMessenger.Default.Register(this, "CloseWindow", (o, e) =>
+ ActionManage.GetInstance.CancelRegister("CloseWindow");
+ ActionManage.GetInstance.CancelRegister("OkCloseWindow");
+
+ ActionManage.GetInstance.Register(new Action(() =>
{
App.Current.Dispatcher.Invoke(new Action(() =>
{
+ this.DialogResult = false;
this.Close();
}));
- });
+ }), "CloseWindow");
+
+ ActionManage.GetInstance.Register(new Action(() =>
+ {
+ App.Current.Dispatcher.Invoke(new Action(() =>
+ {
+ this.DialogResult = true;
+ this.Close();
+ }));
+ }), "OkCloseWindow");
+
+
}
diff --git a/BPASmartClient/MainWindow.xaml b/BPASmartClient/MainWindow.xaml
index cbc6beea..b9f83f0e 100644
--- a/BPASmartClient/MainWindow.xaml
+++ b/BPASmartClient/MainWindow.xaml
@@ -241,7 +241,7 @@
Cursor="Hand"
Style="{DynamicResource CommonBtn_返回}" />
-
+ Style="{DynamicResource CommonBtn_返回}" />-->
+
+
{
var res = Json.Data.orderLists.FirstOrDefault(p => p.DeviceId == "2")?.morkOrderPushes;
@@ -186,7 +186,7 @@ namespace BPASmartClient
count = 0;
}
}
- App.Current.Dispatcher.Invoke(new Action(() => { this.save.IsEnabled = true; }));
+ //App.Current.Dispatcher.Invoke(new Action(() => { this.save.IsEnabled = true; }));
}));
diff --git a/HBLConsole.MORKIC/BPASmartClient.MORKIC.csproj b/HBLConsole.MORKIC/BPASmartClient.MORKIC.csproj
index 0dcf2236..a6768c85 100644
--- a/HBLConsole.MORKIC/BPASmartClient.MORKIC.csproj
+++ b/HBLConsole.MORKIC/BPASmartClient.MORKIC.csproj
@@ -2,6 +2,8 @@
net6.0
+ bin\
+ portable