From e08a444a9d7acea0cf39f50d22d29179f6a59292 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 01 十二月 2020 09:37:11 +0800
Subject: [PATCH] 2020-12-1
---
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 79 +++++----------------------------------
1 files changed, 10 insertions(+), 69 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index bc0cdd4..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();
@@ -362,58 +363,13 @@
/// <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 = "姣忓ぉ";
-
-
- // /// <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 +436,6 @@
btnSceneTilte.IsSelected = false;
btnSceneTilte.TextSize = CSS_FontSize.TextFontSize;
contentPageView.PageIndex = 1;
- LoadAutomationPageView();
};
}
@@ -507,7 +462,7 @@
else
{
//璺宠浆鍒伴�昏緫鐣岄潰
- SkipAddLogicPage();
+ HDL_ON.UI.UI2.Intelligence.Automation.MainView.SkipAddLogicPage();
}
};
}
@@ -523,27 +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;
- UI2.Intelligence.Automation.AddLogic.action += () =>
- {
- LoadAutomationPageView();
- };
- }
+
}
}
--
Gitblit v1.8.0