From da1a17600b9ca8c8980ba64447688ee0a6718756 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 13 六月 2022 11:56:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wxr0114
---
HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
index 49990a0..2072723 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
@@ -9,7 +9,6 @@
{
Tag = "Logic";
}
-
public void Show()
{
LogicView.TopView topView = new LogicView.TopView();
@@ -62,28 +61,30 @@
likiadaodaView.frameLayout.Y = shiwaiView.frameLayout.Bottom;
likiadaodaView.btnText.TextID = StringId.likiadaoda;
likiadaodaView.btnIcon.UnSelectedImagePath = "LogicIcon/location.png";
- int count = 0;//杈撳叆绫诲瀷涓暟
- if (MainView.IsGatewayType)
- {
- count = 4;
- 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, count);
+ new FunTpye(LogicMethod.condition_if).FunTypeView(viewLayout, shiwaiView.frameLayout.Bottom, count);
#endregion
#region 鎵�鏈夌偣鍑讳簨浠�
//鏃堕棿
timeView.btnClick.MouseUpEventHandler += (sen, e) =>
- {
+ {
+
TimeTpye timeTpye = new TimeTpye();
MainPage.BasePageView.AddChidren(timeTpye);
timeTpye.Show();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
+ };
//鍦烘櫙鐐瑰嚮浜嬩欢
sceneView.btnClick.MouseUpEventHandler += (sen, e) =>
--
Gitblit v1.8.0