Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient

BPASmartClient.Business/MainConsole.cs

@@ -22,8 +22,7 @@ namespace BPASmartClient.Business
             InternetInfo.InitConfig();
             //业务插件初始化
             Plugin.GetInstance().Init();
-            //主题初始化
-            TopicDefine.GetInstance().Initialize(Plugin.GetInstance().GetPlugin<DeviceMgr>().GetDevices());
+           
             //设备开启
             Plugin.GetInstance().GetPlugin<DeviceMgr>().StartService();
 

BPASmartClient.Business/Plugin/ConfigMgr.cs

@@ -95,6 +95,10 @@ namespace BPASmartClient.Business
             MQTT_Config = mqttBroker.Value.FromJSON<MQTT_Entity>();
         }
 
+        public void Start()
+        {
+        }
+
         public class MQTT_Entity
         {
             public string Host { get; set; }

BPASmartClient.Business/Plugin/DeviceMgr.cs

@@ -29,6 +29,10 @@ namespace BPASmartClient.Business
         }
 
         public void Initialize()
+        {
+        }
+
+        public void Start()
         {
             LoadDevice();
         }
@@ -126,5 +130,7 @@ namespace BPASmartClient.Business
         {
             this.devices.ForEach(device => device.Stop());
         }
+
+      
     }
 }

BPASmartClient.Business/Plugin/IPlugin.cs

@@ -12,5 +12,6 @@ namespace BPASmartClient.Business
     public interface IPlugin:IDisposable
     {
         void Initialize();
+        void Start();
     }
 }

BPASmartClient.Business/Plugin/MQTTMgr.cs

@@ -32,8 +32,15 @@ namespace BPASmartClient.Business
         //消息处理者
         private List<RecivedHandle> messageRecives = new List<RecivedHandle>();
         public void Initialize()
+        {
+            
+        }
+
+        public void Start()
         {
             running = true;
+            //主题初始化
+            TopicDefine.GetInstance().Initialize(Plugin.GetInstance().GetPlugin<DeviceMgr>().GetDevices());
             //MQTT 连接成功
             mqttProxy.Connected = new Action(() =>
             {
@@ -66,7 +73,8 @@ namespace BPASmartClient.Business
                         {
                             if (package.Message != null)
                             {
-                                for (int i = messageRecives.Count - 1; i >= 0; i--) {
+                                for (int i = messageRecives.Count - 1; i >= 0; i--)
+                                {
                                     messageRecives[i]?.Invoke(package.Message);
                                 }
                             }
@@ -104,6 +112,6 @@ namespace BPASmartClient.Business
             messageRecives.Clear();
         }
 
-       
+        
     }
 }

BPASmartClient.Business/Plugin/OrderProxy.cs

@@ -31,9 +31,12 @@ namespace BPASmartClient.Business
         /// </summary>
         public void Initialize()
         {
-            running = true;
             deviceMgr = Plugin.GetInstance().GetPlugin<DeviceMgr>();
+        }
 
+        public void Start()
+        {
+            running = true;
             Plugin.GetInstance().GetPlugin<MQTTMgr>().SetMessageReciveHandler(delegate (IMessage orderInfo)
             {
                 if (orderInfo == null) return;
@@ -49,8 +52,6 @@ namespace BPASmartClient.Business
             });
 
             EventBus.EventBus.GetInstance().Subscribe<OrderStatusChangedEvent>(0, OrderStatusChangedHandle);
-
-
         }
 
         private void StartTargetDeviceOrderJob(int deviceId)
@@ -111,5 +112,7 @@ namespace BPASmartClient.Business
         {
             running = false;
         }
+
+        
     }
 }

BPASmartClient.Business/Plugin/Plugin.cs

@@ -26,7 +26,10 @@ namespace BPASmartClient.Business
                 }
             });
 
-            plugins.ForEach(p => p.Initialize());
+            plugins.ForEach(p => {
+                p.Initialize();
+                p.Start();
+            });
         }
 
         public T GetPlugin<T>() where T : IPlugin

BPASmartClient.Business/Plugin/StatusMgr.cs

@@ -28,6 +28,10 @@ namespace BPASmartClient.Business
         {
             deviceMgr = Plugin.GetInstance().GetPlugin<DeviceMgr>();
             mqttMgr = Plugin.GetInstance().GetPlugin<MQTTMgr>();
+        }
+
+        public void Start()
+        {
             running = true;
             ThreadManage.GetInstance().Start(() =>
             {
@@ -53,7 +57,7 @@ namespace BPASmartClient.Business
                     {
                         wholeDeviceStatus[device.DeviceId] = device.Status.GetStatus();
                         deviceStatus.Healthy = device.IsHealth ? BPA.Message.Enum.DeviceHealthy.Health : BPA.Message.Enum.DeviceHealthy.UnHealth;
-                        var msg=BPAPackage.Make(deviceStatus, device.DeviceId, device.DeviceType);
+                        var msg = BPAPackage.Make(deviceStatus, device.DeviceId, device.DeviceType);
                         mqttMgr.Publish(TopicDefine.GetInstance().PushHeartbeatTopics[device.DeviceType], msg.Serialize());
                     }
                     Thread.Sleep(1000);
@@ -65,5 +69,7 @@ namespace BPASmartClient.Business
         {
             running = false;
         }
+
+        
     }
 }