Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

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

@@ -76,26 +76,16 @@
            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]);

            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;

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

            frameTable.AddChidren(btnDeviceRoom, ChidrenBindMode.BindEventOnly);

            btnDeviceRoom = frameTable.AddBottomView(roomName, 800);



            //底线

            frameTable.AddBottomLine();

@@ -138,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]);

            //设备房间