From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/Category/SelectFloorForm.cs | 29 ++---------------------------
1 files changed, 2 insertions(+), 27 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Category/SelectFloorForm.cs b/ZigbeeApp/Shared/Phone/Category/SelectFloorForm.cs
index e07f70b..f72f1cb 100755
--- a/ZigbeeApp/Shared/Phone/Category/SelectFloorForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/SelectFloorForm.cs
@@ -9,10 +9,6 @@
public Action<string> FloorAction;
/// <summary>
- /// 鏄惁鍒囨崲涓哄綋鍓嶆ゼ灞�
- /// </summary>
- public bool changeFloor = true;
- /// <summary>
/// 褰撳墠浼犺繃鏉ョ殑floorid
/// </summary>
public string CurFloorId = string.Empty;
@@ -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