合并代码 ver.10086

黄学彪

2020-01-17 4b378188ce972df432b23d9cb73babb6cc0679c6

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/SceneControls/SceneSimpleSelectControl.cs

@@ -87,20 +87,11 @@
            btnIcon.UnSelectedImagePath = "Scene/SceneIcon.png";



            //场景

            var btnScene = this.AddLeftCaption(SceneTemp.Name, 850, 60);

            btnScene.TextSize = 15;

            //这个坐标有点特殊

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

            this.AddChidren(btnScene, ChidrenBindMode.BindEventOnly);

            this.AddTopView(SceneTemp.Name, 850);



            //房间

            string roomName = Common.Room.CurrentRoom.GetRoomNameBySceneId(SceneId);

            var btnRoom = this.AddLeftCaption(roomName, 850, 50, true);

            //这个坐标有点特殊

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

            btnRoom.TextSize = 12;

            btnRoom.TextColor = UserCenterColor.Current.TextGrayColor1;

            this.AddChidren(btnRoom, ChidrenBindMode.BindEventOnly);

            this.AddBottomView(roomName, 850);



            btnSelect = this.AddMostRightEmptyIcon(58, 58);

            btnSelect.Visible = false;