From bfb2a71ac711741e11c015f7150ea3c58eb6abd0 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 15:11:24 +0800
Subject: [PATCH] 2019.1.2
---
ZigbeeApp/Shared/Phone/Device/CommonForm/SelectZone.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectZone.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/SelectZone.cs
index 2779996..5d73019 100644
--- 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));
}
@@ -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