~wjc/HomeApp.git

			@@ -22,6 +22,10 @@
			/// 新发现的网关通知
			/// </summary>
			public static Action<ZigBee.Device.ZbGateway> NewGateWayAction;
			/// <summary>
			/// 上一次的住宅ID
			/// </summary>
			private static string oldHomeID = string.Empty;

			public static void Init()
			{
			@@ -35,7 +39,6 @@
			{
			var gateWayList = new List<ZbGateway> { };
			var searchCount = 6;
			var oldHomeID = string.Empty;
			var broadBytes = new byte[44];// byteHomeId[0] ,//H
			broadBytes[0] = 0xfe;
			broadBytes[1] = 0x29;
			@@ -50,7 +53,9 @@
			try
			{
			if (string.IsNullOrEmpty(Shared.Common.Config.Instance.HomeId))
			{
			{
			//住宅ID为空只有一种可能就是退出了登录，这里的上一次住宅ID要清空
			oldHomeID = "?";
			System.Threading.Thread.Sleep(1000);
			continue;
			}
			@@ -65,7 +70,7 @@
			//最后再断开mqtt连接
			for (int i = 0; i < list.Count; i++)
			{
			list[i].DisConnect("1");
			list[i].DisConnectLocalMqttClient("1");
			}
			list.Clear();
			oldHomeID = Shared.Common.Config.Instance.HomeId;
			@@ -111,6 +116,10 @@
			else
			{
			ZbGateway.IsRemote = true;
			for (int i = 0; i < ZbGateway.GateWayList.Count; i++)
			{
			ZbGateway.GateWayList[i].DisConnectLocalMqttClient("1");
			}
			}

			searchCount--;
			@@ -136,7 +145,11 @@
			FindGateWaySocket.BeginSend(new System.Net.IPEndPoint(broadcastIpAddress, 7624), broadBytes);
			}
			}
			catch { }
			catch
			{
			//关闭Socket,下次发送会自动连接
			FindGateWaySocket.Stop();
			}
			System.Threading.Thread.Sleep(500);
			}
			})
			@@ -198,18 +211,18 @@
			{
			gateWayList.Add(zbGateWay);
			}
			//网关中到住宅ID为空此时也通讯
			else if (homeID == string.Empty)
			{
			gateWayList.Add(zbGateWay);
			}
			//网关中到住宅ID为空此时也通讯 2020.01.14变更：没这个必要,上面那个变量就能处理
			//else if (homeID == string.Empty)
			//{
			// gateWayList.Add(zbGateWay);
			//}
			}
			//网关列表存储处理
			var gateWay = ZbGateway.GateWayList.Find(obj => obj.getGatewayBaseInfo != null && obj.getGatewayBaseInfo.gwID == zbGateWay.getGatewayBaseInfo.gwID);
			if (gateWay == null)
			{
			await zbGateWay.StartLocalMqtt(ipAddress);
			ZbGateway.GateWayList.Add(zbGateWay);
			await zbGateWay.StartLocalMqtt(ipAddress);
			NewGateWayAction?.Invoke(zbGateWay);
			}
			else
			@@ -219,11 +232,11 @@
			gateWay.GatewayOnlineFlage = true;
			if (gateWay.getGatewayBaseInfo.IpAddress != ipAddress)
			{
			gateWay.DisConnect("2");
			await gateWay.DisConnectLocalMqttClient("2");
			ZbGateway.GateWayList.Remove(gateWay);
			gateWay = zbGateWay;
			await zbGateWay.StartLocalMqtt(ipAddress);
			ZbGateway.GateWayList.Add(gateWay);
			await zbGateWay.StartLocalMqtt(ipAddress);
			}
			else
			{
			@@ -249,10 +262,30 @@
			//标记当前网关是主网关
			gateWay.getGatewayBaseInfo.IsMainGateWay = true;
			}
			}

			//测试能否广播得到网关,通常情况下不检测
			if (Shared.Phone.UserCenter.UserCenterResourse.HideOption.CheckCanReceiveGateway == 1)
			{
			if (Shared.Phone.UserCenter.UserCenterResourse.DicReceiveGatewayTest.ContainsKey(id) == false)
			{
			if (gateWay == null)
			{
			Shared.Phone.UserCenter.UserCenterResourse.DicReceiveGatewayTest[id] = zbGateWay;
			}
			else
			{
			Shared.Phone.UserCenter.UserCenterResourse.DicReceiveGatewayTest[id] = gateWay;
			}
			}
			}
			}
			}
			catch { }
			catch
			{
			//关闭Socket,下次发送会自动连接
			FindGateWaySocket.Stop();
			}
			}
			#endregion
			}
			@@ -270,13 +303,13 @@
			try
			{
			//定时检测远程连接情况
			await ZbGateway.StartCloudMqtt();
			await ZbGateway.StartRemoteMqtt();
			if (!ZbGateway.IsRemote)
			{
			System.Threading.Thread.Sleep(500);
			continue;
			}
			var gateWayList =ZbGateway.GateWayList.FindAll(obj => obj.getGatewayBaseInfo.HomeId == Shared.Common.Config.Instance.HomeId);
			var gateWayList = ZbGateway.GateWayList.FindAll(obj => obj.getGatewayBaseInfo.HomeId == Shared.Common.Config.Instance.HomeId);

			if (gateWayList.Count == 1)
			{
			@@ -320,6 +353,14 @@
			{ IsBackground = true }.Start();
			}

			/// <summary>
			/// 重新搜索,注意：调用该方法,则促使全部网关的mqtt全部断开,然后重新搜索(可能会有1秒延迟)
			/// </summary>
			public static void ReSearch()
			{
			//为了那么多少万分之一的几率,这里设置成别的另一类的值
			oldHomeID = "**";
			}

			/// <summary>
			/// 接收处理UDP数据包