From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期四, 17 十二月 2020 09:07:13 +0800 Subject: [PATCH] 新云端Ver1.3 --- ZigbeeApp/Shared/Phone/Category/SelectFloorForm.cs | 59 +++++++++++++---------------------------------------------- 1 files changed, 13 insertions(+), 46 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Category/SelectFloorForm.cs b/ZigbeeApp/Shared/Phone/Category/SelectFloorForm.cs index 29e69c7..7e9840f 100755 --- a/ZigbeeApp/Shared/Phone/Category/SelectFloorForm.cs +++ b/ZigbeeApp/Shared/Phone/Category/SelectFloorForm.cs @@ -4,14 +4,10 @@ namespace Shared.Phone.Category { - public class SelectFloorForm : UserCenter.FrameLayoutBase + public class SelectFloorForm : FrameLayoutBase { public Action<string> FloorAction; - /// <summary> - /// 鏄惁鍒囨崲涓哄綋鍓嶆ゼ灞� - /// </summary> - public bool changeFloor = true; /// <summary> /// 褰撳墠浼犺繃鏉ョ殑floorid /// </summary> @@ -80,7 +76,8 @@ }; backgroundFL.AddChidren(floorLayout); - var floorCount = Config.Instance.Home.FloorDics.Count; + var dicFloor = HdlRoomLogic.Current.GetFloorSortList(); + int floorCount = dicFloor.Count; if (floorCount > 0) { @@ -109,9 +106,9 @@ floorLayout.Height = this.GetPictrueRealSize(150 * floorCount); } - foreach (var floor in Config.Instance.Home.FloorDics) + foreach (var floor in dicFloor.Keys) { - AddFloor(floorLayout, floor); + AddFloor(floorLayout, floor, dicFloor[floor]); } } } @@ -120,50 +117,20 @@ /// AddFloor /// </summary> /// <param name="verticalScrolView"></param> - private void AddFloor(VerticalScrolViewLayout verticalScrolView, KeyValuePair<string, string> floor,bool isLast=false) + private void AddFloor(VerticalScrolViewLayout verticalScrolView, string floorId, string floorName) { var frow = new Device.CommonForm.LeftIconButtonRow(449, 150); frow.Width = this.GetPictrueRealSize(449); frow.Height = this.GetPictrueRealSize(150); - frow.Tag = floor.Key; - frow.Init("Floor/Floor.png", "Floor/FloorSelected.png", floor.Value); - verticalScrolView.AddChidren(frow); + frow.Init("Floor/Floor.png", "Floor/FloorSelected.png", floorName); + verticalScrolView.AddChidren(frow); + frow.IsSelected = floorId == this.CurFloorId; - if (string.IsNullOrEmpty(CurFloorId)) + frow.ButtonClickEvent += (sender, e) => { - if (Config.Instance.Home.CurrentFloorId == floor.Key) - { - frow.IsSelected = true; - } - } - else - { - if (CurFloorId == floor.Key) - { - frow.IsSelected = true; - } - } - - frow.ButtonClickEvent += SelectFloor_MouseUpEvent; - } - - /// <summary> - /// SelectFloor_MouseUpEvent - /// </summary> - /// <param name="sender"></param> - /// <param name="mouseEventArgs"></param> - private void SelectFloor_MouseUpEvent(object sender, MouseEventArgs mouseEventArgs) - { - (sender as Device.CommonForm.LeftIconButtonRow).IsSelected = true; - if (changeFloor) - { - Config.Instance.Home.CurrentFloorId = (sender as Device.CommonForm.LeftIconButtonRow).Tag.ToString(); - Config.Instance.Home.Save(false); - UserCenter.HdlRoomLogic.Current.RefreshRoomListView(); - } - RemoveView(); - FloorAction?.Invoke((sender as Device.CommonForm.LeftIconButtonRow).Tag.ToString()); - + RemoveView(); + FloorAction?.Invoke(floorId); + }; } /// <summary> -- Gitblit v1.8.0