From fa6bcb2e9907772480f99205f36ec2a1ce735a22 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 09 一月 2020 14:11:07 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/Device/CommonForm/SelectZone.cs | 62 ++++--------------------------
1 files changed, 9 insertions(+), 53 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectZone.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectZone.cs
index c36e818..6f5a522 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,10 +30,11 @@
{
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)
{
+ floorIds.Add(floor.Key);
+ floorNames.Add(floor.Value);
+
roomNames.Add(Common.Room.CurrentRoom.GetRoomNamesByFloorId(floor.Key));
rooms.Add(Common.Room.CurrentRoom.GetRoomsByFloorId(floor.Key));
}
@@ -49,8 +43,7 @@
{
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));
}
@@ -70,47 +63,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