From a2927467ebfa938a420f392deb6882b35570fd33 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 01 十二月 2020 16:48:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'
---
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 157 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 131 insertions(+), 26 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index e2b77f0..db28d94 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,16 +190,18 @@
/// </summary>
void LoadSceneFunctionControlZone()
{
+ //topView.AddChidren(btnAddIcon);
+
sceneFunctionView.RemoveAll();
var rowView = new FrameLayout();
try
{
int index = 0;
- foreach (var function in DB_ResidenceData.functionList.scenes)
+ foreach (var scene in DB_ResidenceData.functionList.scenes)
{
- if (function.roomIdList.Count == 0)//濡備綍鍦ㄦ埧闂村凡缁忕Щ闄や簡杩欎釜鍔熻兘锛屽垯鏀惰棌鐣岄潰涔熶笉浼氬啀鏄剧ず
+ if (scene.roomIds.Count == 0)//濡備綍鍦ㄦ埧闂村凡缁忕Щ闄や簡杩欎釜鍔熻兘锛屽垯鏀惰棌鐣岄潰涔熶笉浼氬啀鏄剧ず
{
- function.collection = false;
+ scene.collect = false;
continue;
}
if (index % 2 == 0)
@@ -207,12 +221,12 @@
X = functionView_X,
Width = Application.GetRealWidth(164),
Height = Application.GetRealWidth(122),
- Tag = function.sid,
- BackgroundImagePath = (function as Scene).ImagePath,
+ Tag = scene.sid,
+ BackgroundImagePath = (scene as Scene).ImagePath,
};
rowView.AddChidren(functionView);
- LoadSceneFunctionDiv(functionView, function);
+ LoadSceneFunctionDiv(functionView, scene);
index++;
}
@@ -254,7 +268,7 @@
/// <summary>
/// 鍔犺浇鍦烘櫙鎺у埗鍗＄墖
/// </summary>
- void LoadSceneFunctionDiv(FrameLayout view, Function function)
+ void LoadSceneFunctionDiv(FrameLayout view, Scene scene)
{
try
{
@@ -271,7 +285,7 @@
Y = Application.GetRealWidth(68),
Width = Application.GetRealWidth(150),
Height = Application.GetRealHeight(24),
- Text = function.name,
+ Text = scene.name,
TextSize = CSS_FontSize.TextFontSize,
TextColor = CSS_Color.MainBackgroundColor,
TextAlignment = TextAlignment.CenterLeft,
@@ -289,7 +303,7 @@
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
TextAlignment = TextAlignment.CenterLeft,
SelectedTextColor = CSS_Color.MainBackgroundColor,
- Text = function.GetRoomListName(),
+ Text = scene.GetRoomListName(),
};
view.AddChidren(btnZone);
@@ -314,24 +328,24 @@
Height = Application.GetMinRealAverage(32),
UnSelectedImagePath = "Collection/CollectionWhiteIcon.png",
SelectedImagePath = "Collection/CollectionIcon.png",
- IsSelected = function.collection,
+ IsSelected = scene.collect,
};
view.AddChidren(btnCollection);
btnCollection.MouseUpEventHandler = (sender, e) => {
- function.collection = btnCollection.IsSelected = !btnCollection.IsSelected;
- function.SaveFunctionData();
+ scene.collect = btnCollection.IsSelected = !btnCollection.IsSelected;
+ scene.SaveSceneData();
};
- LoadEvent_ControlScene(btnCoverd,btnName,btnZone, function);
+ LoadEvent_ControlScene(btnCoverd,btnName,btnZone, scene);
btnSettingIcon.MouseUpEventHandler = (sender, e) => {
Action backAction = () => {
LoadSceneFunctionControlZone();
};
Action refreshAction = () => {
- btnName.Text = function.name;
- btnZone.Text = function.GetRoomListName();
- view.BackgroundImagePath = (function as Scene).ImagePath;
+ btnName.Text = scene.name;
+ btnZone.Text = scene.GetRoomListName();
+ view.BackgroundImagePath = scene.ImagePath;
};
- var aep = new SceneEditPage(function as Scene, backAction);
+ var aep = new SceneEditPage(scene, backAction);
MainPage.BasePageView.AddChidren(aep);
aep.LoadPage(StringId.EditScene, refreshAction);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -342,7 +356,41 @@
MainPage.Log("homepage LoadControlView error : " + ex.Message);
}
}
+ #endregion
+ #region 鑷姩鍖栭儴鍒�
+ /// <summary>
+ /// 鍔犺浇鑷姩鍖栧垪琛ㄧ晫闈�
+ /// </summary>
+ void LoadAutomationPageView()
+ {
+ //btnAddIcon.RemoveFromParent();
+
+ automationPage = new FrameLayout();
+ contentPageView.AddChidren(automationPage);
+
+ 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
}
@@ -352,7 +400,64 @@
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>
@@ -374,14 +479,14 @@
/// <summary>
/// 鍔犺浇鍦烘櫙鎺у埗浜嬩欢
/// </summary>
- void LoadEvent_ControlScene(Button btnCoverd, Button btnName, Button btnZone, Function function)
+ void LoadEvent_ControlScene(Button btnCoverd, Button btnName, Button btnZone, Scene scene)
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- string msg = function.name + Language.StringByID(StringId.AlreadyOpened);
+ string msg = scene.name + Language.StringByID(StringId.AlreadyOpened);
new PublicAssmebly().TipMsgAutoClose(msg, true);
- Control.Send(function);
+ Control.Ins.ControlScene(scene);
};
btnCoverd.MouseUpEventHandler = eventHandler;
btnName.MouseUpEventHandler = eventHandler;
--
Gitblit v1.8.0