From 9b7871e6827021d9d16a1d73ee69a10ee0ff4091 Mon Sep 17 00:00:00 2001
From: pengliangyang <1406009520@qq.com>
Date: Tue, 26 Jul 2022 16:01:18 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=88=A0=E9=99=A4morkT=E7=9B=91=E8=A7=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
BPASmartClient.MorkTSingle/Control_MORKJC.cs | 3 +-
.../ViewModel/MonitorViewModel.cs | 94 -------------------
.../ViewModel/MonitorViewModel.cs | 92 ------------------
BPASmartClient.SerialPort/SerialPortClient.cs | 6 +-
BPASmartClient/App.config | 8 +-
SmartClient.sln | 44 ++++-----
6 files changed, 31 insertions(+), 216 deletions(-)
delete mode 100644 BPASmartClient.MorkT_BarCounter/ViewModel/MonitorViewModel.cs
delete mode 100644 BPASmartClient.MorkT_Container/ViewModel/MonitorViewModel.cs
diff --git a/BPASmartClient.MorkTSingle/Control_MORKJC.cs b/BPASmartClient.MorkTSingle/Control_MORKJC.cs
index 88ad1e67..4bb1a4a2 100644
--- a/BPASmartClient.MorkTSingle/Control_MORKJC.cs
+++ b/BPASmartClient.MorkTSingle/Control_MORKJC.cs
@@ -279,7 +279,8 @@ namespace BPASmartClient.MorkTSingle
});
/*
string aa = calLrcCommon("01" + "05" + "0000000D");
- string bb = ":01010001" + aa + "\r\n";*/
+ string bb = ":01010001" + aa + "\r\n";
+ */
}
public static string calLrcCommon(string data)
{
diff --git a/BPASmartClient.MorkT_BarCounter/ViewModel/MonitorViewModel.cs b/BPASmartClient.MorkT_BarCounter/ViewModel/MonitorViewModel.cs
deleted file mode 100644
index eaba7de0..00000000
--- a/BPASmartClient.MorkT_BarCounter/ViewModel/MonitorViewModel.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using BPASmartClient.Business;
-using BPASmartClient.Helper;
-using BPASmartClient.Model.乐白机器人;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Data;
-using System.Windows.Media;
-
-namespace BPASmartClient.MorkT_BarCounter.ViewModel
-{
-
- public class MonitorViewModel: ObservableObject
- {
- #region 传感器
- ///
- /// 机器人夹爪传感器
- ///
- public bool RobotSenser { get { return _robotSenser; } set { _robotSenser = value; OnPropertyChanged(); } }
- private bool _robotSenser;
- ///
- /// 冰淇淋出口传感器
- ///
- public bool IceCreamSenser { get { return _iceCreamSenser; } set { _iceCreamSenser = value; OnPropertyChanged(); } }
- private bool _iceCreamSenser;
- ///
- /// 取餐口检测传感器
- ///
- public bool TakeMealSenser { get { return _takeMealSenser; } set { _takeMealSenser = value; OnPropertyChanged(); } }
- private bool _takeMealSenser;
-
- #endregion
-
-
- ///
- /// 设备ID
- ///
- int DeviceId;
- public MonitorViewModel()
- {
- Plugin.GetInstance()?.GetPlugin()?.GetDevices().ForEach(device =>
- {
- if (device.Name == "MorkT") DeviceId = device.DeviceId;
-
- });
- ThreadManage.GetInstance().StartLong(new Action(() =>
- {
- EventBus.EventBus.GetInstance().Publish(new LebaiRobot_GetTCPInputEvent() { DeviceId = DeviceId, Pin = 1 },(res)=>
- {
- if(res != null&& res.Length>0&& res[0] is bool b)
- {
- RobotSenser = b;
- }
- });
-
- EventBus.EventBus.GetInstance().Publish(new LebaiRobot_GetInputEvent() { DeviceId = DeviceId, Pin = 0 }, (res) =>
- {
- if (res != null && res.Length > 0 && res[0] is bool b)
- {
- TakeMealSenser = b;
- }
- });
-
- EventBus.EventBus.GetInstance().Publish(new LebaiRobot_GetTCPInputEvent() { DeviceId = DeviceId, Pin = 3 }, (res) =>
- {
- if (res != null && res.Length > 0 && res[0] is bool b)
- {
- IceCreamSenser = b;
- }
- });
- Thread.Sleep(500);
- }), "MorkT-传感器监视");
- }
- }
-
- public class BoolToColorConvert : IValueConverter
- {
- public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
- {
- return (bool) value? new SolidColorBrush(Color.FromRgb(144, 238, 144)) : new SolidColorBrush(Color.FromRgb(178, 34, 34));
- }
-
- public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
- {
- throw new NotImplementedException();
- }
- }
-
-}
diff --git a/BPASmartClient.MorkT_Container/ViewModel/MonitorViewModel.cs b/BPASmartClient.MorkT_Container/ViewModel/MonitorViewModel.cs
deleted file mode 100644
index 22355c10..00000000
--- a/BPASmartClient.MorkT_Container/ViewModel/MonitorViewModel.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using BPASmartClient.Business;
-using BPASmartClient.Helper;
-using BPASmartClient.Model.乐白机器人;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Data;
-using System.Windows.Media;
-
-namespace BPASmartClient.MorkT_Container.ViewModel
-{
-
- public class MonitorViewModel: ObservableObject
- {
- #region 传感器
- ///
- /// 机器人夹爪传感器
- ///
- public bool RobotSenser { get { return _robotSenser; } set { _robotSenser = value; OnPropertyChanged(); } }
- private bool _robotSenser;
- ///
- /// 冰淇淋出口传感器
- ///
- public bool IceCreamSenser { get { return _iceCreamSenser; } set { _iceCreamSenser = value; OnPropertyChanged(); } }
- private bool _iceCreamSenser;
- ///
- /// 取餐口检测传感器
- ///
- public bool TakeMealSenser { get { return _takeMealSenser; } set { _takeMealSenser = value; OnPropertyChanged(); } }
- private bool _takeMealSenser;
-
- #endregion
- ///
- /// 设备ID
- ///
- int DeviceId;
- public MonitorViewModel()
- {
- Plugin.GetInstance()?.GetPlugin()?.GetDevices().ForEach(device =>
- {
- if (device.Name == "MorkT") DeviceId = device.DeviceId;
-
- });
- ThreadManage.GetInstance().StartLong(new Action(() =>
- {
- EventBus.EventBus.GetInstance().Publish(new LebaiRobot_GetTCPInputEvent() { DeviceId = DeviceId, Pin = 1 },(res)=>
- {
- if(res != null&& res.Length>0&& res[0] is bool b)
- {
- RobotSenser = b;
- }
- });
-
- EventBus.EventBus.GetInstance().Publish(new LebaiRobot_GetInputEvent() { DeviceId = DeviceId, Pin = 0 }, (res) =>
- {
- if (res != null && res.Length > 0 && res[0] is bool b)
- {
- TakeMealSenser = b;
- }
- });
-
- EventBus.EventBus.GetInstance().Publish(new LebaiRobot_GetTCPInputEvent() { DeviceId = DeviceId, Pin = 3 }, (res) =>
- {
- if (res != null && res.Length > 0 && res[0] is bool b)
- {
- IceCreamSenser = b;
- }
- });
- Thread.Sleep(500);
- }), "MorkT-传感器监视");
- }
- }
-
- public class BoolToColorConvert : IValueConverter
- {
- public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
- {
- return (bool) value? new SolidColorBrush(Color.FromRgb(144, 238, 144)) : new SolidColorBrush(Color.FromRgb(178, 34, 34));
- }
-
- public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
- {
- throw new NotImplementedException();
- }
- }
-
-}
diff --git a/BPASmartClient.SerialPort/SerialPortClient.cs b/BPASmartClient.SerialPort/SerialPortClient.cs
index f814c1d3..b966aab9 100644
--- a/BPASmartClient.SerialPort/SerialPortClient.cs
+++ b/BPASmartClient.SerialPort/SerialPortClient.cs
@@ -143,7 +143,7 @@ namespace BPASmartClient.SerialPort
/// 判断是否有这个串口
///
public bool IsHavePort => System.IO.Ports.SerialPort.GetPortNames().Contains(PortName);
-
+
///
/// 打开端口
///
@@ -154,7 +154,7 @@ namespace BPASmartClient.SerialPort
{
if (!IsHavePort)
{
- MessageLog.GetInstance.Show("咖乐美咖啡机连接失败");
+ MessageLog.GetInstance.Show($"{portName}连接失败");
return;
}
if (comPort.IsOpen) comPort.Close();
@@ -164,7 +164,7 @@ namespace BPASmartClient.SerialPort
comPort.DataBits = (int)dataBits;
comPort.StopBits = stopBits;
comPort.Open();
- MessageLog.GetInstance.Show("咖乐美咖啡机连接成功");
+ MessageLog.GetInstance.Show($"{portName}连接成功");
}
}
diff --git a/BPASmartClient/App.config b/BPASmartClient/App.config
index 238c0f5f..3e8dea24 100644
--- a/BPASmartClient/App.config
+++ b/BPASmartClient/App.config
@@ -7,9 +7,9 @@
-
+
-
+
diff --git a/SmartClient.sln b/SmartClient.sln
index ba5d45bb..d77e7b85 100644
--- a/SmartClient.sln
+++ b/SmartClient.sln
@@ -114,7 +114,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestDemo", "TestDemo\TestDe
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.HubHelper", "BPASmartClient.HubHelper\BPASmartClient.HubHelper.csproj", "{099E047C-F40E-47A3-A5BA-81FC1500D5E8}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MorkTM", "BPASmartClient.MorkTM\BPASmartClient.MorkTM.csproj", "{76B6B333-0109-4EE8-A9B2-3E53A7421D92}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MorkTSingle", "BPASmartClient.MorkTSingle\BPASmartClient.MorkTSingle.csproj", "{2366AC9B-B662-4550-9486-AF848B4D2961}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -1070,26 +1070,26 @@ Global
{099E047C-F40E-47A3-A5BA-81FC1500D5E8}.Release|x64.Build.0 = Release|Any CPU
{099E047C-F40E-47A3-A5BA-81FC1500D5E8}.Release|x86.ActiveCfg = Release|Any CPU
{099E047C-F40E-47A3-A5BA-81FC1500D5E8}.Release|x86.Build.0 = Release|Any CPU
- {76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Debug|ARM.Build.0 = Debug|Any CPU
- {76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Debug|ARM64.ActiveCfg = Debug|Any CPU
- {76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Debug|ARM64.Build.0 = Debug|Any CPU
- {76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Debug|x64.ActiveCfg = Debug|Any CPU
- {76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Debug|x64.Build.0 = Debug|Any CPU
- {76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Debug|x86.ActiveCfg = Debug|Any CPU
- {76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Debug|x86.Build.0 = Debug|Any CPU
- {76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Release|Any CPU.Build.0 = Release|Any CPU
- {76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Release|ARM.ActiveCfg = Release|Any CPU
- {76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Release|ARM.Build.0 = Release|Any CPU
- {76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Release|ARM64.ActiveCfg = Release|Any CPU
- {76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Release|ARM64.Build.0 = Release|Any CPU
- {76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Release|x64.ActiveCfg = Release|Any CPU
- {76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Release|x64.Build.0 = Release|Any CPU
- {76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Release|x86.ActiveCfg = Release|Any CPU
- {76B6B333-0109-4EE8-A9B2-3E53A7421D92}.Release|x86.Build.0 = Release|Any CPU
+ {2366AC9B-B662-4550-9486-AF848B4D2961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2366AC9B-B662-4550-9486-AF848B4D2961}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2366AC9B-B662-4550-9486-AF848B4D2961}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {2366AC9B-B662-4550-9486-AF848B4D2961}.Debug|ARM.Build.0 = Debug|Any CPU
+ {2366AC9B-B662-4550-9486-AF848B4D2961}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+ {2366AC9B-B662-4550-9486-AF848B4D2961}.Debug|ARM64.Build.0 = Debug|Any CPU
+ {2366AC9B-B662-4550-9486-AF848B4D2961}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {2366AC9B-B662-4550-9486-AF848B4D2961}.Debug|x64.Build.0 = Debug|Any CPU
+ {2366AC9B-B662-4550-9486-AF848B4D2961}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {2366AC9B-B662-4550-9486-AF848B4D2961}.Debug|x86.Build.0 = Debug|Any CPU
+ {2366AC9B-B662-4550-9486-AF848B4D2961}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2366AC9B-B662-4550-9486-AF848B4D2961}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2366AC9B-B662-4550-9486-AF848B4D2961}.Release|ARM.ActiveCfg = Release|Any CPU
+ {2366AC9B-B662-4550-9486-AF848B4D2961}.Release|ARM.Build.0 = Release|Any CPU
+ {2366AC9B-B662-4550-9486-AF848B4D2961}.Release|ARM64.ActiveCfg = Release|Any CPU
+ {2366AC9B-B662-4550-9486-AF848B4D2961}.Release|ARM64.Build.0 = Release|Any CPU
+ {2366AC9B-B662-4550-9486-AF848B4D2961}.Release|x64.ActiveCfg = Release|Any CPU
+ {2366AC9B-B662-4550-9486-AF848B4D2961}.Release|x64.Build.0 = Release|Any CPU
+ {2366AC9B-B662-4550-9486-AF848B4D2961}.Release|x86.ActiveCfg = Release|Any CPU
+ {2366AC9B-B662-4550-9486-AF848B4D2961}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -1142,7 +1142,7 @@ Global
{E7168B03-68E5-4285-BB95-5660F877577A} = {8712125E-14CD-4E1B-A1CE-4BDE03805942}
{A49E1C5A-9489-451C-9CE6-CEA586234B84} = {8712125E-14CD-4E1B-A1CE-4BDE03805942}
{099E047C-F40E-47A3-A5BA-81FC1500D5E8} = {3D1D0E04-03FD-480A-8CF8-6E01A2E28625}
- {76B6B333-0109-4EE8-A9B2-3E53A7421D92} = {9FB27073-61A0-4FE3-94DB-5FDDE062332F}
+ {2366AC9B-B662-4550-9486-AF848B4D2961} = {9FB27073-61A0-4FE3-94DB-5FDDE062332F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {9AEC9B81-0222-4DE9-B642-D915C29222AC}
From d4dc708fbcaaede91bd52029feb7488c6b2fccb1 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: Tue, 26 Jul 2022 16:06:12 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E7=A1=AC=E4=BB=B6=E7=8A=B6=E6=80=81?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
DosingSystem/App.xaml.cs | 16 ++++++++--------
DosingSystem/View/HardwareStatusView.xaml | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/DosingSystem/App.xaml.cs b/DosingSystem/App.xaml.cs
index 7b7a9f4b..cc308d2b 100644
--- a/DosingSystem/App.xaml.cs
+++ b/DosingSystem/App.xaml.cs
@@ -28,13 +28,13 @@ namespace BPASmartClient.DosingSystem
DataInit();
MainView mv = new MainView();
- mv.Show();
- //LoginView lv = new LoginView();
- //var res = lv.ShowDialog();
- //if (res != null && res == true)
- // mv.Show();
- //else
- // mv.Close();
+ //mv.Show();
+ LoginView lv = new LoginView();
+ var res = lv.ShowDialog();
+ if (res != null && res == true)
+ mv.Show();
+ else
+ mv.Close();
MainWindow = mv;
}
@@ -71,7 +71,7 @@ namespace BPASmartClient.DosingSystem
MainMenuIcon = "",
MainMenuName = "配方管理",
Alias = "Recipe Management",
- MainMenuPermission = new Permission[] { Permission.管理员, Permission.操作员 },
+ MainMenuPermission = new Permission[] { Permission.管理员 },
subMenumodels = RecipeManage,
});
#endregion
diff --git a/DosingSystem/View/HardwareStatusView.xaml b/DosingSystem/View/HardwareStatusView.xaml
index ecdef315..7562583c 100644
--- a/DosingSystem/View/HardwareStatusView.xaml
+++ b/DosingSystem/View/HardwareStatusView.xaml
@@ -182,7 +182,7 @@
Height="{Binding ElementName=gr, Path=ActualHeight}"
Margin="0,0,400,0"
ConveyorBeltWidth="70"
- Direction="0"
+ Direction="1"
StrokeBrush="Red"
StrokeDashArray="1.5 1.5"
StrokeFillBrush="Red"
From ccd3f153e206e0dae79c30810481d0ebd04f241b 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: Tue, 26 Jul 2022 16:11:38 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=BA=97=E9=93=BA=E4=BF=9D=E5=AD=98?=
=?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
BPASmartClient.ViewModel/ShopDeviceConfigViewModel.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/BPASmartClient.ViewModel/ShopDeviceConfigViewModel.cs b/BPASmartClient.ViewModel/ShopDeviceConfigViewModel.cs
index 0af21f64..ac4b4dd8 100644
--- a/BPASmartClient.ViewModel/ShopDeviceConfigViewModel.cs
+++ b/BPASmartClient.ViewModel/ShopDeviceConfigViewModel.cs
@@ -46,7 +46,7 @@ namespace BPASmartClient.ViewModel
DataListInit();
- SaveData = new Action(() =>
+ SaveData = new RelayCommand(() =>
{
if (deviceConfig.Count > 0)
{
@@ -171,7 +171,7 @@ namespace BPASmartClient.ViewModel
///
public RelayCommand