From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 125 +++++++++++++++++++++++++++++++++++++----
1 files changed, 111 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index e2b77f0..f217d02 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using Shared;
@@ -12,13 +13,17 @@
/// 鍦烘櫙/鑷姩鍖栧垎椤靛尯鍩�
/// </summary>
PageLayout contentPageView;
+ Button btnAutomationTitle;
#region 鍦烘櫙鍖哄煙
FrameLayout scenePageView;
/// <summary>
/// 鍦烘櫙鍐呭鏄剧ず鍖哄煙
/// </summary>
FrameLayout floorChangeView;
+ Button btnSceneTilte;
+
#region 鍦烘櫙搴曢儴鍒囨崲鏄剧ず鍖哄煙
+ FrameLayout topView;
/// <summary>
/// 鍦烘櫙鍖哄煙锛岄《閮ㄥ尯鍩�
/// </summary>
@@ -42,7 +47,12 @@
/// </summary>
VerticalScrolViewLayout sceneFunctionView;
#endregion
-
+ #region 鑷姩鍖栧尯鍩�
+ /// <summary>
+ /// 鑷姩鍖栧唴瀹规樉绀哄尯鍩�
+ /// </summary>
+ FrameLayout automationPage;
+ #endregion
public IntelligencePage()
{
bodyView = this;
@@ -52,14 +62,14 @@
{
bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
#region top
- FrameLayout topView = new FrameLayout()
+ topView = new FrameLayout()
{
Height = Application.GetRealHeight(64),
BackgroundColor = CSS_Color.TopViewColor,
};
bodyView.AddChidren(topView);
- Button btnSceneTilte = new Button()
+ btnSceneTilte = new Button()
{
Y = Application.GetRealHeight(30),
Width = Application.GetRealWidth(170),
@@ -73,7 +83,7 @@
};
topView.AddChidren(btnSceneTilte);
- Button btnAutomationTitle = new Button()
+ btnAutomationTitle = new Button()
{
X = Application.GetRealWidth(209),
Y = Application.GetRealHeight(30),
@@ -108,9 +118,11 @@
bodyView.AddChidren(contentPageView);
LoadScenePageView();
- //LoadFunctionPageView();
+ LoadAutomationPageView();
LoadEventList();
+
}
+ #region 鍦烘櫙閮ㄥ垎
/// <summary>
/// 鍔犺浇鍦烘櫙鍒楄〃鐣岄潰
/// </summary>
@@ -159,7 +171,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextAlignment = TextAlignment.CenterLeft,
- Text = OnAppConfig.Instance.CurFoor,
+ Text = DB_ResidenceData.residenceData.CurFoor,
};
floorChangeView.AddChidren(btnFloor);
@@ -178,6 +190,8 @@
/// </summary>
void LoadSceneFunctionControlZone()
{
+ //topView.AddChidren(btnAddIcon);
+
sceneFunctionView.RemoveAll();
var rowView = new FrameLayout();
try
@@ -342,7 +356,22 @@
MainPage.Log("homepage LoadControlView error : " + ex.Message);
}
}
+ #endregion
+
+ #region 鑷姩鍖栭儴鍒�
+ /// <summary>
+ /// 鍔犺浇鑷姩鍖栧垪琛ㄧ晫闈�
+ /// </summary>
+ void LoadAutomationPageView()
+ {
+ //btnAddIcon.RemoveFromParent();
+ automationPage = new FrameLayout();
+ contentPageView.AddChidren(automationPage);
+ HDL_ON.UI.UI2.Intelligence.Automation.MainView.automationPage = automationPage;
+ HDL_ON.UI.UI2.Intelligence.Automation.MainView.MainShow();
+ }
+ #endregion
}
@@ -352,7 +381,65 @@
void LoadEventList()
{
LoadEvent_SkipAddScenePage();
+ LoadEvent_ShowedChange();
}
+
+ #region 椤堕儴瀵艰埅鏍忎簨浠�
+ /// <summary>
+ /// 鏄剧ず鐣岄潰鍒囨崲
+ /// </summary>
+ void LoadEvent_ShowedChange()
+ {
+ contentPageView.PageChange = (sender, e) =>
+ {
+ if (contentPageView.PageIndex == 0)
+ {
+ btnSceneTilte.IsSelected = true;
+ btnSceneTilte.TextSize = CSS_FontSize.HeadlineFontSize;
+ btnSceneTilte.IsBold = true;
+ btnAutomationTitle.IsSelected = false;
+ btnAutomationTitle.TextSize = CSS_FontSize.TextFontSize;
+ btnAutomationTitle.IsBold = false;
+ }
+ else
+ {
+ btnAutomationTitle.IsSelected = true;
+ btnAutomationTitle.TextSize = CSS_FontSize.HeadlineFontSize;
+ btnAutomationTitle.IsBold = true;
+ btnSceneTilte.IsSelected = false;
+ btnSceneTilte.TextSize = CSS_FontSize.TextFontSize;
+ btnSceneTilte.IsBold = false;
+ }
+ };
+
+ btnSceneTilte.MouseUpEventHandler = (sender, e) =>
+ {
+ if (btnSceneTilte.IsSelected)
+ {
+ return;
+ }
+ btnSceneTilte.IsSelected = true;
+ btnSceneTilte.TextSize = CSS_FontSize.HeadlineFontSize;
+ btnAutomationTitle.IsSelected = false;
+ btnAutomationTitle.TextSize = CSS_FontSize.TextFontSize;
+ contentPageView.PageIndex = 0;
+ };
+ //閫昏緫鐐瑰嚮浜嬩欢
+ btnAutomationTitle.MouseUpEventHandler = (sender, e) => {
+ if (btnAutomationTitle.IsSelected)
+ {
+ return;
+ }
+ btnAutomationTitle.IsSelected = true;
+ btnAutomationTitle.TextSize = CSS_FontSize.HeadlineFontSize;
+ btnSceneTilte.IsSelected = false;
+ btnSceneTilte.TextSize = CSS_FontSize.TextFontSize;
+ contentPageView.PageIndex = 1;
+
+ };
+ }
+ #endregion
+
/// <summary>
/// 璺宠浆鑷虫坊鍔犲満鏅殑鐣岄潰
/// </summary>
@@ -360,13 +447,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
+ {
+ //璺宠浆鍒伴�昏緫鐣岄潰
+ HDL_ON.UI.UI2.Intelligence.Automation.MainView.SkipAddLogicPage();
+ }
};
}
@@ -381,12 +477,13 @@
{
string msg = function.name + Language.StringByID(StringId.AlreadyOpened);
new PublicAssmebly().TipMsgAutoClose(msg, true);
- Control.Send(function);
+ Control.ins.ControlScene(function as Scene);
};
btnCoverd.MouseUpEventHandler = eventHandler;
btnName.MouseUpEventHandler = eventHandler;
btnZone.MouseUpEventHandler = eventHandler;
}
+
}
}
--
Gitblit v1.8.0