diff --git a/BPASmartClient.CustomResource/Themes/GenricStyle.xaml b/BPASmartClient.CustomResource/Themes/GenricStyle.xaml
index 6f3f53a9..b34e41aa 100644
--- a/BPASmartClient.CustomResource/Themes/GenricStyle.xaml
+++ b/BPASmartClient.CustomResource/Themes/GenricStyle.xaml
@@ -11,13 +11,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
-
-
-
+
\ No newline at end of file
diff --git a/BPASmartClient.CustomResource/UserControls/DateTimeUI.xaml b/BPASmartClient.CustomResource/UserControls/DateTimeUI.xaml
index b30d09af..419a45bf 100644
--- a/BPASmartClient.CustomResource/UserControls/DateTimeUI.xaml
+++ b/BPASmartClient.CustomResource/UserControls/DateTimeUI.xaml
@@ -22,15 +22,26 @@
- 14:48:30
+
+ 14:48:30
+
- 星期一
+
+ 星期一
+
2021-11-13
diff --git a/BPASmartClient.CustomResource/UserControls/UserKeyBoard.xaml b/BPASmartClient.CustomResource/UserControls/UserKeyBoard.xaml
index d1c7d721..37a5336b 100644
--- a/BPASmartClient.CustomResource/UserControls/UserKeyBoard.xaml
+++ b/BPASmartClient.CustomResource/UserControls/UserKeyBoard.xaml
@@ -12,7 +12,7 @@
mc:Ignorable="d">
+
+
+
+
+
+
+
+
+
+
+
+ 咖啡机状态
+
+ 应用状态
+
+ 告警信息
+
+ 故障信息
+
+
+
+
+ 饮品
+
+
+
+
+
+ 模式
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 连接状态
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 舵机控制
+
+
+
+
+ 舵机1
+ 舵机2
+ 舵机3
+ 舵机4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DI输入
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DI0
+
+
+ DI1
+
+
+ DI2
+
+
+ DI3
+
+
+ DI4
+
+
+ DI5
+
+
+ DI6
+
+
+ DI7
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DO输出
+
+
+
+ DO0
+ DO1
+ DO2
+ DO3
+ DO4
+ DO5
+ DO6
+ DO7
+
+
+
+
+
+
+ True
+ false
+
+
+
+
+
+
diff --git a/BPASmartClient.MorkT.Lebai.JC/View/DebugView.xaml.cs b/BPASmartClient.MorkT.Lebai.JC/View/DebugView.xaml.cs
new file mode 100644
index 00000000..aa18d11e
--- /dev/null
+++ b/BPASmartClient.MorkT.Lebai.JC/View/DebugView.xaml.cs
@@ -0,0 +1,37 @@
+using BPASmartClient.Helper;
+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.MorkTJAKAJC.View
+{
+ ///
+ /// DebugView.xaml 的交互逻辑
+ ///
+ public partial class DebugView : UserControl
+ {
+ public DebugView()
+ {
+ InitializeComponent();
+ }
+
+ private void Dubug_Unloaded(object sender, RoutedEventArgs e)
+ {
+ ThreadManage.GetInstance().StopTask("MorkT-状态刷新");
+ ThreadManage.GetInstance().StopTask("MorkT-传感器监视");
+
+ }
+ }
+
+}
diff --git a/BPASmartClient.MorkT.Lebai.JC/ViewModel/DebugViewModel.cs b/BPASmartClient.MorkT.Lebai.JC/ViewModel/DebugViewModel.cs
new file mode 100644
index 00000000..6b6c242c
--- /dev/null
+++ b/BPASmartClient.MorkT.Lebai.JC/ViewModel/DebugViewModel.cs
@@ -0,0 +1,235 @@
+using BPASmartClient.Business;
+using BPASmartClient.Device;
+using BPASmartClient.DRCoffee;
+using BPASmartClient.EventBus;
+using BPASmartClient.GSIceCream;
+using BPASmartClient.Helper;
+using BPASmartClient.LebaiRobot;
+using BPASmartClient.Message;
+using BPASmartClient.Model;
+using BPASmartClient.Model.乐白机器人;
+using BPASmartClient.Model.冰淇淋.Enum;
+using BPASmartClient.Model.单片机;
+using BPASmartClient.Model.单片机.Enum;
+using BPASmartClient.Model.咖啡机.Enum;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading;
+namespace BPASmartClient.MorkTLebaiJC.ViewModel;
+ public class DebugViewModel : ObservableObject
+ {
+
+ #region 乐白机器人
+ ///
+ /// 乐白机器人连接状态
+ ///
+ public string RobotConnected { get { return _robotConnected; } set { _robotConnected = value; OnPropertyChanged(); } }
+ private string _robotConnected { get; set; }
+ ///
+ /// 乐白机器人的模式状态
+ ///
+ public string RobotMode { get { return _robotMode; } set { _robotMode = value; OnPropertyChanged(); } }
+ private string _robotMode { get; set; }
+ ///
+ /// 机器人控制指令
+ ///
+ public RelayCommand