先上传个版本吧

黄学彪

2020-02-21 bd46c57c77c276014db3192a4e2cc96e23c93202

 ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceSearchForm.cs

@@ -190,8 +190,6 @@
                this.StartTopicTimeOutThread();

                return;

            }

            //中断主题超时线程

            this.topTimeOut = -100;



            lock (this.dicNewDevice)

            {

@@ -231,14 +229,11 @@
                //获取设备的固定属性

                HdlDeviceFixedAttributeLogic.Current.SetAllFixedAttributeToDevice(device);



                if ((device is OTADevice) == false)

                {

                    //不需要200端点的那个设备

                    this.dicNewDevice[device.DeviceAddr].Add(device);

                //不需要200端点的那个设备  2020.01.13 变更:ota也加进来

                this.dicNewDevice[device.DeviceAddr].Add(device);



                    //有新设备，开启显示设备信息界面的线程(里面会等待三秒这样)

                    this.StartShowDeviceAddSuccessFormThread();

                }

                //有新设备，开启显示设备信息界面的线程(里面会等待三秒这样)

                this.StartShowDeviceAddSuccessFormThread();

            }

        }



@@ -278,6 +273,10 @@
                        //重新变更UI

                        foreach (var device in listDevice)

                        {

                            if (device is OTADevice)

                            {

                                continue;

                            }

                            device.IconPath = string.Empty;

                            device.ReSave();

                        }

@@ -456,6 +455,7 @@
            }

            else if (topic == gatewayId + "/DeviceInComingRespon")

            {

                this.topTimeOut = topMaxTime;

                //网关最终上报节点设备信息

                this.SetDeviceProgressValue(6);

                return 1;

@@ -506,7 +506,7 @@
                    System.Threading.Thread.Sleep(1000);

                    this.topTimeOut--;

                }

                if (this.topTimeOut < 0 && this.topTimeOut >= -10)

                if (this.topTimeOut < 0)

                {

                    //响应超时,请重新入网

                    this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uResponseTimeoutsAndReAccessNetwork));