新云端Ver1.3

黄学彪

2020-12-17 9f326f4000847e6167d8166fa2f6a66f53cb3734

 ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs

@@ -173,7 +173,7 @@
            var btnGoBack = new BottomClickButton(688);

            btnGoBack.Y = Application.GetRealHeight(1495);

            btnGoBack.TextID = R.MyInternationalizationString.uGobackGatewayManage;

            if (UserCenterResourse.DicActionForm.ContainsKey("GatewayListForm") == false)

            if (HdlFormLogic.Current.IsFormOpen("GatewayListForm") == false)

            {

                //返回主页

                btnGoBack.TextID = R.MyInternationalizationString.uGobackToHomePage;

@@ -183,7 +183,7 @@
            {

                this.CloseForm();

                //关闭指定界面

                this.CloseFormByFormName("NewGateWayMenuSelectForm");

                HdlFormLogic.Current.CloseFormByFormName("NewGateWayMenuSelectForm");

            };

        }



@@ -249,7 +249,7 @@
                    if (timeCount == 10)

                    {

                        //5秒后清空网关列表

                        HdlGatewayLogic.Current.ClearAllRealGateway();

                        HdlGatewayLogic.Current.ClearAllRealGatewayConection(true);

                        ZigBee.Common.Application.IsSearchingGateway = true;

                    }

                    if (timeCount % 2 == 0)

@@ -262,7 +262,7 @@
                        break;

                    }



                    Application.RunOnMainThread(() =>

                    HdlThreadLogic.Current.RunMain(() =>

                    {

                        btnRound.X = listPoint[index];

                        index++;

@@ -272,14 +272,15 @@
                        }

                        //正在搜索网关…XXs

                        btnMsg.Text = strMsg + timeOut + "s";

                    });

                    }, ShowErrorMode.NO);



                    System.Threading.Thread.Sleep(500);

                }

                //搜索结束

                this.isGatewaySearching = false;



                if (timeOut <= 0)

                //2020.07.14追加:倒计时结束时,哪怕是已经绑定了的网关,也显示出来

                if (timeOut <= 0 && listZbGateway.Count == 0)

                {

                    HdlThreadLogic.Current.RunMain(() =>

                    {

@@ -287,14 +288,14 @@
                        this.InitFailMiddleFrame();

                    });

                }

                else if (newGatewayGetting == true)

                else if (newGatewayGetting == true || listZbGateway.Count > 0)

                {

                    HdlThreadLogic.Current.RunMain(() =>

                    {

                        if (this.Parent != null)

                        {

                            var form = new GatewayManage.GatewaySearchListForm();

                            this.AddFromAndRemoveNowForm(form, listZbGateway, dicZbGatewayDiv);

                            this.AddFormAndCloseNowForm(form, listZbGateway, dicZbGatewayDiv);

                        }

                    });

                }

@@ -311,7 +312,9 @@
        private void StartCheckGatewayThread()

        {

            this.isGatewaySearching = true;

            HdlThreadLogic.Current.RunThread(async () =>

            this.dicZbGatewayDiv = new Dictionary<string, int>();



            HdlThreadLogic.Current.RunThread(() =>

            {

                int count = 0;

                while (this.Parent != null && this.isGatewaySearching == true)

@@ -326,7 +329,7 @@
                    }

                    count = 0;



                    await this.CheckZbGatewayAndSetRow();

                    this.CheckZbGatewayAndSetRow();



                    if (this.newGatewayGetting == true)

                    {

@@ -340,7 +343,7 @@
        /// <summary>

        /// 检测搜索到的网关

        /// </summary>

        private async Task<bool> CheckZbGatewayAndSetRow()

        private bool CheckZbGatewayAndSetRow()

        {

            for (int i = 0; i < ZbGateway.GateWayList.Count; i++)

            {

@@ -351,25 +354,41 @@
                    //已经处理了

                    continue;

                }

                //2020.09.18 本地连接没有连接上,则不处理

                if (way.LocalIsConnected == false)

                {

                    string strMsg = "搜索到了网关,但是本地链接不上  ID:" + way.GwId + " IP:" + way.GwIP + " 名称:" + way.GwName;

                    HdlLogLogic.Current.WriteLog(-1, strMsg);

                    continue;

                }



                //网关绑定模式

                GatewayBindMode mode = GatewayBindMode.BindAgain;

                //如果是第一次绑定,或者是以前已经绑定过了的

                if (HdlGatewayLogic.Current.HomeIdIsEmpty(way) == true

                    || way.HomeId == Common.Config.Instance.HomeId)

                var mode = GatewayBindMode.BindAgain;

                //住宅ID为空 第一次绑定

                if (HdlGatewayLogic.Current.HomeIdIsEmpty(way) == true)

                {

                    if (way.HomeId != Common.Config.Instance.HomeId)

                    {

                        //第一次绑定,也就是网关住宅ID为空

                        mode = GatewayBindMode.First;

                    }

                    else

                    {

                        //已经绑定过了

                        mode = GatewayBindMode.Binded;

                    }

                    mode = GatewayBindMode.First;

                }

                //住宅ID不相等 需要重新绑定

                else if (way.HomeId != Common.Config.Instance.HomeId)

                {

                    mode = GatewayBindMode.BindAgain;

                }

                //如果本地不存在的话,当做第一次绑定处理

                else if (HdlGatewayLogic.Current.IsGatewayExist(way) == false)

                {

                    mode = GatewayBindMode.First;

                }

                //住宅ID一样,则是已经绑定过了

                else

                {

                    mode = GatewayBindMode.Binded;

                }

                //这两种情况都是需要重新添加(已经绑定过了的,有可能住宅ID没写进去,它有可能是人为的清空住宅ID)

                if (mode == GatewayBindMode.First || mode == GatewayBindMode.Binded)

                {

                    //添加搜索到的网关到缓存(执行网关保存操作)

                    var result = await HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO);

                    var result = HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO, WriteLogMode.YES);

                    if (result == false)

                    {

                        continue;

@@ -402,7 +421,12 @@
                if (mode == GatewayBindMode.First || mode == GatewayBindMode.Binded)

                {

                    //我觉得这里需要获取一下新网关的设备列表

                    Common.LocalDevice.Current.SetDeviceToMemmoryByGateway(way);

                    HdlDeviceCommonLogic.Current.SetDeviceToMemmoryByGateway(way.GwId, true);

                    if (way.IsMainGateWay == true)

                    {

                        //如果它是主网关,则刷新场景列表

                        HdlSceneLogic.Current.RefreshSceneUIList(true);

                    }

                }

            }

            return true;