合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/DeviceControls/DeviceObjectControl.cs

@@ -76,7 +76,7 @@
            var listDevice = Common.LocalDevice.Current.GetDevicesByMac(this.deviceMac);

            //图标

            btnIcon = frameTable.AddLeftIcon(81);

            Common.LocalDevice.Current.SetDeviceBeloneIconToControl(btnIcon, listDevice);

            Common.LocalDevice.Current.SetDeviceObjectIconToControl(btnIcon, listDevice);



            //设备

            string deviceName = Common.LocalDevice.Current.GetDeviceMacName(listDevice[0]);

@@ -128,7 +128,7 @@


            var listDevice = Common.LocalDevice.Current.GetDevicesByMac(this.deviceMac);

            //图标

            Common.LocalDevice.Current.SetDeviceBeloneIconToControl(btnIcon, listDevice);

            Common.LocalDevice.Current.SetDeviceObjectIconToControl(btnIcon, listDevice);

            //设备

            btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceMacName(listDevice[0]);

            //设备房间