代码合并

黄学彪

2019-12-20 23fb45dd846ed8b62304c408c6bbe64265d4ac8b

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

@@ -80,21 +80,12 @@


            //设备

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