冲突解决

HBLConsole.Business/IotReport.cs

@@ -29,7 +29,7 @@ namespace HBLConsole.Business
             else MessageLog.GetInstance.Show($"设备{InternetInfo.DeviceName}阿里云连接失败.不能上报业务信息");
             string NameSpace = $"HBLConsole.{GeneralConfig.DeviceType}";//Load 加载的是dll的名称，GetType获取的是全命名空间下的类
             Type type = Assembly.Load(NameSpace).GetType($"{NameSpace}.Control_{GeneralConfig.DeviceType}");
-            control = Activator.CreateInstance(type) as IControl;
+            control = (IControl)type?.GetProperty("Instance").GetValue(null);
         }
         /// <summary>
         /// 是否连接成功
@@ -67,13 +67,14 @@ namespace HBLConsole.Business
                             new DevSXBase { SXMC="设备软件",SXLX="上位机",SXStatus=true }
                         }
             });
+            
             bool IsAllowRun = GetTypeValue<bool>("AllowRun");
             bool TemperatureReached = GetTypeValue<bool>("TemperatureReached");
             bool MissingBowl = GetTypeValue<bool>("MissingBowl");
             bool TurntableLowerLimit = GetTypeValue<bool>("TurntableLowerLimit");
 
             //设置扩展属性与状态,连接上机器人后才会处罚
-            if (IsAllowRun)
+            if (GeneralConfig.Healthy)
             {
                 iOTDevSXModel.SetKZSX(new DevSX
                 {
@@ -117,7 +118,7 @@ namespace HBLConsole.Business
         {
             ThreadOperate.GetInstance.StartLong(new Action(() =>
             {
-                if (iSLinks && GeneralConfig.DeviceType.ToString() == "MO7RKS")
+                if (iSLinks && GeneralConfig.DeviceType.ToString() == "MORKS")
                 {
                     SetData();
                     IOTDev.GetInstance().IOT_Publish(IOTDev.PubTopic, iOTDevSXModel.Tojson());

HBLConsole.Business/MessageServer/Base.cs

@@ -154,8 +154,23 @@ namespace HBLConsole.Business.MessageServer
             {
                 MessageLog.GetInstance.Show(ex.ToString());
             }
-            var res = JsonConvert.DeserializeObject<OrderStatusChangeRsp>(result);
-            return res?.Result == 2;
+            var res = JsonConvert.DeserializeObject<OrderStatusRsp>(result);
+            return res == null ? false: res.isSuccess;
+        }
+        public class OrderStatusRsp
+        {
+            /// <summary>
+            /// 子订单ID
+            /// </summary>
+            public string SuborderId { get; set; }
+            /// <summary>
+            /// 订单状态
+            /// </summary>
+            public int Result { get; set; } = 0;
+            public bool isSuccess { get; set; }
+            public bool data { get; set; }
+            public string msg { get; set; }
+
         }
     }
 }

HBLConsole.Factory/SimpleFactory.cs

@@ -74,10 +74,10 @@ namespace HBLConsole.Factory
         /// </summary>
         public void DeviceInit()
         {
-            //return;
             string NameSpace = $"HBLConsole.{DeviceType}";//Load 加载的是dll的名称，GetType获取的是全命名空间下的类
             Type type = Assembly.Load(NameSpace).GetType($"{NameSpace}.Control_{DeviceType}");
-            control = Activator.CreateInstance(type) as IControl;
+            //control = Activator.CreateInstance(type) as IControl;
+            control = (IControl)type?.GetProperty("Instance").GetValue(null);
             //IControl business = (IControl)type?.GetProperty("GetInstance").GetValue(null);
             GetBatchingInfo();
             control?.Init();

HBLConsole.MORKD/Control_MORKD.cs

@@ -13,6 +13,22 @@ namespace HBLConsole.MORKD
 {
     public class Control_MORKD : IControl
     {
+        #region 单例模式
+        private static Control_MORKD _instance;
+        public static Control_MORKD Instance
+        {
+            get
+            {
+                if (_instance == null)
+                    _instance = new Control_MORKD();
+                return _instance;
+            }
+        }
+        public Control_MORKD()
+        {
+
+        }
+        #endregion
         GVL_MORKD mORKD = new GVL_MORKD();
         public void ConnectOk()
         {

HBLConsole.MORKIC/Control_MORKIC.cs

@@ -28,6 +28,22 @@ namespace HBLConsole.MORKIC
      */
     public class Control_MORKIC : IControl
     {
+        #region 单例模式
+        private static Control_MORKIC _instance;
+        public static Control_MORKIC Instance
+        {
+            get
+            {
+                if (_instance == null)
+                    _instance = new Control_MORKIC();
+                return _instance;
+            }
+        }
+        public Control_MORKIC()
+        {
+
+        }
+        #endregion
         GVL_MORIC mORKD = new GVL_MORIC();
         //咖啡机主控程序
         private CoffeeMachine coffeeMachine;

HBLConsole.MORKS/Control_MORKS.cs

@@ -19,8 +19,23 @@ namespace HBLConsole.MORKS
 {
     public class Control_MORKS : IControl
     {
-        public GVL_MORKS mORKS { get; set; } = new GVL_MORKS();
+        #region 单例模式
+        private static Control_MORKS _instance;
+        public static Control_MORKS Instance
+        {
+            get
+            {
+                if (_instance == null)
+                    _instance = new Control_MORKS();
+                return _instance;
+            }
+        }
+        public Control_MORKS()
+        {
 
+        }
+        #endregion
+        public GVL_MORKS mORKS { get; set; } = new GVL_MORKS();
         public void Init()
         {
             Test();