From c7df85937f73fb347ee0b19e9c052d2d00a6df6c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 九月 2020 13:58:19 +0800
Subject: [PATCH] 新版本

---
 ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
index b3f93e1..ca6fd17 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
@@ -206,6 +206,11 @@
                                 {
                                     listReceiveIP.Add(ipAddress);
                                 }
+                                //2020.08.07杩藉姞:鍗充娇绌虹殑浣忓畢id涔熷缓绔嬮摼鎺�,瀵瑰簲鎵嬪姩鎭㈠缃戝叧鍑哄巶璁剧疆鏃�,鍥犱负娌℃湁瑙g粦,浣嗘槸浣忓畢id涓虹┖鐨勯棶棰�
+                                else if (Shared.Phone.UserCenter.HdlGatewayLogic.Current.HomeIdIsEmpty(homeID) == true)
+                                {
+                                    listReceiveIP.Add(ipAddress);
+                                }
                             }
                             //缃戝叧鍒楄〃瀛樺偍澶勭悊
                             var gateWay = ZbGateway.GateWayList.Find(obj => obj.GwId == zbGateWay.GwId);
@@ -359,7 +364,7 @@
                 //鏈�鍚庡啀鏂紑mqtt杩炴帴
                 for (int i = 0; i < list.Count; i++)
                 {
-                    list[i].DisConnectLocalMqttClient("1");
+                    list[i]?.DisConnectLocalMqttClient("1");
                 }
                 list.Clear();
                 oldHomeID = Shared.Common.Config.Instance.HomeId;

--
Gitblit v1.8.0