合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

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

@@ -312,6 +312,8 @@
        private void StartCheckGatewayThread()

        {

            this.isGatewaySearching = true;

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



            HdlThreadLogic.Current.RunThread(() =>

            {

                int count = 0;

@@ -352,6 +354,13 @@
                    //已经处理了

                    continue;

                }

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

                if (way.localIsConnected == false)

                {

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

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

                    continue;

                }



                //网关绑定模式

                var mode = GatewayBindMode.BindAgain;

@@ -379,7 +388,7 @@
                if (mode == GatewayBindMode.First || mode == GatewayBindMode.Binded)

                {

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

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

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

                    if (result == false)

                    {

                        continue;

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

                {

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

                    Common.LocalDevice.Current.SetDeviceToMemmoryByGateway(way, true);

                    Common.LocalDevice.Current.SetDeviceToMemmoryByGateway(way.GwId, true);

                    if (way.IsMainGateWay == true)

                    {

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