From b8b6286b336ffcb778d5e7ed0e7881ab6f41619f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 07 六月 2022 17:02:47 +0800
Subject: [PATCH] Merge branch 'release0123' into Dev-Branch
---
HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs | 29 +++++++++++++----------------
1 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
index 845f1de..eadc10b 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
@@ -9,14 +9,7 @@
{
Tag = "Logic";
}
- /// <summary>
- /// 榛樿閫変腑鏄埧闂存椂锛氬叏閮ㄥ尯鍩�
- /// </summary>
- private Entity.Room selectedRoom = new Entity.Room { roomId = "6688" };
- /// <summary>
- /// 琛ㄧず鏄�(鏉′欢/鐩爣)
- /// </summary>
- private string if_type = LogicMethod.condition_if;
+
public void Show()
{
LogicView.TopView topView = new LogicView.TopView();
@@ -49,8 +42,10 @@
sceneView.frameLayout.Y = timeView.frameLayout.Bottom;
sceneView.btnText.TextID = StringId.Scenes;
sceneView.btnIcon.UnSelectedImagePath = "LogicIcon/scene.png";
- viewLayout.AddChidren(sceneView.FLayoutView());
-
+ if (MainView.IsGatewayType)
+ {
+ viewLayout.AddChidren(sceneView.FLayoutView());
+ }
//瀹ゅ鍙樺寲
LogicView.SelectTypeView shiwaiView = new LogicView.SelectTypeView();
shiwaiView.frameLayout.Y = sceneView.frameLayout.Bottom;
@@ -67,14 +62,16 @@
likiadaodaView.frameLayout.Y = shiwaiView.frameLayout.Bottom;
likiadaodaView.btnText.TextID = StringId.likiadaoda;
likiadaodaView.btnIcon.UnSelectedImagePath = "LogicIcon/location.png";
-
- if (MainView.IsGatewayType)
- {
- viewLayout.AddChidren(likiadaodaView.FLayoutView());
- }
+ int count = 3;//杈撳叆绫诲瀷涓暟
+ //2022骞�05鏈�24鏃�15:08:22 闅愯棌鎺夊湴鐞嗗洿鏍�
+ //if (MainView.IsGatewayType)
+ //{
+ // count = 4;
+ // viewLayout.AddChidren(likiadaodaView.FLayoutView());
+ //}
////鍔熻兘
///浜у搧缁忕悊鍚涚剷瑕佹眰锛岃澶囧姛鑳界Щ鍒拌繖閲屻��<2022-3-7>
- new FunTpye(LogicMethod.condition_if).FunTypeView(viewLayout, likiadaodaView.frameLayout.Bottom,4);
+ new FunTpye(LogicMethod.condition_if).FunTypeView(viewLayout, shiwaiView.frameLayout.Bottom, count);
#endregion
--
Gitblit v1.8.0