From 9118585babf132b7e8a7a93da8c6ebf79510b72c Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 26 十一月 2020 20:21:20 +0800
Subject: [PATCH] 2020-11-26-2
---
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 70 ++--------------------------------
1 files changed, 5 insertions(+), 65 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index bc0cdd4..f217d02 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -357,7 +357,7 @@
}
}
#endregion
-
+
#region 鑷姩鍖栭儴鍒�
/// <summary>
/// 鍔犺浇鑷姩鍖栧垪琛ㄧ晫闈�
@@ -367,53 +367,8 @@
//btnAddIcon.RemoveFromParent();
automationPage = new FrameLayout();
contentPageView.AddChidren(automationPage);
- //for (int i = 0; i < 3; i++)
- //{
- // HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Add(new HDL_ON.UI.UI2.Intelligence.Automation.Logic { name = "123456" });
- //}
- //for (int i = 0; i < HDL_ON.UI.UI2.Intelligence.Automation.Logic.LogicList.Count; i++)
- //{
- // /////涓婁笅闂撮殧12鍍忕礌
- // //vv.AddChidren(new FrameLayout { Height = Application.GetRealHeight(12)});
- // //LogicView.SingleLogicView logicView = new LogicView.SingleLogicView();
- // //vv.AddChidren(logicView.FLayoutView());
- // //logicView.btnLogicName.Text = i.ToString();
- // //logicView.btnWeekText.Text = "姣忓ぉ";
-
-
- // /// <summary>
- // /// 涓绘帶浠禫iew
- // /// </summary>
- // FrameLayout frameLayout = new FrameLayout
- // {
- // X = Application.GetRealWidth(16),
- // Y = Application.GetRealHeight(12 + 102 * i),
- // Width = Application.GetRealWidth(343),
- // Height = Application.GetRealHeight(102),
- // BackgroundColor = CSS.CSS_Color.view,
- // Radius = (uint)Application.GetRealHeight(12),
- // };
- // automationPage.AddChidren(frameLayout);
- // /// <summary>
- // /// 閫昏緫鍚嶇О
- // /// </summary>
- // Button btnLogicName = new Button
- // {
- // Width = Application.GetRealWidth(250),
- // Height = Application.GetRealHeight(20),
- // TextSize = 14,
- // TextColor = CSS.CSS_Color.textColor,
- // Y = Application.GetRealHeight(12),
- // X = Application.GetRealWidth(12),
- // TextAlignment = TextAlignment.CenterLeft,
- // Text = i.ToString(),
-
- // };
- // frameLayout.AddChidren(btnLogicName);
-
- //}
-
- HDL_ON.UI.UI2.Intelligence.Automation.MainView.MainShow(automationPage);
+ HDL_ON.UI.UI2.Intelligence.Automation.MainView.automationPage = automationPage;
+ HDL_ON.UI.UI2.Intelligence.Automation.MainView.MainShow();
}
#endregion
@@ -480,7 +435,6 @@
btnSceneTilte.IsSelected = false;
btnSceneTilte.TextSize = CSS_FontSize.TextFontSize;
contentPageView.PageIndex = 1;
- LoadAutomationPageView();
};
}
@@ -507,7 +461,7 @@
else
{
//璺宠浆鍒伴�昏緫鐣岄潰
- SkipAddLogicPage();
+ HDL_ON.UI.UI2.Intelligence.Automation.MainView.SkipAddLogicPage();
}
};
}
@@ -529,21 +483,7 @@
btnName.MouseUpEventHandler = eventHandler;
btnZone.MouseUpEventHandler = eventHandler;
}
- /// <summary>
- /// 璺宠浆鍒伴�昏緫鐣岄潰鐨勬柟娉�
- /// </summary>
- public void SkipAddLogicPage()
- {
- HDL_ON.UI.UI2.Intelligence.Automation.Logic.currlogic = new UI2.Intelligence.Automation.Logic();
- var addLogic = new UI2.Intelligence.Automation.AddLogic();
- MainPage.BasePageView.AddChidren(addLogic);
- addLogic.Show();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- UI2.Intelligence.Automation.AddLogic.action += () =>
- {
- LoadAutomationPageView();
- };
- }
+
}
}
--
Gitblit v1.8.0