From 50f0a7ce08531e0c5d37f7da243dd54f8dd2fe7b Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 18 十一月 2020 16:42:12 +0800
Subject: [PATCH] 2020-11-18-1
---
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 41 +++++++++++++++++++++++++++++++----------
1 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index 621d0e1..6ec129b 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -365,8 +365,8 @@
void LoadAutomationPageView()
{
//btnAddIcon.RemoveFromParent();
-
-
+ ///娓呴櫎涔嬪墠鐣岄潰鏁版嵁閲嶆柊鍔犺浇鏂版暟鎹紱
+ contentPageView.RemoveAll();
automationPage = new FrameLayout();
contentPageView.AddChidren(automationPage);
@@ -442,9 +442,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 +455,8 @@
btnSceneTilte.IsSelected = false;
btnSceneTilte.TextSize = CSS_FontSize.TextFontSize;
contentPageView.PageIndex = 1;
+ LoadAutomationPageView();
+
};
}
#endregion
@@ -466,13 +468,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 +504,16 @@
btnName.MouseUpEventHandler = eventHandler;
btnZone.MouseUpEventHandler = eventHandler;
}
+ /// <summary>
+ /// 璺宠浆鍒伴�昏緫鐣岄潰鐨勬柟娉�
+ /// </summary>
+ public void SkipAddLogicPage()
+ {
+ var addLogic = new UI2.Intelligence.Automation.AddLogic();
+ MainPage.BasePageView.AddChidren(addLogic);
+ addLogic.Show();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ }
}
}
--
Gitblit v1.8.0