From c74c4b28078927585ce0224d6fa0fe969ddfe9ea Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 22 七月 2022 17:44:39 +0800
Subject: [PATCH] 2022年07月22日17:44:37
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs | 4 ++--
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 28 ++++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 63fd88a..8fff50b 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -230,7 +230,25 @@
//姣背娉紶鎰熷櫒(鑷爺鍖楅偖)
case SPK.SenesorMegahealth:
{
+ int intValue =0;
+ if (edit)
+ {
+ Input inputs = Logic.currlogic.input[index];
+ var dicList = inputs.condition;
+ foreach (var dic in dicList)
+ {
+ if (dic["key"] == "target_status")
+ {
+ intValue = 1;
+ }
+ else
+ {
+ intValue = 2;
+ }
+ break;
+ }
+ }
LogicView.FunTypeView view1= new LogicView.FunTypeView();
view1.btnText.TextID = StringId.diedaobaojing;
view1.btnState.Name = Language.StringByID(StringId.diedaobaojing);
@@ -245,6 +263,16 @@
view2.btnText.TextID = StringId.yourenbaojing;
view2.btnState.Name = Language.StringByID(StringId.yourenbaojing);
fLayout.AddChidren(view2.FLayoutView());
+
+ if (intValue==1) {
+ view2.frameLayout.Visible = false;
+
+ }
+ if (intValue == 2)
+ {
+ view2.frameLayout.Y = Application.GetRealHeight(0);
+ }
+
view2.btnClick.MouseUpEventHandler += (sender, e) =>
{
DeviceView(device, view2.btnState, StringId.youren, StringId.wuren, 2);
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index c0f23e1..2c645ad 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -183,8 +183,8 @@
public List<HDL_ON.Entity.Function> GetGatewayDeviceList()
{
var list = Entity.FunctionList.List.GetDeviceFunctionList();
- return GetTestDevice(list, true);
- //return list;
+ //return GetTestDevice(list, true);
+ return list;
}
/// <summary>
/// 鑾峰彇鍦烘櫙鍒楄〃
--
Gitblit v1.8.0