From f5b46f80546aac860ade6e4c53821e43df833b39 Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期三, 09 六月 2021 11:11:28 +0800
Subject: [PATCH] Revert "Merge remote-tracking branch 'origin/wxr4' into dev-tzy"
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 44 +++++---------------------------------------
1 files changed, 5 insertions(+), 39 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 5e24b64..47f2d15 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -175,21 +175,6 @@
}
}
break;
- case SPK.SenesorMegahealth:
- {
- LogicView.FunTypeView view = new LogicView.FunTypeView();
- view.btnText.TextID = StringId.mubiaozhuangtai ;//鐩爣鐘舵��
- fLayout.AddChidren(view.FLayoutView());
- view.btnClick.MouseUpEventHandler += (sender, e) =>
- {
- DeviceView(device, view.btnState, StringId.wuren, StringId.diedao);
- };
- if (edit)
- {
- GetEditState(device, index, view.btnState, null, null, null);
- }
- }
- break;
}
#region 淇濆瓨
@@ -283,11 +268,6 @@
keyVlaue = "status";
}
break;
- case SPK.SenesorMegahealth:
- {
- keyVlaue = "action_state";
- }
- break;
}
switch (intValue)
@@ -314,21 +294,12 @@
value = "off";
}
break;
- case StringId.youren:
- {
+ case StringId.youren: {
value = "true";
}
break;
- case StringId.wuren:
- {
- if (device.spk == SPK.SenesorMegahealth)
- {
- value = "uninhabited";
- }
- else
- {
- value = "false";
- }
+ case StringId.wuren: {
+ value = "false";
}
break;
case StringId.kaiqi:
@@ -341,19 +312,14 @@
value = "close";
}
break;
- case StringId.zaixian:
- {
+ case StringId.zaixian: {
keyVlaue = "dismantle";
value = "true";
- }; break;
+ };break;
case StringId.buzaixian:
{
keyVlaue = "dismantle";
value = "false";
- }; break;
- case StringId.diedao:
- {
- value = "fall";
}; break;
}
//鏄剧ず鏂囨湰
--
Gitblit v1.8.0