From 4b378188ce972df432b23d9cb73babb6cc0679c6 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期五, 17 一月 2020 14:56:15 +0800 Subject: [PATCH] 合并代码 ver.10086 --- ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs | 28 +++++++++++----------------- 1 files changed, 11 insertions(+), 17 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs index 5fc61e9..c6e916c 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs @@ -55,30 +55,24 @@ this.ClearBodyFrame(); //鎴块棿鍥剧墖 - var framePic = new FrameLayout(); - framePic.Y = Application.GetRealHeight(60); - framePic.Width = Application.GetMinRealAverage(887); - framePic.Height = Application.GetMinRealAverage(444); - framePic.Gravity = Gravity.CenterHorizontal; - framePic.Radius = (uint)Application.GetRealHeight(17); - framePic.BackgroundColor = UserCenterColor.Current.BodyFrameLayout; - bodyFrameLayout.AddChidren(framePic); var btnPic = new ImageView(); + btnPic.Y = Application.GetRealHeight(60); + btnPic.Width = Application.GetMinRealAverage(887); + btnPic.Height = Application.GetMinRealAverage(444); btnPic.Radius = (uint)Application.GetRealHeight(17); + btnPic.Gravity = Gravity.CenterHorizontal; btnPic.ImagePath = "RoomIcon/0.JPG"; - framePic.AddChidren(btnPic); - //鍦ㄤ笂闈㈡斁涓�灞傞槾褰� - var btnPicBack = new FrameLayout(); - btnPicBack.Radius = (uint)Application.GetRealHeight(17); - btnPicBack.BackgroundColor = 0x26000000; - framePic.AddChidren(btnPicBack); - btnPicBack.MouseUpEventHandler += (sender, e) => + bodyFrameLayout.AddChidren(btnPic); + var btnShadow = new PicViewControl(916, 487); + btnShadow.Y = btnPic.Y; + btnShadow.Gravity = Gravity.CenterHorizontal; + btnShadow.UnSelectedImagePath = "Room/RoomShadow.png"; + bodyFrameLayout.AddChidren(btnShadow); + btnShadow.MouseUpEventHandler += (sender, e) => { //鎴块棿鍥剧墖閫夋嫨 this.RoomPictrueSelect(btnPic); }; - //娣诲姞闃村奖鐗规晥 - framePic.SetViewShadow(true); this.newRoom = new Common.Room(); newRoom.FloorId = this.floorKeys; -- Gitblit v1.8.0