Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-13 99da2604f81af29afc6b3c6f4f128b4e5a8a5649

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

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

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



            //设备新入网

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

            {

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

            }



            base.CloseFormBefore();

        }