From cb1476f1197b8730038b4ef485f8f036e1d93422 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 09 六月 2021 16:49:32 +0800
Subject: [PATCH] 合并文本缺漏
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 47f2d15..5e24b64 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -175,6 +175,21 @@
}
}
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 淇濆瓨
@@ -268,6 +283,11 @@
keyVlaue = "status";
}
break;
+ case SPK.SenesorMegahealth:
+ {
+ keyVlaue = "action_state";
+ }
+ break;
}
switch (intValue)
@@ -294,12 +314,21 @@
value = "off";
}
break;
- case StringId.youren: {
+ case StringId.youren:
+ {
value = "true";
}
break;
- case StringId.wuren: {
- value = "false";
+ case StringId.wuren:
+ {
+ if (device.spk == SPK.SenesorMegahealth)
+ {
+ value = "uninhabited";
+ }
+ else
+ {
+ value = "false";
+ }
}
break;
case StringId.kaiqi:
@@ -312,15 +341,20 @@
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;
}
//鏄剧ず鏂囨湰
button.TextID = intValue;
--
Gitblit v1.8.0