请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

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

@@ -74,27 +74,23 @@
        public void InitControl()

        {

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

            if (listDevice.Count == 0)

            {

                //针对单纯只有一个200端点的设备

                listDevice.Add(Common.LocalDevice.Current.GetOTADevice(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]);

            btnDeviceName = frameTable.AddLeftCaption(deviceName, 800, 60, true);

            btnDeviceName.TextSize = 15;

            //这个坐标有点特殊

            btnDeviceName.Y = Application.GetRealHeight(12) + this.chidrenYaxis;

            btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceObjectText(listDevice);

            btnDeviceName = frameTable.AddTopView(deviceName, 800);

            frameTable.AddChidren(btnDeviceName, ChidrenBindMode.BindEventOnly);



            //房间

            string roomName = Common.LocalDevice.Current.GeteRealDeviceRoomName(listDevice[0]);

            btnDeviceRoom = frameTable.AddLeftCaption(roomName, 800, 49, true);

            //这个坐标有点特殊

            btnDeviceRoom.Y = Application.GetRealHeight(72) + this.chidrenYaxis;

            btnDeviceRoom.TextSize = 12;

            btnDeviceRoom.TextColor = UserCenterColor.Current.TextGrayColor1;

            frameTable.AddChidren(btnDeviceRoom, ChidrenBindMode.BindEventOnly);

            btnDeviceRoom = frameTable.AddBottomView(roomName, 800);



            //底线

            frameTable.AddBottomLine();

@@ -136,8 +132,13 @@
            hadRefresh = true;



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

            if (listDevice.Count == 0)

            {

                //针对单纯只有一个200端点的设备

                listDevice.Add(Common.LocalDevice.Current.GetOTADevice(this.deviceMac));

            }

            //图标

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

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

            //设备

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

            //设备房间