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 | 33 ++++-----------------------------
1 files changed, 4 insertions(+), 29 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Category/SelectFloorForm.cs b/ZigbeeApp/Shared/Phone/Category/SelectFloorForm.cs
index e07f70b..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,7 @@
};
backgroundFL.AddChidren(floorLayout);
- var dicFloor = UserCenter.HdlRoomLogic.Current.GetFloorSortList();
+ var dicFloor = HdlRoomLogic.Current.GetFloorSortList();
int floorCount = dicFloor.Count;
if (floorCount > 0)
@@ -127,32 +123,11 @@
frow.Width = this.GetPictrueRealSize(449);
frow.Height = this.GetPictrueRealSize(150);
frow.Init("Floor/Floor.png", "Floor/FloorSelected.png", floorName);
- verticalScrolView.AddChidren(frow);
-
- if (string.IsNullOrEmpty(CurFloorId))
- {
- if (Config.Instance.Home.CurrentFloorId == floorId)
- {
- frow.IsSelected = true;
- }
- }
- else
- {
- if (CurFloorId == floorId)
- {
- frow.IsSelected = true;
- }
- }
+ verticalScrolView.AddChidren(frow);
+ frow.IsSelected = floorId == this.CurFloorId;
frow.ButtonClickEvent += (sender, e) =>
{
- frow.IsSelected = true;
- if (changeFloor)
- {
- Config.Instance.Home.CurrentFloorId = floorId;
- Config.Instance.Home.Save(false);
- UserCenter.HdlRoomLogic.Current.RefreshRoomListView();
- }
RemoveView();
FloorAction?.Invoke(floorId);
};
--
Gitblit v1.8.0