From 5b40f1da1d28616de3880857b38357eef7859b64 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 26 十一月 2020 17:51:35 +0800
Subject: [PATCH] 2020-11-26-1
---
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 111 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 81 insertions(+), 30 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index 621d0e1..bc0cdd4 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -362,34 +362,59 @@
/// <summary>
/// 鍔犺浇鑷姩鍖栧垪琛ㄧ晫闈�
/// </summary>
- void LoadAutomationPageView()
+ void LoadAutomationPageView()
{
//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 = "姣忓ぉ";
- Button btnTipNot = new Button()
- {
- Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(120),
- Width = Application.GetRealWidth(180),
- Height = Application.GetRealWidth(180),
- UnSelectedImagePath = "TipNot.png",
- };
- automationPage.AddChidren(btnTipNot);
- Button btnTipNotText = new Button()
- {
- Y = btnTipNot.Bottom,
- Height = Application.GetRealWidth(100),
- TextID = StringId.TipNotOpen,
- TextAlignment = TextAlignment.Center,
- TextColor = CSS_Color.TextualColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- };
- automationPage.AddChidren(btnTipNotText);
+ // /// <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);
+
}
#endregion
}
@@ -442,9 +467,9 @@
btnSceneTilte.TextSize = CSS_FontSize.HeadlineFontSize;
btnAutomationTitle.IsSelected = false;
btnAutomationTitle.TextSize = CSS_FontSize.TextFontSize;
-
contentPageView.PageIndex = 0;
};
+ //閫昏緫鐐瑰嚮浜嬩欢
btnAutomationTitle.MouseUpEventHandler = (sender, e) => {
if (btnAutomationTitle.IsSelected)
{
@@ -455,6 +480,8 @@
btnSceneTilte.IsSelected = false;
btnSceneTilte.TextSize = CSS_FontSize.TextFontSize;
contentPageView.PageIndex = 1;
+ LoadAutomationPageView();
+
};
}
#endregion
@@ -466,13 +493,22 @@
{
btnAddIcon.MouseUpEventHandler = (sender, e) =>
{
- Action action = () => {
- LoadSceneFunctionControlZone();
- };
- var aep = new NewSceneMenuListPage(action);
- MainPage.BasePageView.AddChidren(aep);
- aep.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ if (!btnAutomationTitle.IsSelected)
+ {
+ Action action = () =>
+ {
+ LoadSceneFunctionControlZone();
+ };
+ var aep = new NewSceneMenuListPage(action);
+ MainPage.BasePageView.AddChidren(aep);
+ aep.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ }
+ else
+ {
+ //璺宠浆鍒伴�昏緫鐣岄潰
+ SkipAddLogicPage();
+ }
};
}
@@ -493,6 +529,21 @@
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