更新冲突

HBLConsole.Business/IotReport.cs

@@ -44,6 +44,11 @@ namespace HBLConsole.Business
         /// </summary>
         IControl control;
 
+        public void Close()
+        {
+            IOTDev.GetInstance().Disconnect();
+        }
+
         public T GetTypeValue<T>(string str)
         {
             return (T)control.GetT().GetType().GetProperty(str).GetValue(control.GetT(), null);
@@ -112,7 +117,7 @@ namespace HBLConsole.Business
         {
             ThreadOperate.GetInstance.StartLong(new Action(() =>
             {
-                if (iSLinks && GeneralConfig.DeviceType.ToString() == "MORKS")
+                if (iSLinks && GeneralConfig.DeviceType.ToString() == "MO7RKS")
                 {
                     SetData();
                     IOTDev.GetInstance().IOT_Publish(IOTDev.PubTopic, iOTDevSXModel.Tojson());

HBLConsole.MORKS/Control_MORKS.cs

@@ -12,7 +12,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using BPA.Message.Enum;
-
+using HBLConsole.GVL;
 
 namespace HBLConsole.MORKS
 {
@@ -228,6 +228,7 @@ namespace HBLConsole.MORKS
             ThreadOperate.GetInstance.StartLong(new Action(() =>
             {
                 mORKS.AllowRun = mORKS.InitComplete && !mORKS.TemperatureReached;
+                GeneralConfig.Healthy = mORKS.AllowRun;
 
                 TakeBowlTask();
 

HBLConsole.MainConsole/Main.cs

@@ -51,7 +51,7 @@ namespace HBLConsole.MainConsole
         {
             ThreadOperate.GetInstance.Start(new Action(() =>
             {
-                //InternetInfo.ConfigInit();//从 consul 获取配置数据
+                InternetInfo.ConfigInit();//从 consul 获取配置数据
                 SimpleFactory.GetInstance.DeviceInit();//设备初始化
                 Topics.Clear();
                 Topics.Add(TOPIC.GetInstance.GetOrderPushTopic(GeneralConfig.DeviceType, InternetInfo.ClientId));

HBLConsole/App.xaml.cs

@@ -13,6 +13,7 @@ using HBLConsole.Model;
 using HBLConsole.MainConsole;
 using HBLConsole.GVL;
 using BPA.Message.Enum;
+using HBLConsole.Business;
 
 namespace HBLConsole
 {
@@ -49,6 +50,7 @@ namespace HBLConsole
 
         protected override void OnExit(ExitEventArgs e)
         {
+            IotReport.GetInstance.Close();
             base.OnExit(e);
             SqlHelper.GetInstance.Save();
             MainConsole.Main.GetInstance.DataSave();