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}" />
-
+
+ Content="设置模式"
+ Style="{StaticResource ButtonStyle}" />
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 @@
- ..\..\..\..\BPACommon_output\net5.0\BPA.Utility.dll
+ D:\BPACommon_output\net5.0\BPA.Utility.dll
\ 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 @@
- ..\..\..\..\..\..\BPACommon_output\net5.0\BPA.Message.dll
+ D:\BPACommon_output\net5.0\BPA.Message.dll
- ..\..\..\..\..\..\BPACommon_output\net5.0\BPA.Models.dll
+ D:\BPACommon_output\net5.0\BPA.Models.dll
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 @@
- ..\..\..\..\..\..\BPACommon_output\net5.0\BPA.Message.dll
+ D:\BPACommon_output\net5.0\BPA.Message.dll
- ..\..\..\..\..\..\BPACommon_output\net5.0\BPA.Models.dll
+ D:\BPACommon_output\net5.0\BPA.Models.dll
- ..\..\..\..\..\..\BPACommon_output\net5.0\BPA.Utility.dll
+ D:\BPACommon_output\net5.0\BPA.Utility.dll
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.Read();
Json.Read();
Json.Read();
+ Json.Read();
MessageLog.GetInstance.Show($"启动【{GeneralConfig.DeviceType}】设备");
}
@@ -44,6 +45,7 @@ namespace HBLConsole.MainConsole
Json.Save();
Json.Save();
Json.Save();
+ Json.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
+ {
+ ///
+ /// 模拟订单数据的配置
+ ///
+ public ObservableCollection simOrderConfig { get; set; } = new ObservableCollection();
+
+
+ }
+}
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}" />
+ Text="{Binding LogInfo}"
+ TextWrapping="Wrap" />