From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SwitchView.cs | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SwitchView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SwitchView.cs
index 46020f5..0b9a0d1 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SwitchView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SwitchView.cs
@@ -171,7 +171,7 @@
///<param name="stateVuale">涔嬪墠鐨勭姸鎬佸��</param>
/// <param name="action">杩斿洖鍥炶皟</param>
/// <returns></returns>
- public void FLayoutView(FrameLayout frame, int text1, int text2, string stateVuale, Action<int> action)
+ public void FLayoutView(FrameLayout frame, int text1, int text2, string stateVuale, Action<int> action,bool tag=true)
{
int i = 2;
frameLayout.Y = Application.GetRealHeight(603 - (44 * i));
@@ -207,13 +207,19 @@
btnOn.MouseUpEventHandler += (sender2, e2) =>
{
action(btnOn.TextID);
- frame.RemoveFromParent();
+ if (tag)
+ {
+ frame.RemoveFromParent();
+ }
};
//鐐瑰嚮浜嬩欢
btnOff.MouseUpEventHandler += (sender3, e3) =>
{
action(btnOff.TextID);
- frame.RemoveFromParent();
+ if (tag)
+ {
+ frame.RemoveFromParent();
+ }
};
--
Gitblit v1.8.0