From cc48110a814477bc0d01615f9844aea6ff2b609f Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期三, 28 四月 2021 14:51:38 +0800 Subject: [PATCH] Merge branch 'WJC' into wxr4 --- HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs index cd334f8..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 -- Gitblit v1.8.0