???????

黄学彪

2020-05-11 2e7e5f9af5b32cfe1fc3c6ba40bf7eb984bbd0a4

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

@@ -901,9 +901,15 @@
        /// </summary>

        private void AddAirSwitchFunctionTypeRow()

        {

            if (this.deviceEnumInfo.BeloneType != DeviceBeloneType.A智能空开)

            //2020.04.28变更:有个别设备它除了继电器回路，什么都没有了,

            //这个时候也要现实出来

            if (this.listNewDevice.Count != 1)

            {

                //不是空气开关

                return;

            }

            if (this.listNewDevice[0].Type != DeviceType.OnOffOutput

                && this.listNewDevice[0].Type != DeviceType.AirSwitch)

            {

                return;

            }

            //自定义功能类型控件

@@ -1202,6 +1208,12 @@
            //移除获取设备硬件信息的监听线程

            HdlDeviceHardInfoLogic.Current.RemoveDeviceHardInfoThread(listNewDevice[0]);



            //设备新入网

            if (UserCenterResourse.DicActionForm.ContainsKey("AddDeviceTypeListForm") == true)

            {

                this.LoadFormMethodByName("DeviceListMainForm", "RefreshDeviceRow", new object[] { listNewDevice[0].DeviceAddr });

            }



            base.CloseFormBefore();

        }