From 5efaaab958a0f4a91ad9d76b5d5fea0ea3fc3f41 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 01 十二月 2020 16:24:19 +0800
Subject: [PATCH] 2020-12-01 1.请求路径修改。 2.切换住宅或者查询住宅列表增加获取网关列表。 3.房间增加默认图片选择、比例调整为16：9。4.优化图片裁剪。
---
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 141 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 129 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index fbdf049..31cbb70 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
@@ -294,17 +308,16 @@
view.AddChidren(btnZone);
- Button btnDelayIcon;
- btnDelayIcon = new Button()
+ Button btnSettingIcon;
+ btnSettingIcon = new Button()
{
X = Application.GetRealWidth(4),
Y = Application.GetRealWidth(4),
Height = Application.GetRealWidth(32),
Width = Application.GetRealWidth(32),
UnSelectedImagePath = "Public/FuncInfoSetIcon_white.png",
- //UnSelectedImagePath = "FunctionIcon/Scene/DelayIcon.png"
};
- view.AddChidren(btnDelayIcon);
+ view.AddChidren(btnSettingIcon);
Button btnCollection;
btnCollection = new Button()
@@ -323,14 +336,61 @@
function.SaveFunctionData();
};
LoadEvent_ControlScene(btnCoverd,btnName,btnZone, function);
-
+ btnSettingIcon.MouseUpEventHandler = (sender, e) => {
+ Action backAction = () => {
+ LoadSceneFunctionControlZone();
+ };
+ Action refreshAction = () => {
+ btnName.Text = function.name;
+ btnZone.Text = function.GetRoomListName();
+ view.BackgroundImagePath = (function as Scene).ImagePath;
+ };
+ var aep = new SceneEditPage(function as Scene, backAction);
+ MainPage.BasePageView.AddChidren(aep);
+ aep.LoadPage(StringId.EditScene, refreshAction);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
}
catch (Exception ex)
{
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
}
@@ -340,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>
@@ -369,7 +486,7 @@
{
string msg = function.name + Language.StringByID(StringId.AlreadyOpened);
new PublicAssmebly().TipMsgAutoClose(msg, true);
- Control.Send(function as Scene);
+ Control.Ins.ControlScene(function as Scene);
};
btnCoverd.MouseUpEventHandler = eventHandler;
btnName.MouseUpEventHandler = eventHandler;
--
Gitblit v1.8.0