合并代码

黄学彪

2020-01-06 72be4f06a683de33ddd563c8447c39f7f17e5b7d

 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]);

            //设备房间