From 9c16d3614d9b88c637f967518a329f239fcd3aaf Mon Sep 17 00:00:00 2001
From: lss <316519258@qq.com>
Date: 星期五, 12 六月 2020 09:22:04 +0800
Subject: [PATCH] 2020.06.12
---
ZigbeeApp/Shared/Phone/Device/CommonForm/SelectZone.cs | 73 +++++++-----------------------------
1 files changed, 15 insertions(+), 58 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectZone.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectZone.cs
index c36e818..f83aec4 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectZone.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectZone.cs
@@ -7,21 +7,14 @@
public class SelectZone
{
public Action<Common.Room> ZoneAction;
-
- private UIPickerView pickView;
-
- private List<string> floorList = new List<string> { };
- private List<string> roomList = new List<string> { };
- private List<string> roomIdList = new List<string> { };
/// <summary>
/// curRoom
/// </summary>
private Common.Room curRoom;
-
- public SelectZone()
- {
- }
-
+ /// <summary>
+ /// 鏍囬
+ /// </summary>
+ public string title = Language.StringByID(R.MyInternationalizationString.BelongZone);
/// <summary>
/// Init
/// </summary>
@@ -37,28 +30,29 @@
{
foreach (var floor in Config.Instance.Home.FloorDics)
{
- floorIds.Add(floor.Key);
- floorNames.Add(floor.Value);
- if (Common.Room.CurrentRoom.GetRoomsByFloorId(floor.Key).Count > 0)
+ if (UserCenter.HdlRoomLogic.Current.GetRoomsByFloorId(floor.Key).Count > 0)
{
- roomNames.Add(Common.Room.CurrentRoom.GetRoomNamesByFloorId(floor.Key));
- rooms.Add(Common.Room.CurrentRoom.GetRoomsByFloorId(floor.Key));
+ floorIds.Add(floor.Key);
+ floorNames.Add(floor.Value);
+
+ roomNames.Add(UserCenter.HdlRoomLogic.Current.GetRoomNamesByFloorId(floor.Key));
+ rooms.Add(UserCenter.HdlRoomLogic.Current.GetRoomsByFloorId(floor.Key));
}
}
PickerView.ShowSecondary(floorNames, roomNames, (index1, index2) =>
{
curRoom = rooms[index1][index2];
ZoneAction?.Invoke(curRoom);
- //RemoveFromParent();
- }, 0, 0, Language.StringByID(R.MyInternationalizationString.BelongFloor),
+ }, 0, 0, title,
Language.StringByID(R.MyInternationalizationString.Confrim),
Language.StringByID(R.MyInternationalizationString.Cancel));
}
else
{
- for (int i = 0; i < Common.Room.Lists.Count; i++)
+ var listAllRoom = UserCenter.HdlRoomLogic.Current.GetAllListRooms();
+ for (int i = 0; i < listAllRoom.Count; i++)
{
- var r = Common.Room.Lists[i];
+ var r = listAllRoom[i];
if (r.IsLove)
{
continue;
@@ -70,47 +64,10 @@
{
curRoom = rs[index1];
ZoneAction?.Invoke(curRoom);
- //RemoveFromParent();
- }, 0, Language.StringByID(R.MyInternationalizationString.AddTo),
+ }, 0, title,
Language.StringByID(R.MyInternationalizationString.Confrim),
Language.StringByID(R.MyInternationalizationString.Cancel));
}
-
- foreach (var floor in Config.Instance.Home.FloorDics)
- {
- floorList.Add(floor.Value);
- }
- foreach (var room in Shared.Common.Room.Lists)
- {
- if(room.IsLove)
- {
- continue;
- }
- roomList.Add(room.Name);
- roomIdList.Add(room.Id);
- }
-
- }
-
- /// <summary>
- /// Close
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="mouseEventArgs"></param>
- private void Close(object sender, MouseEventArgs mouseEventArgs)
- {
- //RemoveFromParent();
- }
-
- /// <summary>
- /// Confrim_MouseEvent
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="mouseEventArgs"></param>
- private void Confrim_MouseEvent(object sender, MouseEventArgs mouseEventArgs)
- {
- //ZoneAction?.Invoke(curRoom);
- //RemoveFromParent();
}
}
}
--
Gitblit v1.8.0