From ee5f2543624a0e3ae9d046062b822727a31685e1 Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期五, 14 五月 2021 17:15:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wxr4' into dev-tzy

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
index a319a5c..41b3be7 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
@@ -32,7 +32,10 @@
             LogicView.SelectTypeView timeView = new LogicView.SelectTypeView();
             timeView.btnText.TextID = StringId.time;
             timeView.btnIcon.UnSelectedImagePath = "LogicIcon/time.png";
-            viewLayout.AddChidren(timeView.FLayoutView());
+            if (MainView.IsGatewayType)
+            {
+                viewLayout.AddChidren(timeView.FLayoutView());
+            }
 
             //鍔熻兘
             LogicView.SelectTypeView functionView = new LogicView.SelectTypeView();
@@ -40,13 +43,21 @@
             functionView.btnText.TextID = StringId.funLogic;
             functionView.btnIcon.UnSelectedImagePath = "LogicIcon/functionicon.png";
             viewLayout.AddChidren(functionView.FLayoutView());
+            if (!MainView.IsGatewayType)
+            {
+                functionView.frameLayout.Y = Application.GetRealHeight(0);
+            }
 
             //瀹ゅ鍙樺寲
             LogicView.SelectTypeView shiwaiView = new LogicView.SelectTypeView();
             shiwaiView.frameLayout.Y = functionView.frameLayout.Bottom;
             shiwaiView.btnText.TextID = StringId.shiwaibainhua;
             shiwaiView.btnIcon.UnSelectedImagePath = "LogicIcon/changesinoutdoor.png";
-            viewLayout.AddChidren(shiwaiView.FLayoutView());
+            
+            if (MainView.IsGatewayType)
+            {
+                viewLayout.AddChidren(shiwaiView.FLayoutView());
+            }
             #endregion
 
 

--
Gitblit v1.8.0