From 72be4f06a683de33ddd563c8447c39f7f17e5b7d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 06 一月 2020 13:03:50 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/Device/CommonForm/SelectZone.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectZone.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectZone.cs
index 2779996..c36e818 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectZone.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectZone.cs
@@ -4,7 +4,7 @@
namespace Shared.Phone.Device.CommonForm
{
- public class SelectZone : FrameLayout
+ public class SelectZone
{
public Action<Common.Room> ZoneAction;
@@ -49,7 +49,7 @@
{
curRoom = rooms[index1][index2];
ZoneAction?.Invoke(curRoom);
- RemoveFromParent();
+ //RemoveFromParent();
}, 0, 0, Language.StringByID(R.MyInternationalizationString.BelongFloor),
Language.StringByID(R.MyInternationalizationString.Confrim),
Language.StringByID(R.MyInternationalizationString.Cancel));
@@ -70,8 +70,8 @@
{
curRoom = rs[index1];
ZoneAction?.Invoke(curRoom);
- RemoveFromParent();
- }, 0, Language.StringByID(R.MyInternationalizationString.BelongFloor),
+ //RemoveFromParent();
+ }, 0, Language.StringByID(R.MyInternationalizationString.AddTo),
Language.StringByID(R.MyInternationalizationString.Confrim),
Language.StringByID(R.MyInternationalizationString.Cancel));
}
@@ -89,7 +89,7 @@
roomList.Add(room.Name);
roomIdList.Add(room.Id);
}
-
+
}
/// <summary>
@@ -99,7 +99,7 @@
/// <param name="mouseEventArgs"></param>
private void Close(object sender, MouseEventArgs mouseEventArgs)
{
- RemoveFromParent();
+ //RemoveFromParent();
}
/// <summary>
@@ -109,8 +109,8 @@
/// <param name="mouseEventArgs"></param>
private void Confrim_MouseEvent(object sender, MouseEventArgs mouseEventArgs)
{
- ZoneAction?.Invoke(curRoom);
- RemoveFromParent();
+ //ZoneAction?.Invoke(curRoom);
+ //RemoveFromParent();
}
}
}
--
Gitblit v1.8.0