From 307e554fb2ef6491d08afc58a6c0a852f44b4f46 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 01 十二月 2020 17:04:50 +0800
Subject: [PATCH] 2020-12-01-1
---
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 48 +++++++++---------------------------------------
1 files changed, 9 insertions(+), 39 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index b2f5478..370024f 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -4,7 +4,7 @@
using HDL_ON.UI.CSS;
using Shared;
-namespace HDL_ON.UI
+namespace HDL_ON.UI
{
public partial class IntelligencePage : FrameLayout
{
@@ -177,7 +177,8 @@
#endregion
- sceneFunctionView = new VerticalScrolViewLayout() {
+ sceneFunctionView = new VerticalScrolViewLayout()
+ {
Y = floorChangeView.Bottom,
Height = Application.GetRealHeight(667 - 64 - 49 - 52 + 30),
};
@@ -335,7 +336,7 @@
function.collection = btnCollection.IsSelected = !btnCollection.IsSelected;
function.SaveFunctionData();
};
- LoadEvent_ControlScene(btnCoverd,btnName,btnZone, function);
+ LoadEvent_ControlScene(btnCoverd, btnName, btnZone, function);
btnSettingIcon.MouseUpEventHandler = (sender, e) => {
Action backAction = () => {
LoadSceneFunctionControlZone();
@@ -365,31 +366,11 @@
void LoadAutomationPageView()
{
//btnAddIcon.RemoveFromParent();
- ///娓呴櫎涔嬪墠鐣岄潰鏁版嵁閲嶆柊鍔犺浇鏂版暟鎹紱
- contentPageView.RemoveAll();
automationPage = new FrameLayout();
contentPageView.AddChidren(automationPage);
+ HDL_ON.UI.UI2.Intelligence.Automation.MainView.automationPage = automationPage;
+ HDL_ON.UI.UI2.Intelligence.Automation.MainView.MainShow();
- 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);
}
#endregion
}
@@ -455,7 +436,6 @@
btnSceneTilte.IsSelected = false;
btnSceneTilte.TextSize = CSS_FontSize.TextFontSize;
contentPageView.PageIndex = 1;
- LoadAutomationPageView();
};
}
@@ -482,7 +462,7 @@
else
{
//璺宠浆鍒伴�昏緫鐣岄潰
- SkipAddLogicPage();
+ HDL_ON.UI.UI2.Intelligence.Automation.MainView.SkipAddLogicPage();
}
};
}
@@ -498,23 +478,13 @@
{
string msg = function.name + Language.StringByID(StringId.AlreadyOpened);
new PublicAssmebly().TipMsgAutoClose(msg, true);
- Control.ins.ControlScene(function as Scene);
+ Control.Ins.ControlScene(function as Scene);
};
btnCoverd.MouseUpEventHandler = eventHandler;
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;
- }
+
}
}
--
Gitblit v1.8.0