2020-03-12-1

WJC

2020-03-12 c47c3ec2488961b3a006aaebcb03dba582f8b19b

 ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs

@@ -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;
@@ -51,6 +54,8 @@
                    {
                        if (string.IsNullOrEmpty(Shared.Common.Config.Instance.HomeId))
                        {
                            //住宅ID为空只有一种可能就是退出了登录，这里的上一次住宅ID要清空

                            oldHomeID = "?";
                            System.Threading.Thread.Sleep(1000);
                            continue;
                        }
@@ -202,11 +207,11 @@
                                        {

                                            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);
@@ -252,6 +257,22 @@
                                            }
                                            //标记当前网关是主网关
                                            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;

                                            }

                                        }
                                    }
                                }
@@ -324,6 +345,14 @@
            { IsBackground = true }.Start();
        }

        /// <summary>

        /// 重新搜索,注意：调用该方法,则促使全部网关的mqtt全部断开,然后重新搜索(可能会有1秒延迟)

        /// </summary>
        public static void ReSearch()

        {

            //为了那么多少万分之一的几率,这里设置成别的另一类的值

            oldHomeID = "**";

        }

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