合并代码 ver.10086

黄学彪

2020-01-17 4b378188ce972df432b23d9cb73babb6cc0679c6

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

@@ -231,14 +231,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 +275,10 @@
                        //重新变更UI

                        foreach (var device in listDevice)

                        {

                            if (device is OTADevice)

                            {

                                continue;

                            }

                            device.IconPath = string.Empty;

                            device.ReSave();

                        }