From 9acd3887f1f8db40d59f991b1726a61aa7c7637c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 五月 2021 15:13:56 +0800
Subject: [PATCH] Merge branch 'CJL' into wxr4
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index df31fec..47f2d15 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -135,13 +135,14 @@
}
}
break;
- case SPK.SensorDoorWindow: {
+ case SPK.SensorDoorWindow:
+ {
LogicView.FunTypeView view = new LogicView.FunTypeView();
view.btnText.TextID = StringId.kaiqiandbihe;
fLayout.AddChidren(view.FLayoutView());
view.btnClick.MouseUpEventHandler += (sender, e) =>
{
- DeviceView(device, view.btnState, StringId.kaiqi , StringId.bihe);
+ DeviceView(device, view.btnState, StringId.kaiqi, StringId.bihe);
};
if (edit)
{
@@ -151,7 +152,7 @@
break;
case SPK.SensoruUtrasonic:
{
-
+
LogicView.FunTypeView view = new LogicView.FunTypeView();
view.btnText.TextID = StringId.yourenandwuren;
fLayout.AddChidren(view.FLayoutView());
@@ -214,10 +215,22 @@
return;
}
LogicMethod.RemoveAllView();
- AddLogic addLogic = new AddLogic();
- MainPage.BasePageView.AddChidren(addLogic);
- addLogic.Show();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+
+ if (MainView.IsGatewayType)
+ { //A缃戝叧
+ var addLogic = new AddLogic();
+ MainPage.BasePageView.AddChidren(addLogic);
+ addLogic.Show();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ }
+ else
+ {
+ //涓�绔彛缃戝叧
+ var onePortAutomation = new OnePortAutomation();
+ MainPage.BasePageView.AddChidren(onePortAutomation);
+ onePortAutomation.Show();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ }
};
#endregion
@@ -281,16 +294,22 @@
value = "off";
}
break;
- case StringId.youren:
- case StringId.kaiqi:
- {
+ case StringId.youren: {
value = "true";
}
break;
- case StringId.wuren:
+ case StringId.wuren: {
+ value = "false";
+ }
+ break;
+ case StringId.kaiqi:
+ {
+ value = "open";
+ }
+ break;
case StringId.bihe:
{
- value = "false";
+ value = "close";
}
break;
case StringId.zaixian: {
--
Gitblit v1.8.0