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/13] =?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/13] =?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 526f3fc7dd2331cf5bbc6922da23cc6b5aea418e Mon Sep 17 00:00:00 2001
From: fyf
Date: Mon, 16 May 2022 15:45:41 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?=
=?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../LogOrAlarmViewModel.cs | 2 +-
BPASmartClient.ViewModel/LogViewModel.cs | 146 +++++++++++++++++-
BPASmartClient/Control/IOTView.xaml | 16 ++
BPASmartClient/Control/IOTView.xaml.cs | 29 ++++
BPASmartClient/Control/LogView.xaml | 12 +-
BPASmartClient/MainWindow.xaml | 8 +-
6 files changed, 195 insertions(+), 18 deletions(-)
create mode 100644 BPASmartClient/Control/IOTView.xaml
create mode 100644 BPASmartClient/Control/IOTView.xaml.cs
diff --git a/BPASmartClient.ViewModel/LogOrAlarmViewModel.cs b/BPASmartClient.ViewModel/LogOrAlarmViewModel.cs
index 7cff7fb1..6ed1ed0a 100644
--- a/BPASmartClient.ViewModel/LogOrAlarmViewModel.cs
+++ b/BPASmartClient.ViewModel/LogOrAlarmViewModel.cs
@@ -132,7 +132,7 @@ namespace BPASmartClient.ViewModel
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();
- ItemPropertyChanged(new BookEx(new Book() { Name = "一般日志条件", Tag = "Info" }) { IsChecked = true },new PropertyChangedEventArgs("IsChecked"));
+ ItemPropertyChanged(new BookEx(new Book()) { IsChecked = true },new PropertyChangedEventArgs("IsChecked"));
//查询
QueryCommand = new RelayCommand(() =>
{
diff --git a/BPASmartClient.ViewModel/LogViewModel.cs b/BPASmartClient.ViewModel/LogViewModel.cs
index 5c5e2bb8..09088d00 100644
--- a/BPASmartClient.ViewModel/LogViewModel.cs
+++ b/BPASmartClient.ViewModel/LogViewModel.cs
@@ -1,12 +1,14 @@
using BPASmartClient.Helper;
using BPASmartClient.IoT;
using BPASmartClient.Message;
+using BPASmartClient.Model;
using Microsoft.Toolkit.Mvvm.ComponentModel;
using Microsoft.Toolkit.Mvvm.Input;
using Microsoft.Win32;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
+using System.ComponentModel;
using System.Diagnostics;
using System.IO;
using System.Linq;
@@ -26,6 +28,7 @@ namespace BPASmartClient.ViewModel
#region 变量
public DispatcherTimer dispatcherTimer;
public string ClientId = System.Configuration.ConfigurationManager.AppSettings["ClientId"].ToString();
+ public ObservableCollection LogDataGridData { get; set; }
private ObservableCollection _LogModels;public ObservableCollection LogDataGrid
{
get
@@ -68,6 +71,54 @@ namespace BPASmartClient.ViewModel
OnPropertyChanged("TimedClear");
}
}
+ private string _SelectedText = "";
+ public string SelectedText
+ {
+ get
+ {
+ return _SelectedText;
+ }
+ set
+ {
+ if (_SelectedText == value)
+ return;
+ _SelectedText = value;
+ OnPropertyChanged("SelectedText");
+ }
+ }
+ public ObservableCollection SelectBookExs { set; get; }
+ private ObservableCollection _books;
+ public ObservableCollection BookExs
+ {
+ get
+ {
+ if (_books == null)
+ {
+ _books = new ObservableCollection();
+
+ _books.CollectionChanged += (sender, e) =>
+ {
+ if (e.OldItems != null)
+ {
+ foreach (BookEx bookEx in e.OldItems)
+ {
+ bookEx.PropertyChanged -= ItemPropertyChanged;
+ }
+ }
+
+ if (e.NewItems != null)
+ {
+ foreach (BookEx bookEx in e.NewItems)
+ {
+ bookEx.PropertyChanged += ItemPropertyChanged;
+ }
+ }
+ };
+ }
+
+ return _books;
+ }
+ }
#endregion
#region 单一
@@ -85,14 +136,23 @@ namespace BPASmartClient.ViewModel
///
public void Init()
{
- if (LogDataGrid == null) LogDataGrid = new ObservableCollection();
logHelper.Fun_InitLog(System.AppDomain.CurrentDomain.BaseDirectory);
+ if (LogDataGrid == null) LogDataGrid = new ObservableCollection();
+ if (LogDataGridData == null) LogDataGridData = new ObservableCollection();
+ BookExs.Add(new BookEx(new Book() { Name = "一般日志", Tag = "Info" }) { IsChecked = true });
+ 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();
+ ItemPropertyChanged(new BookEx(new Book()) { IsChecked = true }, new PropertyChangedEventArgs("IsChecked"));
//一般日志
MessageLog.GetInstance.InfoNotify = new Action((s) =>
{
System.Windows.Application.Current?.Dispatcher.Invoke((Action)(() =>
{
- LogDataGrid.Insert(0, new LogModel { message = s, type = "Info" });
+ LogModel logModel = new LogModel { message = s, type = "Info" };
+ LogDataGridData.Insert(0, logModel);
+ AddLog(logModel);
logHelper.GetLogConfigInstance().WriteLog(LogLevel.INFO, s);
}));
});
@@ -101,7 +161,9 @@ namespace BPASmartClient.ViewModel
{
System.Windows.Application.Current?.Dispatcher.Invoke((Action)(() =>
{
- LogDataGrid.Insert(0, new LogModel { message = s, type = "DeviceLog" });
+ LogModel logModel = new LogModel { message = s, type = "DeviceLog" };
+ LogDataGridData.Insert(0, logModel);
+ AddLog(logModel);
logHelper.GetLogConfigInstance().WriteLog(LogLevel.DEBUG, s);
}));
});
@@ -110,7 +172,9 @@ namespace BPASmartClient.ViewModel
{
System.Windows.Application.Current?.Dispatcher.Invoke((Action)(() =>
{
- LogDataGrid.Insert(0, new LogModel { message = id, type = "DeviceAlarm" });
+ LogModel logModel = new LogModel { message = id, type = "DeviceAlarm" };
+ LogDataGridData.Insert(0, logModel);
+ AddLog(logModel);
logHelper.GetLogConfigInstance().WriteLog(LogLevel.WARN, id);
}));
});
@@ -119,7 +183,9 @@ namespace BPASmartClient.ViewModel
{
System.Windows.Application.Current?.Dispatcher.Invoke((Action)(() =>
{
- LogDataGrid.Insert(0, new LogModel { message = s, type = "Error" });
+ LogModel logModel = new LogModel { message = s, type = "Error" };
+ LogDataGridData.Insert(0, logModel);
+ AddLog(logModel);
logHelper.GetLogConfigInstance().WriteLog(LogLevel.ERROR, s);
DataVClient.GetInstance().HttpAddLog(new LogTable
{
@@ -154,9 +220,11 @@ namespace BPASmartClient.ViewModel
{
System.Windows.Application.Current?.Dispatcher.Invoke((Action)(() =>
{
- if (LogDataGrid.Count > 100)
+ if (LogDataGridData.Count > 200)
{
- LogDataGrid.RemoveAt(LogDataGrid.Count - 1);
+ LogModel logModel= LogDataGridData.Last();
+ DeleteLog(logModel);
+ LogDataGridData.Remove(logModel);
}
}));
@@ -164,6 +232,43 @@ namespace BPASmartClient.ViewModel
dispatcherTimer.Interval = TimeSpan.FromSeconds(10);
dispatcherTimer.Start();
}
+ ///
+ /// 增加日志
+ ///
+ public void AddLog(LogModel logModel)
+ {
+ BookEx book= SelectBookExs?.ToList().Find(par => par.IsChecked && par.BookN.Tag == logModel.type);
+ if (book != null)
+ {
+ LogDataGrid.Insert(0, logModel);
+ }
+ }
+ ///
+ /// 刷新日志
+ ///
+ ///
+ public void RefreshLog()
+ {
+ LogDataGrid.Clear();
+ LogDataGridData?.ToList().ForEach(b => {
+
+ BookEx book = SelectBookExs?.ToList().Find(par => par.IsChecked && par.BookN.Tag == b.type);
+ if (book != null)
+ {
+ LogDataGrid.Add(b);
+ }
+ });
+
+ }
+ ///
+ /// 删除日志
+ ///
+ public void DeleteLog(LogModel logModel)
+ {
+ LogModel log= LogDataGrid?.ToList().Find(par => par == logModel);
+ if(log!=null) LogDataGrid.Remove(log);
+ }
+
///
/// 导出数据
///
@@ -210,6 +315,33 @@ namespace BPASmartClient.ViewModel
System.Windows.MessageBox.Show("无数据!");
}
+ ///
+ /// 选中改变
+ ///
+ ///
+ ///
+ private void ItemPropertyChanged(object sender, PropertyChangedEventArgs e)
+ {
+ if (e.PropertyName == "IsChecked")
+ {
+ BookEx bookEx = sender as BookEx;
+
+ if (bookEx != null)
+ {
+ IEnumerable bookExs = BookExs.Where(b => b.IsChecked == true);
+
+ StringBuilder builder = new StringBuilder();
+ SelectBookExs.Clear();
+ foreach (BookEx item in bookExs)
+ {
+ builder.Append(item.BookN.Name + ",");
+ SelectBookExs.Add((BookEx)item);
+ }
+ SelectedText = builder == null ? string.Empty : builder.ToString();
+ RefreshLog();
+ }
+ }
+ }
#endregion
#region Command
diff --git a/BPASmartClient/Control/IOTView.xaml b/BPASmartClient/Control/IOTView.xaml
new file mode 100644
index 00000000..a5c067cc
--- /dev/null
+++ b/BPASmartClient/Control/IOTView.xaml
@@ -0,0 +1,16 @@
+
+
+
+
+
diff --git a/BPASmartClient/Control/IOTView.xaml.cs b/BPASmartClient/Control/IOTView.xaml.cs
new file mode 100644
index 00000000..96e3e884
--- /dev/null
+++ b/BPASmartClient/Control/IOTView.xaml.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+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
+{
+ ///
+ /// IOTView.xaml 的交互逻辑
+ ///
+ public partial class IOTView : UserControl
+ {
+ public IOTView()
+ {
+ InitializeComponent();
+ webView.Source = new Uri("http://iot.black-pa.com");
+ }
+ }
+}
diff --git a/BPASmartClient/Control/LogView.xaml b/BPASmartClient/Control/LogView.xaml
index dfa3fc63..28b1a173 100644
--- a/BPASmartClient/Control/LogView.xaml
+++ b/BPASmartClient/Control/LogView.xaml
@@ -3,6 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:k="clr-namespace:BPASmartClient.Model;assembly=BPASmartClient.Model"
xmlns:vm="clr-namespace:BPASmartClient.ViewModel;assembly=BPASmartClient.ViewModel"
xmlns:local="clr-namespace:BPASmartClient.Control"
mc:Ignorable="d"
@@ -25,8 +26,13 @@
-
+
+
+
+
+
+
+
@@ -54,7 +60,7 @@
-
+
diff --git a/BPASmartClient/MainWindow.xaml b/BPASmartClient/MainWindow.xaml
index 52bd20cc..91442a31 100644
--- a/BPASmartClient/MainWindow.xaml
+++ b/BPASmartClient/MainWindow.xaml
@@ -102,17 +102,11 @@
Header="设备监视"
Tag="DeviceMonitorView" />
-
-
+ Tag="IOTView" />
-->
-
+
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 08/13] 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 09/13] 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 @@
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/BPASmartClient.CustomResource/UserControls/UserKeyBoard.xaml.cs b/BPASmartClient.CustomResource/UserControls/UserKeyBoard.xaml.cs
new file mode 100644
index 00000000..7ad1d728
--- /dev/null
+++ b/BPASmartClient.CustomResource/UserControls/UserKeyBoard.xaml.cs
@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+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.CustomResource.UserControls
+{
+ ///
+ /// UserKeyBoard.xaml 的交互逻辑
+ ///
+ public partial class UserKeyBoard : UserControl
+ {
+ public Action
-->
-
+
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
From 464d0614a814dc2dfc8f7d9906c9681573ac78b3 Mon Sep 17 00:00:00 2001
From: NXX <447201003@qq>
Date: Thu, 19 May 2022 13:11:42 +0800
Subject: [PATCH 13/13] =?UTF-8?q?MORKT=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
BPASmartClient.MorkT/Control_MorkT.cs | 276 ++++++++++++++++++++++++++
BPASmartClient/App.config | 8 +-
2 files changed, 280 insertions(+), 4 deletions(-)
diff --git a/BPASmartClient.MorkT/Control_MorkT.cs b/BPASmartClient.MorkT/Control_MorkT.cs
index 7e60ce0d..09a87c9a 100644
--- a/BPASmartClient.MorkT/Control_MorkT.cs
+++ b/BPASmartClient.MorkT/Control_MorkT.cs
@@ -174,6 +174,282 @@ namespace BPASmartClient.MorkT
}
+
+
+ private void OrderChange(string subid, ORDER_STATUS oRDER_STATUS)
+ {
+ EventBus.EventBus.GetInstance().Publish(new OrderStatusChangedEvent() { Status = oRDER_STATUS, SubOrderId = subid, deviceClientType = DeviceType });
+ }
+
+ private void Wait(int value = 101)
+ {
+ while (!(morkT.lebai.Ok && morkT.lebai.Value == value))
+ {
+ Thread.Sleep(5);
+ }
+ }
+
+ ///
+ /// 是否可以开始制作咖啡
+ ///
+ ///
+ private bool CoffeeCanMake()
+ {
+ bool canMake = (IsHealth && morkT.morkOrderPushesCoffee.Count > 0 && !morkT.IsCoffeeMake) ? true : false;
+ return canMake;
+
+ }
+
+ ///
+ /// 制作咖啡流程
+ ///
+ private void MakeCoffeeProcess()
+ {
+ if (CoffeeCanMake())
+ {
+ if (morkT.morkOrderPushesCoffee.TryDequeue(out OrderLocInfo orderLoc))
+ {
+ DeviceProcessLogShow($"开始制作 [咖啡] 订单[{orderLoc.SortNum}]");
+ GetAndCheeckCoffe(orderLoc);
+ LebaiRobot.GetInstance.Scene(LebaiRobot.SENCE_接咖啡后回原点);//把咖啡杯放到咖啡机机的位置后回原点
+ Wait();
+ LebaiRobot.GetInstance.SetValue(1);
+ new DRCoffee_MakeCoffeeEvent() { DrinkCode = (Model.咖啡机.Enum.DrCoffeeDrinksCode)int.Parse(orderLoc.Loc) }.Publish(); //接咖啡控制
+ DeviceProcessLogShow($"发送咖啡机制作{orderLoc.Loc}!");
+ morkT.IsCoffeeMake = true; morkT.MakeCoffeeOrder = orderLoc;
+ }
+
+ }
+
+
+ }
+ ///
+ /// 咖啡机制作完咖啡，取走并放到取餐口，最后回原点
+ ///
+ private void MakeCoffeeComplete()
+ {
+ if (morkT.IsCoffeeMake && IsHealth)
+ {
+ if (morkT.MakeCoffeeOrder != null && morkT.MakeCoffeeOrder.OrderStatus == 1)
+ {
+ DeviceProcessLogShow($"将咖啡移动到取餐位 [咖啡] 订单[{morkT.MakeCoffeeOrder.SortNum}]");
+ DoCoffeeQC(morkT.MakeCoffeeOrder);
+ morkT.MakeCoffeeOrder = null;
+ morkT.IsCoffeeMake = false;
+ }
+ }
+ }
+
+
+ ///
+ /// 将咖啡杯从咖啡机 取走到 取餐口
+ ///
+ private void DoCoffeeQC(OrderLocInfo order)
+ {
+ LebaiRobot.GetInstance.Scene(LebaiRobot.SENCE_取咖啡出餐);
+ Wait();
+ LebaiRobot.GetInstance.SetValue(1);
+ //订单状态改变：完成
+ OrderChange(order.SuborderId, ORDER_STATUS.COMPLETED_COOK);
+ DeviceProcessLogShow($"{order.GoodsName}等待取餐");
+ //WaitTakeMealOrder.Enqueue(order);
+
+ }
+
+ ///
+ /// 取咖啡杯&&咖啡杯检测 若检测失败机器人回原点
+ ///
+ ///
+ private void GetAndCheeckCoffe(OrderLocInfo order)
+ {
+ LebaiRobot.GetInstance.SetValue(0);
+ OrderChange(order.SuborderId, ORDER_STATUS.COOKING);
+ LebaiRobot.GetInstance.Scene(LebaiRobot.SENCE_取咖啡杯);
+ Wait();
+ new SCChip_TakeCupEvent() { Cup = IC_CUP.CUP_COFFEE }.Publish();//落碗控制
+ Thread.Sleep(500);
+ DeviceProcessLogShow("尝试取咖啡杯!");
+ LebaiRobot.GetInstance.SetValue(1);
+ int count = 2;
+ p:
+ LebaiRobot.GetInstance.Scene(LebaiRobot.SENCE_咖啡杯检测);
+ Wait();
+ LebaiRobot.GetInstance.SetValue(1);
+
+ if (!LebaiRobot.GetInstance.GetInput())
+ {
+ if (count >= 3)
+ {
+ //退出循环回到初始位置
+ DeviceProcessLogShow($"执行{count}次取咖啡杯,仍为成功,订单默认废弃,机器人回到初始位置!");
+ LebaiRobot.GetInstance.Scene(LebaiRobot.SENCE_咖啡杯回原点);
+ Wait();
+ LebaiRobot.GetInstance.SetValue(1);
+ return;
+ }
+ DeviceProcessLogShow("执行二次取咖啡杯");
+ LebaiRobot.GetInstance.Scene(LebaiRobot.SENCE_二次取咖啡杯);
+ Wait();
+ new SCChip_TakeCupEvent() { Cup = IC_CUP.CUP_COFFEE }.Publish();//落碗控制
+ LebaiRobot.GetInstance.SetValue(1);
+ count++;
+ goto p;
+ }
+ DeviceProcessLogShow("取咖啡杯完成");
+ }
+
+ ///
+ /// 冰淇淋是否可以开始制作
+ ///
+ ///
+ private bool IceCreamCanMake()
+ {
+ bool canMake = (IsHealth && morkT.morkOrderPushesIceCream.Count > 0) ? true : false;
+ return canMake;
+ }
+
+ ///
+ /// 制作冰淇淋流程
+ ///
+ private void MakeIceCreamProcess()
+ {
+ if (IceCreamCanMake())
+ {
+ if (MorkIStatus.GetInstance().CurrentMode != MORKI_MODE.制冷模式) new GSIceCream_ModeSetEvent() { Mode = MORKI_MODE.制冷模式 }.Publish();
+ if (MorkIStatus.GetInstance().CXB >= 86 && morkT.morkOrderPushesIceCream.Count > 0)//成型比大于86才可以制作
+ {
+ if (LebaiRobot.GetInstance.GetInput(3))
+ {
+ if (morkT.IceIsOK) DeviceProcessLogShow("请检查冰淇淋出料口有无遮挡");
+ morkT.IceIsOK = false;
+
+ }
+ else if (morkT.morkOrderPushesIceCream.TryDequeue(out OrderLocInfo order))
+ {
+ morkT.IceIsOK = true;
+ DeviceProcessLogShow($"开始制作 [冰淇淋] 订单[{order.SortNum}]");
+ DoIceCream(order);
+ }
+ }
+ }
+ }
+
+
+ ///
+ /// 做冰淇淋
+ ///
+ private void DoIceCream(OrderLocInfo order)
+ {
+ GetIceCreamCup();
+ CheckICeCreaCup();
+ GetIceCream(order);
+ PutIceCream(order);
+ }
+
+ ///
+ /// 取冰淇淋杯
+ ///
+ private void GetIceCreamCup()
+ {
+ LebaiRobot.GetInstance.SetValue(0);
+ LebaiRobot.GetInstance.Scene(LebaiRobot.SENCE_取冰淇淋杯);
+ Wait();
+ new SCChip_TakeCupEvent() { Cup = IC_CUP.CUP_ICECREAM }.Publish();//落碗控制
+ Thread.Sleep(500);
+ DeviceProcessLogShow("尝试取冰淇淋杯!");
+
+ }
+
+ ///
+ /// 冰淇淋杯检测，失败后机器人回到原点
+ ///
+ private void CheckICeCreaCup()
+ {
+ int count = 2;
+ LebaiRobot.GetInstance.SetValue(1);
+ p:
+ LebaiRobot.GetInstance.Scene(LebaiRobot.SENCE_冰淇淋杯检测);
+ Wait();
+ LebaiRobot.GetInstance.SetValue(1);
+ if (!LebaiRobot.GetInstance.GetInput())
+ {
+ if (count >= 3)
+ {
+ //退出循环回到初始位置
+ DeviceProcessLogShow($"执行{count}次取冰淇淋杯,仍未成功,订单默认废弃,机器人回到初始位置!");
+ LebaiRobot.GetInstance.Scene(LebaiRobot.SENCE_冰淇淋杯回原点);
+ Wait();
+ LebaiRobot.GetInstance.SetValue(1);
+ return;
+ }
+ DeviceProcessLogShow($"执行{count}次取冰淇淋杯!");
+ LebaiRobot.GetInstance.Scene(LebaiRobot.SENCE_二次取冰淇淋杯);
+ new SCChip_TakeCupEvent() { Cup = IC_CUP.CUP_ICECREAM }.Publish();//落碗控制
+ Wait();
+ LebaiRobot.GetInstance.SetValue(1);
+ count++;
+ goto p;
+ }
+ DeviceProcessLogShow("冰淇淋杯检测完成");
+ }
+
+ ///
+ /// 机器人取接冰淇淋
+ ///
+ ///
+ private void GetIceCream(OrderLocInfo order)
+ {
+ //制冷模式
+ new GSIceCream_ModeSetEvent() { Mode = MORKI_MODE.制冷模式 }.Publish();
+ LebaiRobot.GetInstance.SetValue(0);
+ OrderChange(order.SuborderId, ORDER_STATUS.COOKING);
+ LebaiRobot.GetInstance.Scene(LebaiRobot.SENCE_接1号冰淇淋);
+ Wait();
+ bool doItResult = true;
+ //出料
+ new GSIceCream_DischargeEvent().Publish(delegate (object[] args)
+ {
+ doItResult = (bool)args[0];
+ });
+ if (doItResult)
+ {
+ IceCreamCookCheck();
+ }
+ else
+ {
+ int count_1 = 0;
+ while (MorkIStatus.GetInstance().CXB <= 86)
+ {
+ Thread.Sleep(5);
+ count_1++;
+ if (count_1 >= 2000)
+ break;
+ }
+ IceCreamCookCheck();
+ }
+ LebaiRobot.GetInstance.SetValue(1);
+ }
+
+ ///
+ /// 把冰淇淋放到取餐位后回原点
+ ///
+ ///
+ private void PutIceCream(OrderLocInfo order)
+ {
+ while (LebaiRobot.GetInstance.GetInput())
+ {
+ Thread.Sleep(500);
+ }
+ LebaiRobot.GetInstance.Scene(LebaiRobot.SENCE_放冰淇淋位置);
+ Wait();
+ LebaiRobot.GetInstance.SetValue(1);
+ //订单状态改变：完成
+ OrderChange(order.SuborderId, ORDER_STATUS.COMPLETED_COOK);
+ DeviceProcessLogShow($"{order.GoodsName}等待取餐");
+ //WaitTakeMealOrder.Enqueue(order);
+
+ }
+
///
/// 冰淇淋机器制作冰淇淋
///
diff --git a/BPASmartClient/App.config b/BPASmartClient/App.config
index e789e97e..08824b61 100644
--- a/BPASmartClient/App.config
+++ b/BPASmartClient/App.config
@@ -12,7 +12,7 @@
-
+
@@ -36,7 +36,7 @@
-->
-
+