From f712275beebaaafda19d7f5f4bed2de43cf61ce2 Mon Sep 17 00:00:00 2001
From: fyf <FYF@FENGYOUFU>
Date: Fri, 18 Mar 2022 18:12:43 +0800
Subject: [PATCH 1/2] 22

---
 HBLConsole.Business/IotReport.cs | 8 ++++++++
 HBLConsole.MainConsole/Main.cs   | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/HBLConsole.Business/IotReport.cs b/HBLConsole.Business/IotReport.cs
index d4f21c2..d7e69fe 100644
--- a/HBLConsole.Business/IotReport.cs
+++ b/HBLConsole.Business/IotReport.cs
@@ -22,6 +22,9 @@ namespace HBLConsole.Business
         {
             IOTDev.GetInstance().Set(InternetInfo.ProductKey, InternetInfo.DeviceName, InternetInfo.DeviceSecret);
             iSLinks = IOTDev.GetInstance().CreateLinks();
+            //订阅设备控制主题
+            IOTDev.GetInstance().IOT_Subscribe("/" + InternetInfo.ProductKey + "/" + InternetInfo.DeviceName + "/user/SetDevice");
+            IOTDev.actionIOT += actionIOTHandler;//消息数据回调
             if (iSLinks) MessageLog.GetInstance.Show($"设备{InternetInfo.DeviceName}阿里云连接成功.");
             else MessageLog.GetInstance.Show($"设备{InternetInfo.DeviceName}阿里云连接失败.不能上报业务信息");
 
@@ -155,5 +158,10 @@ namespace HBLConsole.Business
                 Thread.Sleep(5000);
             }), "设备IOT上报云端");
         }
+
+        private void actionIOTHandler(string topic, string message)
+        {
+            
+        }
     }
 }
diff --git a/HBLConsole.MainConsole/Main.cs b/HBLConsole.MainConsole/Main.cs
index 93be957..7beb370 100644
--- a/HBLConsole.MainConsole/Main.cs
+++ b/HBLConsole.MainConsole/Main.cs
@@ -64,7 +64,7 @@ namespace HBLConsole.MainConsole
 
                     MqttHelper.GetInstance.MqttSubscriptionAsync(Topics.ToArray());//主题订阅
 
-                    //IotReport.GetInstance.Init();//IOT 上报
+                   //w IotReport.GetInstance.Init();//IOT 上报
 
                     HeartbeatReport.GetInstance.Init();//心跳上报
 

From 52a5d14c1a9bc641af37bc1bdb53522c7cfc95dd 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: Fri, 18 Mar 2022 22:15:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=A8=A1=E6=8B=9F?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HBLConsole.Debug/Debug_MORKIC.xaml            |   8 +-
 HBLConsole.Debug/HBLConsole.Debug.csproj      |   2 +-
 HBLConsole.MORKD/HBLConsole.MORKD.csproj      |   4 +-
 HBLConsole.MORKIC/HBLConsole.MORKIC.csproj    |   6 +-
 HBLConsole.MainConsole/Main.cs                |   4 +-
 .../KeepParameter/KeepDataBase.cs             |  22 ++
 .../View/DeviceManagermentSetView.xaml        |   4 +-
 .../DialogWindow/View/SimOrderConfitView.xaml |  55 ++--
 .../View/SimOrderConfitView.xaml.cs           |  17 +-
 .../ViewModel/SimOrderConfitViewModel.cs      |  41 ++-
 HBLConsole/View/DebugContainer.xaml           |  26 +-
 HBLConsole/View/DebugView.xaml                | 236 ++++++++++--------
 HBLConsole/View/MainView.xaml                 |   2 +-
 HBLConsole/ViewModel/DebugViewModel.cs        |  69 +++--
 HBLDevice.Coffee/HBLDevice.Coffee.csproj      |   2 +-
 HBLDevice.IceCream/HBLDevice.IceCream.csproj  |   2 +-
 16 files changed, 320 insertions(+), 180 deletions(-)
 create mode 100644 HBLConsole.Model/KeepParameter/KeepDataBase.cs

diff --git a/HBLConsole.Debug/Debug_MORKIC.xaml b/HBLConsole.Debug/Debug_MORKIC.xaml
index 85a5b56..556dcdd 100644
--- a/HBLConsole.Debug/Debug_MORKIC.xaml
+++ b/HBLConsole.Debug/Debug_MORKIC.xaml
@@ -176,16 +176,16 @@
                                 Style="{StaticResource ButtonStyle}" />
 
                             <ComboBox
-                                Margin="5"
                                 Width="150"
+                                Margin="5"
                                 ItemsSource="{Binding IceCreamModes}"
                                 SelectedItem="{Binding SelecteIceCreamdMode}" />
-                            
+
                             <Button
                                 s:View.ActionTarget="{Binding}"
                                 Command="{s:Action SetIceCreamModel}"
-                                Style="{StaticResource ButtonStyle}"
-                                Content="设置模式" />
+                                Content="设置模式"
+                                Style="{StaticResource ButtonStyle}" />
                         </StackPanel>
 
                     </Grid>
diff --git a/HBLConsole.Debug/HBLConsole.Debug.csproj b/HBLConsole.Debug/HBLConsole.Debug.csproj
index 70741ab..c691971 100644
--- a/HBLConsole.Debug/HBLConsole.Debug.csproj
+++ b/HBLConsole.Debug/HBLConsole.Debug.csproj
@@ -20,7 +20,7 @@
 
   <ItemGroup>
     <Reference Include="BPA.Utility">
-      <HintPath>..\..\..\..\BPACommon_output\net5.0\BPA.Utility.dll</HintPath>
+      <HintPath>D:\BPACommon_output\net5.0\BPA.Utility.dll</HintPath>
     </Reference>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/HBLConsole.MORKD/HBLConsole.MORKD.csproj b/HBLConsole.MORKD/HBLConsole.MORKD.csproj
index 0c59716..960f436 100644
--- a/HBLConsole.MORKD/HBLConsole.MORKD.csproj
+++ b/HBLConsole.MORKD/HBLConsole.MORKD.csproj
@@ -12,10 +12,10 @@
 
   <ItemGroup>
     <Reference Include="BPA.Message">
-      <HintPath>..\..\..\..\..\..\BPACommon_output\net5.0\BPA.Message.dll</HintPath>
+      <HintPath>D:\BPACommon_output\net5.0\BPA.Message.dll</HintPath>
     </Reference>
     <Reference Include="BPA.Models">
-      <HintPath>..\..\..\..\..\..\BPACommon_output\net5.0\BPA.Models.dll</HintPath>
+      <HintPath>D:\BPACommon_output\net5.0\BPA.Models.dll</HintPath>
     </Reference>
   </ItemGroup>
 
diff --git a/HBLConsole.MORKIC/HBLConsole.MORKIC.csproj b/HBLConsole.MORKIC/HBLConsole.MORKIC.csproj
index 424521c..3cf5084 100644
--- a/HBLConsole.MORKIC/HBLConsole.MORKIC.csproj
+++ b/HBLConsole.MORKIC/HBLConsole.MORKIC.csproj
@@ -19,13 +19,13 @@
 
   <ItemGroup>
     <Reference Include="BPA.Message">
-      <HintPath>..\..\..\..\..\..\BPACommon_output\net5.0\BPA.Message.dll</HintPath>
+      <HintPath>D:\BPACommon_output\net5.0\BPA.Message.dll</HintPath>
     </Reference>
     <Reference Include="BPA.Models">
-      <HintPath>..\..\..\..\..\..\BPACommon_output\net5.0\BPA.Models.dll</HintPath>
+      <HintPath>D:\BPACommon_output\net5.0\BPA.Models.dll</HintPath>
     </Reference>
     <Reference Include="BPA.Utility">
-      <HintPath>..\..\..\..\..\..\BPACommon_output\net5.0\BPA.Utility.dll</HintPath>
+      <HintPath>D:\BPACommon_output\net5.0\BPA.Utility.dll</HintPath>
     </Reference>
   </ItemGroup>
 
diff --git a/HBLConsole.MainConsole/Main.cs b/HBLConsole.MainConsole/Main.cs
index 7beb370..5985237 100644
--- a/HBLConsole.MainConsole/Main.cs
+++ b/HBLConsole.MainConsole/Main.cs
@@ -34,6 +34,7 @@ namespace HBLConsole.MainConsole
             Json<MorkOrderPushPar>.Read();
             Json<BatchingInfoPar>.Read();
             Json<SimOrderConfig>.Read();
+            Json<KeepDataBase>.Read();
             MessageLog.GetInstance.Show($"启动【{GeneralConfig.DeviceType}】设备");
         }
 
@@ -44,6 +45,7 @@ namespace HBLConsole.MainConsole
             Json<BatchingInfoPar>.Save();
             Json<SetPar>.Save();
             Json<SimOrderConfig>.Save();
+            Json<KeepDataBase>.Save();
             TextHelper.GetInstance.SaveLogInfo(MessageLog.GetInstance.LogInfo, "LogInfo");
         }
 
@@ -64,7 +66,7 @@ namespace HBLConsole.MainConsole
 
                     MqttHelper.GetInstance.MqttSubscriptionAsync(Topics.ToArray());//主题订阅
 
-                   //w IotReport.GetInstance.Init();//IOT 上报
+                    //w IotReport.GetInstance.Init();//IOT 上报
 
                     HeartbeatReport.GetInstance.Init();//心跳上报
 
diff --git a/HBLConsole.Model/KeepParameter/KeepDataBase.cs b/HBLConsole.Model/KeepParameter/KeepDataBase.cs
new file mode 100644
index 0000000..740fd7f
--- /dev/null
+++ b/HBLConsole.Model/KeepParameter/KeepDataBase.cs
@@ -0,0 +1,22 @@
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using HBLConsole.Service;
+using System.Collections.ObjectModel;
+using System.Collections.Concurrent;
+
+namespace HBLConsole.Model
+{
+    public class KeepDataBase
+    {
+        /// <summary>
+        /// 模拟订单数据的配置
+        /// </summary>
+        public ObservableCollection<SimOrderVisibleData> simOrderConfig { get; set; } = new ObservableCollection<SimOrderVisibleData>();
+
+
+    }
+}
diff --git a/HBLConsole/DialogWindow/View/DeviceManagermentSetView.xaml b/HBLConsole/DialogWindow/View/DeviceManagermentSetView.xaml
index 0de847c..280cc15 100644
--- a/HBLConsole/DialogWindow/View/DeviceManagermentSetView.xaml
+++ b/HBLConsole/DialogWindow/View/DeviceManagermentSetView.xaml
@@ -165,7 +165,6 @@
                 Text="{Binding devcieManagerResult.DeviceName}" />
 
             <TextBlock
-                TextWrapping="Wrap"
                 Grid.Row="2"
                 Grid.ColumnSpan="2"
                 Margin="20,0,0,0"
@@ -173,7 +172,8 @@
                 FontFamily="楷体"
                 FontSize="16"
                 Foreground="#FFE2415C"
-                Text="{Binding LogInfo}" />
+                Text="{Binding LogInfo}"
+                TextWrapping="Wrap" />
 
             <Button
                 Grid.Row="3"
diff --git a/HBLConsole/DialogWindow/View/SimOrderConfitView.xaml b/HBLConsole/DialogWindow/View/SimOrderConfitView.xaml
index 5e279e7..0f72956 100644
--- a/HBLConsole/DialogWindow/View/SimOrderConfitView.xaml
+++ b/HBLConsole/DialogWindow/View/SimOrderConfitView.xaml
@@ -5,6 +5,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:HBLConsole.DialogWindow.View"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:HBLConsole.DialogWindow.ViewModel"
     Title="SimOrderConfitView"
     Width="400"
     Height="275"
@@ -15,6 +16,11 @@
     WindowStartupLocation="CenterScreen"
     WindowStyle="None"
     mc:Ignorable="d">
+
+    <Window.DataContext>
+        <vm:SimOrderConfitViewModel />
+    </Window.DataContext>
+
     <Window.Resources>
         <ResourceDictionary Source="../../Resources/ResourceDictionarys/BasicStyle.xaml">
             <ResourceDictionary.MergedDictionaries>
@@ -104,7 +110,7 @@
         <!--#endregion-->
 
         <!--#region 内容显示区-->
-        <Grid Grid.Row="1" Margin="20">
+        <Grid Grid.Row="1" Margin="10">
             <Grid.RowDefinitions>
                 <RowDefinition />
                 <RowDefinition />
@@ -120,22 +126,20 @@
                 HorizontalAlignment="Right"
                 VerticalAlignment="Center"
                 FontFamily="楷体"
-                FontSize="20"
+                FontSize="18"
                 Foreground="#FF34F7F7"
-                Text="请选择设备类型：" />
-            <ComboBox
+                Text="请输入模拟数据名称：" />
+            <TextBox
                 Grid.Column="1"
+                Margin="0,10"
                 VerticalAlignment="Center"
+                Background="Transparent"
                 BorderBrush="#FF23CACA"
-                BorderThickness="1"
+                CaretBrush="Aqua"
                 FontFamily="楷体"
-                FontSize="20"
-                Foreground="#ff23caca"
-                IsEditable="False"
-                ItemsSource="{Binding DeviceType}"
-                SelectedIndex="0"
-                Style="{StaticResource ComboBoxStyle}"
-                Text="{Binding devcieManagerResult.DeviceType}" />
+                FontSize="21"
+                Foreground="#ff34f7f7"
+                Text="{Binding Name}" />
 
             <TextBlock
                 Grid.Row="1"
@@ -144,7 +148,7 @@
                 FontFamily="楷体"
                 FontSize="20"
                 Foreground="#FF34F7F7"
-                Text="请输入设备名称：" />
+                Text="模拟位置最小值：" />
             <TextBox
                 Grid.Row="1"
                 Grid.Column="1"
@@ -156,18 +160,29 @@
                 FontFamily="楷体"
                 FontSize="21"
                 Foreground="#ff34f7f7"
-                Text="{Binding devcieManagerResult.DeviceName}" />
+                Text="{Binding Min}" />
 
             <TextBlock
                 Grid.Row="2"
-                Grid.ColumnSpan="2"
-                Margin="20,0,0,0"
+                HorizontalAlignment="Right"
                 VerticalAlignment="Center"
                 FontFamily="楷体"
-                FontSize="16"
-                Foreground="#FFE2415C"
-                Text="{Binding LogInfo}"
-                TextWrapping="Wrap" />
+                FontSize="20"
+                Foreground="#FF34F7F7"
+                Text="模拟位置最大值：" />
+            <TextBox
+                Grid.Row="2"
+                Grid.Column="1"
+                Margin="0,10"
+                VerticalAlignment="Center"
+                Background="Transparent"
+                BorderBrush="#FF23CACA"
+                CaretBrush="Aqua"
+                FontFamily="楷体"
+                FontSize="21"
+                Foreground="#ff34f7f7"
+                Text="{Binding Max}" />
+
 
             <Button
                 Grid.Row="3"
diff --git a/HBLConsole/DialogWindow/View/SimOrderConfitView.xaml.cs b/HBLConsole/DialogWindow/View/SimOrderConfitView.xaml.cs
index 78f015c..4ad765e 100644
--- a/HBLConsole/DialogWindow/View/SimOrderConfitView.xaml.cs
+++ b/HBLConsole/DialogWindow/View/SimOrderConfitView.xaml.cs
@@ -1,4 +1,5 @@
-using System;
+using HBLConsole.Service;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -22,6 +23,20 @@ namespace HBLConsole.DialogWindow.View
         public SimOrderConfitView()
         {
             InitializeComponent();
+            this.MoveBorder.MouseLeftButtonDown += (o, e) => { this.DragMove(); };
+            this.ButMin.Click += (o, e) => { this.WindowState = WindowState.Minimized; };
+            this.ButMax.Click += (o, e) => { this.WindowState = this.WindowState == WindowState.Maximized ? WindowState.Normal : WindowState.Maximized; };
+            this.ButClose.Click += (o, e) => { this.DialogResult = false; };
+            this.MaxWidth = SystemParameters.WorkArea.Width;
+            this.MaxHeight = SystemParameters.WorkArea.Height;
+
+            ActionOperate.GetInstance.Register(new Action(() =>
+            {
+                this.DialogResult = true;
+                this.Close();
+                ActionOperate.GetInstance.CancelRegister("SimOrderConfitViewModelExit");
+            }), "SimOrderConfitViewModelExit");
+
         }
     }
 }
diff --git a/HBLConsole/DialogWindow/ViewModel/SimOrderConfitViewModel.cs b/HBLConsole/DialogWindow/ViewModel/SimOrderConfitViewModel.cs
index 79a009c..7f97477 100644
--- a/HBLConsole/DialogWindow/ViewModel/SimOrderConfitViewModel.cs
+++ b/HBLConsole/DialogWindow/ViewModel/SimOrderConfitViewModel.cs
@@ -1,12 +1,51 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using HBLConsole.Model;
+using HBLConsole.Service;
+using HBLConsole.ViewModel;
+using Microsoft.Toolkit.Mvvm.Input;
 
 namespace HBLConsole.DialogWindow.ViewModel
 {
-    public class SimOrderConfitViewModel
+    public class SimOrderConfitViewModel : ViewModelBase
     {
+        public SimOrderConfitViewModel()
+        {
+            ConfirmCommand = new RelayCommand(() =>
+            {
+                Json<KeepDataBase>.Data.simOrderConfig.Add(new SimOrderVisibleData()
+                {
+                    ClientDeviceType = GVL.GeneralConfig.DeviceType.ToString(),
+                    IsEnable = true,
+                    IsSelected = true,
+                    Text = Name,
+                    Loc = Min,
+                    MaxValue = Max,
+                    MinValue = Min,
+                });
+                ActionOperate.GetInstance.Send("SimOrderConfitViewModelExit");
+            });
+            CancelCommand = new RelayCommand(() => { ActionOperate.GetInstance.Send("SimOrderConfitViewModelExit"); });
+        }
+
+
+        public RelayCommand ConfirmCommand { get; set; }
+
+        public RelayCommand CancelCommand { get; set; }
+
+        public string Name { get { return _mName; } set { _mName = value; OnPropertyChanged(); } }
+        private string _mName;
+
+        public ushort Min { get { return _mMin; } set { _mMin = value; OnPropertyChanged(); } }
+        private ushort _mMin;
+
+        public ushort Max { get { return _mMax; } set { _mMax = value; OnPropertyChanged(); } }
+        private ushort _mMax;
+
+
     }
 }
diff --git a/HBLConsole/View/DebugContainer.xaml b/HBLConsole/View/DebugContainer.xaml
index 54e07cd..bd0f1bb 100644
--- a/HBLConsole/View/DebugContainer.xaml
+++ b/HBLConsole/View/DebugContainer.xaml
@@ -1,19 +1,21 @@
-<UserControl x:Class="HBLConsole.View.DebugContainer"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             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:local="clr-namespace:HBLConsole.View"
-             mc:Ignorable="d" 
-             xmlns:vm="clr-namespace:HBLConsole.ViewModel"
-             d:DesignHeight="450" d:DesignWidth="800">
+<UserControl
+    x:Class="HBLConsole.View.DebugContainer"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:HBLConsole.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:HBLConsole.ViewModel"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
     <UserControl.DataContext>
         <vm:DebugContainerViewModel />
     </UserControl.DataContext>
     <Grid>
         <ContentControl
-                    Grid.Row="1"
-                    Margin="15"
-                    Content="{Binding DebugContent}" />    
+            Grid.Row="1"
+            Margin="15"
+            Content="{Binding DebugContent}" />
     </Grid>
 </UserControl>
diff --git a/HBLConsole/View/DebugView.xaml b/HBLConsole/View/DebugView.xaml
index d38dc51..f48f2e6 100644
--- a/HBLConsole/View/DebugView.xaml
+++ b/HBLConsole/View/DebugView.xaml
@@ -22,7 +22,6 @@
                 <ResourceDictionary Source="../Resources/ResourceDictionarys/BasicStyle.xaml">
 
                     <Style x:Key="TextBoxStyle" TargetType="TextBox">
-                        <Setter Property="Width" Value="60" />
                         <Setter Property="FontFamily" Value="楷体" />
                         <Setter Property="FontSize" Value="22" />
                         <Setter Property="Background" Value="Transparent" />
@@ -36,7 +35,7 @@
                     <Style x:Key="ButtonStyle" TargetType="Button">
                         <Setter Property="Foreground" Value="#00c2f4" />
                         <Setter Property="FontSize" Value="18" />
-                        <Setter Property="Width" Value="100" />
+                        <Setter Property="Margin" Value="10 0"/>
                         <Setter Property="Template">
                             <Setter.Value>
                                 <ControlTemplate TargetType="Button">
@@ -153,112 +152,133 @@
     </UserControl.Resources>
 
     <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="40" />
-            <RowDefinition Height="10" />
-            <RowDefinition Height="40" />
-            <RowDefinition Height="40" />
-            <RowDefinition />
-        </Grid.RowDefinitions>
-
-        <StackPanel Orientation="Horizontal">
-
-            <ListBox
-                x:Name="lstEnt"
-                Margin="0,3,0,0"
-                Background="{x:Null}"
-                BorderBrush="{x:Null}"
-                BorderThickness="0"
-                ItemContainerStyle="{StaticResource ResourceKey=ListBoxItemStyle1}"
-                ItemsSource="{Binding simOrderVisibleDatas}">
-                <ListBox.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <StackPanel Orientation="Horizontal" />
-                    </ItemsPanelTemplate>
-                </ListBox.ItemsPanel>
-                <ListBox.ItemTemplate>
-                    <DataTemplate>
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock
-                                Margin="10,0,0,0"
-                                VerticalAlignment="Center"
-                                FontSize="16"
-                                Foreground="#00c2f4"
-                                Text="{Binding Text}" />
-
-                            <TextBox
-                                Margin="0,0,10,0"
-                                IsEnabled="{Binding IsEnable}"
-                                Style="{StaticResource TextBoxStyle}"
-                                Text="{Binding Loc}" />
-
-                            <CheckBox
-                                Height="20"
-                                Margin="0,0,30,0"
-                                VerticalAlignment="Center"
-                                Background="#FF2AB2E7"
-                                Content="启用随机数"
-                                FontSize="16"
-                                Foreground="#00c2f4"
-                                IsChecked="{Binding IsSelected}"
-                                Template="{StaticResource CbTemplate}" />
-                        </StackPanel>
-                    </DataTemplate>
-                </ListBox.ItemTemplate>
-            </ListBox>
-
-            <!--#region 控制按钮-->
-            <Button
-                Margin="10,0,10,0"
-                Command="{Binding SimOrderCommand}"
-                Content="模拟订单"
-                Style="{StaticResource ButtonStyle}" />
-            
-            <Button Margin="0,0,10,0" x:Name="button_loop"
-                Command="{Binding LoopSimOrderCommand}"
-                CommandParameter="{Binding ElementName=button_loop,Path=Content}"
-                Content="{Binding LoopButton,Mode=TwoWay,NotifyOnTargetUpdated=True}"
-                Foreground="{Binding LoopColor, Mode=TwoWay, NotifyOnTargetUpdated=True}"
-                Style="{StaticResource ButtonStyle}" />
-            <Button
-                Margin="0,0,10,0"
-                Command="{Binding InitCommand}"
-                Content="初始化"
-                Style="{StaticResource ButtonStyle}" />
-
-            <Button
-                Command="{Binding InitCommand}"
-                Content="停止"
-                Style="{StaticResource ButtonStyle}" />
-            <!--#endregion-->
-
-        </StackPanel>
-
-        <StackPanel Grid.Row="2" Orientation="Horizontal">
-            <TextBlock
-                Margin="10,0,0,0"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                FontSize="16"
-                Foreground="Red"
-                Text="注意：【取面位置范围是：1 -- 5】, 【取浇头位置范围是：6 -- 10】,  【取碗位置范围是：11 -- 12】" />
-        </StackPanel>
-
-        <StackPanel Grid.Row="3" Orientation="Horizontal">
-            <Button
-                Margin="10,0,10,0"
-                Width="200"
-                Command="{Binding bql}"
-                Content="冰淇淋模拟"
-                Style="{StaticResource ButtonStyle}" />
-
-            <Button
-                Margin="10,0,10,0"
-                 Width="200"
-                Command="{Binding cfj}"
-                Content="咖啡机模拟"
-                Style="{StaticResource ButtonStyle}" />
-        </StackPanel>
+
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="400" />
+            <ColumnDefinition />
+        </Grid.ColumnDefinitions>
+
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition Height="40" />
+            </Grid.RowDefinitions>
+            <ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
+                <ItemsControl ItemsSource="{Binding simOrderConfig}">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <Grid Margin="0 10">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition Width="150"/>
+                                </Grid.ColumnDefinitions>
+                                <TextBlock
+                                    HorizontalAlignment="Right"
+                                    VerticalAlignment="Center"
+                                    FontSize="16"
+                                    Foreground="#00c2f4"
+                                    Text="{Binding Text}" />
+
+                                <TextBox
+                                    Grid.Column="1"
+                                    Margin="10 0"
+                                    IsEnabled="{Binding IsEnable}"
+                                    Style="{StaticResource TextBoxStyle}"
+                                    Text="{Binding Loc}" />
+
+                                <CheckBox
+                                    Grid.Column="2"
+                                    Height="20"
+                                    VerticalAlignment="Center"
+                                    Background="#FF2AB2E7"
+                                    Content="启用随机数"
+                                    FontSize="16"
+                                    Foreground="#00c2f4"
+                                    IsChecked="{Binding IsSelected}"
+                                    Template="{StaticResource CbTemplate}" />
+                            </Grid>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </ScrollViewer>
+
+            <UniformGrid Columns="2" Grid.Row="1">
+                <Button
+                    Grid.Column="1"
+                    
+                    Command="{Binding bql}"
+                    Content="模拟订单"
+                    Style="{StaticResource ButtonStyle}" />
+                <Button
+                    Command="{Binding AddSimDataCommand}"
+                    Content="新增模拟数据"
+                    Style="{StaticResource ButtonStyle}" />
+            </UniformGrid>
+
+        </Grid>
+
+
+
+
+        <Grid Grid.Column="1">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="40" />
+                <RowDefinition Height="10" />
+                <RowDefinition Height="40" />
+                <RowDefinition Height="40" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+
+            <StackPanel Orientation="Horizontal">
+
+
+
+                <!--#region 控制按钮-->
+
+
+                <Button
+                    x:Name="button_loop"
+                    Margin="0,0,10,0"
+                    Command="{Binding LoopSimOrderCommand}"
+                    CommandParameter="{Binding ElementName=button_loop, Path=Content}"
+                    Content="{Binding LoopButton, Mode=TwoWay, NotifyOnTargetUpdated=True}"
+                    Foreground="{Binding LoopColor, Mode=TwoWay, NotifyOnTargetUpdated=True}"
+                    Style="{StaticResource ButtonStyle}" />
+                <Button
+                    Margin="0,0,10,0"
+                    Command="{Binding InitCommand}"
+                    Content="初始化"
+                    Style="{StaticResource ButtonStyle}" />
+
+                <Button
+                    Command="{Binding InitCommand}"
+                    Content="停止"
+                    Style="{StaticResource ButtonStyle}" />
+                <!--#endregion-->
+
+            </StackPanel>
+
+
+
+            <StackPanel Grid.Row="3" Orientation="Horizontal">
+                <Button
+                    Width="200"
+                    Margin="10,0,10,0"
+                    Command="{Binding bql}"
+                    Content="冰淇淋模拟"
+                    Style="{StaticResource ButtonStyle}" />
+
+                <Button
+                    Width="200"
+                    Margin="10,0,10,0"
+                    Command="{Binding cfj}"
+                    Content="咖啡机模拟"
+                    Style="{StaticResource ButtonStyle}" />
+            </StackPanel>
+
+        </Grid>
+
 
 
 
diff --git a/HBLConsole/View/MainView.xaml b/HBLConsole/View/MainView.xaml
index cb8881d..71c36cc 100644
--- a/HBLConsole/View/MainView.xaml
+++ b/HBLConsole/View/MainView.xaml
@@ -13,7 +13,7 @@
     Height="850"
     AllowsTransparency="True"
     Background="{x:Null}"
-    Topmost="False"
+    Topmost="True"
     WindowStartupLocation="CenterScreen"
     WindowStyle="None"
     mc:Ignorable="d">
diff --git a/HBLConsole/ViewModel/DebugViewModel.cs b/HBLConsole/ViewModel/DebugViewModel.cs
index ceb8ca4..68492fa 100644
--- a/HBLConsole/ViewModel/DebugViewModel.cs
+++ b/HBLConsole/ViewModel/DebugViewModel.cs
@@ -15,6 +15,7 @@ using System.Collections.Concurrent;
 using HBLConsole.Attributes;
 using System.Collections.ObjectModel;
 using System.Windows.Media;
+using HBLConsole.DialogWindow.View;
 
 namespace HBLConsole.ViewModel
 {
@@ -23,26 +24,44 @@ namespace HBLConsole.ViewModel
         public DebugViewModel()
         {
             WindowName = "调试模式";
-            bql = new RelayCommand(() => { ActionOperate.GetInstance.Send("bql"); }); 
-            cfj     = new RelayCommand(() => { ActionOperate.GetInstance.Send("cfj"); });
+
+            AddSimDataCommand = new RelayCommand(() =>
+            {
+                SimOrderConfitView simOrderConfitView = new SimOrderConfitView();
+                simOrderConfitView.ShowDialog();
+            });
+
+            bql = new RelayCommand(() => { ActionOperate.GetInstance.Send("bql"); });
+            cfj = new RelayCommand(() => { ActionOperate.GetInstance.Send("cfj"); });
 
             SimOrderCommand = new RelayCommand(() =>
             {
-                if (simOrderVisibleDatas.ElementAt(0).IsSelected)
-                    simOrderVisibleDatas.ElementAt(0).Loc = (ushort)(new Random().Next(1, 6));
+                List<ushort> locs = new List<ushort>();
+                foreach (var item in simOrderConfig)
+                {
+                    if (item.IsSelected)
+                        locs.Add((ushort)(new Random().Next(item.MinValue, item.MaxValue + 1)));
+                    else
+                        locs.Add(item.Loc);
+                }
 
-                if (simOrderVisibleDatas.ElementAt(1).IsSelected)
-                    simOrderVisibleDatas.ElementAt(1).Loc = (ushort)(new Random().Next(6, 11));
+                ActionOperate.GetInstance.Send("SimOrder", locs);
 
-                if (simOrderVisibleDatas.ElementAt(2).IsSelected)
-                    simOrderVisibleDatas.ElementAt(2).Loc = (ushort)(new Random().Next(11, 12));
+                //if (simOrderVisibleDatas.ElementAt(0).IsSelected)
+                //    simOrderVisibleDatas.ElementAt(0).Loc = (ushort)(new Random().Next(1, 6));
 
-                ActionOperate.GetInstance.Send("SimOrder", new SimOrderData()
-                {
-                    NoodleLoc = simOrderVisibleDatas.ElementAt(0).Loc,
-                    SoupLoc = simOrderVisibleDatas.ElementAt(1).Loc,
-                    BowlLoc = simOrderVisibleDatas.ElementAt(2).Loc,
-                });
+                //if (simOrderVisibleDatas.ElementAt(1).IsSelected)
+                //    simOrderVisibleDatas.ElementAt(1).Loc = (ushort)(new Random().Next(6, 11));
+
+                //if (simOrderVisibleDatas.ElementAt(2).IsSelected)
+                //    simOrderVisibleDatas.ElementAt(2).Loc = (ushort)(new Random().Next(11, 12));
+
+                //ActionOperate.GetInstance.Send("SimOrder", new SimOrderData()
+                //{
+                //    NoodleLoc = simOrderVisibleDatas.ElementAt(0).Loc,
+                //    SoupLoc = simOrderVisibleDatas.ElementAt(1).Loc,
+                //    BowlLoc = simOrderVisibleDatas.ElementAt(2).Loc,
+                //});
             });
 
             InitCommand = new RelayCommand(() =>
@@ -87,13 +106,17 @@ namespace HBLConsole.ViewModel
             //}), "循环订单");
         }
 
-        static DebugViewModel()
-        {
-            
-            simOrderVisibleDatas.Add(new SimOrderVisibleData() { Text = "取面位置：", IsEnable = false, IsSelected = true, Loc = 1 });
-            simOrderVisibleDatas.Add(new SimOrderVisibleData() { Text = "取浇头位置：", IsEnable = false, IsSelected = true, Loc = 6 });
-            simOrderVisibleDatas.Add(new SimOrderVisibleData() { Text = "取碗位置：", IsEnable = false, IsSelected = true, Loc = 11 });
-        }
+        //static DebugViewModel()
+        //{
+
+        //    simOrderVisibleDatas.Add(new SimOrderVisibleData() { Text = "取面位置：", IsEnable = false, IsSelected = true, Loc = 1 });
+        //    simOrderVisibleDatas.Add(new SimOrderVisibleData() { Text = "取浇头位置：", IsEnable = false, IsSelected = true, Loc = 6 });
+        //    simOrderVisibleDatas.Add(new SimOrderVisibleData() { Text = "取碗位置：", IsEnable = false, IsSelected = true, Loc = 11 });
+        //}
+
+        public ObservableCollection<SimOrderVisibleData> simOrderConfig { get; set; } = Json<KeepDataBase>.Data.simOrderConfig;
+
+
 
         public static event EventHandler<PropertyChangedEventArgs> StaticPropertyChanged;
         private static void OnStaticPropertyChanged([CallerMemberName] string PropName = "")
@@ -101,6 +124,8 @@ namespace HBLConsole.ViewModel
             StaticPropertyChanged?.Invoke(null, new PropertyChangedEventArgs(PropName));
         }
 
+        public RelayCommand AddSimDataCommand { get; set; }
+
         public RelayCommand SimOrderCommand { get; set; }
 
         public RelayCommand InitCommand { get; set; }
@@ -111,7 +136,7 @@ namespace HBLConsole.ViewModel
         public RelayCommand cfj { get; set; }
 
 
-        public static ObservableCollection<SimOrderVisibleData> simOrderVisibleDatas { get; set; } = new ObservableCollection<SimOrderVisibleData>();
+        //public static ObservableCollection<SimOrderVisibleData> simOrderVisibleDatas { get; set; } = new ObservableCollection<SimOrderVisibleData>();
 
         public static bool IsLoop = false;
         public static bool IsLoopzc = false;
diff --git a/HBLDevice.Coffee/HBLDevice.Coffee.csproj b/HBLDevice.Coffee/HBLDevice.Coffee.csproj
index af0da4a..ad510d8 100644
--- a/HBLDevice.Coffee/HBLDevice.Coffee.csproj
+++ b/HBLDevice.Coffee/HBLDevice.Coffee.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <Reference Include="BPA.Utility">
-      <HintPath>..\..\..\..\..\..\BPACommon_output\net5.0\BPA.Utility.dll</HintPath>
+      <HintPath>D:\BPACommon_output\net5.0\BPA.Utility.dll</HintPath>
     </Reference>
   </ItemGroup>
 
diff --git a/HBLDevice.IceCream/HBLDevice.IceCream.csproj b/HBLDevice.IceCream/HBLDevice.IceCream.csproj
index af0da4a..ad510d8 100644
--- a/HBLDevice.IceCream/HBLDevice.IceCream.csproj
+++ b/HBLDevice.IceCream/HBLDevice.IceCream.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <Reference Include="BPA.Utility">
-      <HintPath>..\..\..\..\..\..\BPACommon_output\net5.0\BPA.Utility.dll</HintPath>
+      <HintPath>D:\BPACommon_output\net5.0\BPA.Utility.dll</HintPath>
     </Reference>
   </ItemGroup>