From e1a8f2f7e4d850beedeb1469610b878c1427e976 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 15 十二月 2021 09:01:53 +0800
Subject: [PATCH] 更新
---
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 259 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 215 insertions(+), 44 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index 663d170..230d2f6 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -15,6 +15,16 @@
/// </summary>
PageLayout contentPageView;
Button btnAutomationTitle;
+
+ Button btnAddIconBg;
+
+
+ #region 瀹夐槻鍖哄煙
+ FrameLayout securityView;
+ Button btnSecurityTitle;
+ #endregion
+
+
#region 鍦烘櫙鍖哄煙
FrameLayout scenePageView;
/// <summary>
@@ -76,53 +86,141 @@
//鍒ゆ柇鏄惁闇�瑕侀殣钘忚嚜鍔ㄥ寲
if (HideAutoPage)
{
- btnSceneTilte = new Button()
+ if (false && DB_ResidenceData.Instance.GatewayType == 1)//缃戝叧闇�瑕佸姞杞藉畨闃�--2021-11-28 19:56:53 鍒樻檽杈夊皢瀹夐槻鏀惧叆鏀圭晫闈�
{
- Y = Application.GetRealHeight(30),
- //Width = Application.GetRealWidth(170),
- Height = Application.GetRealHeight(25),
- TextAlignment = TextAlignment.Center,
- TextSize = CSS_FontSize.HeadlineFontSize,
- TextColor = CSS_Color.PromptingColor1,
- SelectedTextColor = CSS_Color.MainColor,
- TextID = StringId.Scenes,
- IsSelected = true
- };
- topView.AddChidren(btnSceneTilte);
- btnAutomationTitle = new Button();
+ btnSceneTilte = new Button()
+ {
+ Y = Application.GetRealHeight(30),
+ Width = Application.GetRealWidth(170),
+ Height = Application.GetRealHeight(25),
+ TextAlignment = TextAlignment.CenterRight,
+ TextSize = CSS_FontSize.HeadlineFontSize,
+ TextColor = CSS_Color.PromptingColor1,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextID = StringId.Scenes,
+ IsSelected = true
+ };
+ topView.AddChidren(btnSceneTilte);
+
+ btnSecurityTitle = new Button()
+ {
+ X = Application.GetRealWidth(209),
+ Y = Application.GetRealHeight(30),
+ Width = Application.GetRealWidth(170),
+ Height = Application.GetRealHeight(25),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextColor = CSS_Color.PromptingColor1,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextID = StringId.anfang,
+ };
+ topView.AddChidren(btnSecurityTitle);
+ btnAutomationTitle = new Button();
+ }
+ else
+ {
+
+ btnSceneTilte = new Button()
+ {
+ Y = Application.GetRealHeight(30),
+ //Width = Application.GetRealWidth(170),
+ Height = Application.GetRealHeight(25),
+ TextAlignment = TextAlignment.Center,
+ TextSize = CSS_FontSize.HeadlineFontSize,
+ TextColor = CSS_Color.PromptingColor1,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextID = StringId.Scenes,
+ IsSelected = true
+ };
+ topView.AddChidren(btnSceneTilte);
+ btnAutomationTitle = new Button();
+
+ }
}
else
{
-
- btnSceneTilte = new Button()
+ if (false && DB_ResidenceData.Instance.GatewayType == 1)//缃戝叧闇�瑕佸姞杞藉畨闃�--2021-11-28 19:56:53 鍒樻檽杈夊皢瀹夐槻鏀惧叆鏀圭晫闈�
{
- Y = Application.GetRealHeight(30),
- Width = Application.GetRealWidth(170),
- Height = Application.GetRealHeight(25),
- TextAlignment = TextAlignment.CenterRight,
- TextSize = CSS_FontSize.HeadlineFontSize,
- TextColor = CSS_Color.PromptingColor1,
- SelectedTextColor = CSS_Color.MainColor,
- TextID = StringId.Scenes,
- IsSelected = true
- };
- topView.AddChidren(btnSceneTilte);
+ btnAutomationTitle = new Button()
+ {
+ Y = Application.GetRealHeight(30),
+ Gravity = Gravity.CenterHorizontal,
+ Height = Application.GetRealHeight(25),
+ TextAlignment = TextAlignment.Center,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextColor = CSS_Color.PromptingColor1,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextID = StringId.Automation,
+ IsSelected = false
+ };
+ topView.AddChidren(btnAutomationTitle);
+ btnAutomationTitle.Width = btnAutomationTitle.GetTextWidth() + Application.GetRealWidth(40);
- btnAutomationTitle = new Button()
+ var otherWidth = (Application.GetRealWidth(375) - btnAutomationTitle.Width) / 2;
+ btnAutomationTitle.X = otherWidth;
+
+
+ btnSceneTilte = new Button()
+ {
+ Y = Application.GetRealHeight(30),
+ Width = otherWidth,
+ Height = Application.GetRealHeight(25),
+ TextAlignment = TextAlignment.CenterRight,
+ TextSize = CSS_FontSize.HeadlineFontSize,
+ TextColor = CSS_Color.PromptingColor1,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextID = StringId.Scenes,
+ IsSelected =true
+ };
+ topView.AddChidren(btnSceneTilte);
+
+
+ btnSecurityTitle = new Button()
+ {
+ X = btnAutomationTitle.Right,
+ Y = Application.GetRealHeight(30),
+ Width = otherWidth,
+ Height = Application.GetRealHeight(25),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextColor = CSS_Color.PromptingColor1,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextID = StringId.anfang,
+ };
+ topView.AddChidren(btnSecurityTitle);
+ }
+ else
{
- X = Application.GetRealWidth(209),
- Y = Application.GetRealHeight(30),
- Width = Application.GetRealWidth(170),
- Height = Application.GetRealHeight(25),
- TextAlignment = TextAlignment.CenterLeft,
- TextSize = CSS_FontSize.TextFontSize,
- TextColor = CSS_Color.PromptingColor1,
- SelectedTextColor = CSS_Color.MainColor,
- TextID = StringId.Automation,
- };
- topView.AddChidren(btnAutomationTitle);
+ btnSceneTilte = new Button()
+ {
+ Y = Application.GetRealHeight(30),
+ Width = Application.GetRealWidth(170),
+ Height = Application.GetRealHeight(25),
+ TextAlignment = TextAlignment.CenterRight,
+ TextSize = CSS_FontSize.HeadlineFontSize,
+ TextColor = CSS_Color.PromptingColor1,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextID = StringId.Scenes,
+ IsSelected = true
+ };
+ topView.AddChidren(btnSceneTilte);
+
+ btnAutomationTitle = new Button()
+ {
+ X = Application.GetRealWidth(209),
+ Y = Application.GetRealHeight(30),
+ Width = Application.GetRealWidth(170),
+ Height = Application.GetRealHeight(25),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextColor = CSS_Color.PromptingColor1,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextID = StringId.Automation,
+ };
+ topView.AddChidren(btnAutomationTitle);
+ }
}
- var btnAddIconBg = new Button()
+ btnAddIconBg = new Button()
{
X = Application.GetRealWidth(337),
Y = Application.GetRealHeight(29),
@@ -155,9 +253,28 @@
{
LoadAutomationPageView();
}
+ LoadSecurityPageView();
LoadEventList();
}
+
+ #region 瀹夐槻甯冮槻
+ /// <summary>
+ /// 鍔犺浇瀹夐槻鐣岄潰
+ /// </summary>
+ void LoadSecurityPageView()
+ {
+ securityView = new FrameLayout();
+ contentPageView.AddChidren(securityView);
+
+ var page = new ArmCenterPage();
+ securityView.AddChidren(page);
+ page.LoadPage(false);
+ }
+
+
+ #endregion
+
#region 鍦烘櫙閮ㄥ垎
/// <summary>
/// 鍔犺浇鍦烘櫙鍒楄〃鐣岄潰
@@ -225,7 +342,7 @@
sceneFunctionView = new VerticalScrolViewLayout()
{
Y = Application.GetRealHeight(53),
- Height = Application.GetRealHeight(667 - 64 - 49 - 52 + 30),
+ Height = Application.GetRealHeight(667 - 64 - 49 - 52 + 0),
};
scenePageView.AddChidren(sceneFunctionView);
LoadSceneFunctionControlZone(null);
@@ -321,7 +438,6 @@
/// <summary>
/// 鍔犺浇鍦烘櫙鎺у埗鍗＄墖
/// </summary>
- //FrameLayout LoadSceneFunctionDiv(FrameLayout view, Scene scene)
FrameLayout LoadSceneFunctionDiv(int functionView_X, Scene scene)
{
var view = new FrameLayout()
@@ -373,7 +489,7 @@
btnZone = new Button()
{
X = Application.GetRealWidth(12),
- Y = btnName.Bottom,
+ Y = Application.GetRealWidth(68+24),
Height = Application.GetRealWidth(18),
Width = Application.GetRealWidth(113),
TextColor = CSS_Color.MainBackgroundColor,
@@ -482,8 +598,28 @@
{
contentPageView.PageChange = (sender, e) =>
{
- if (contentPageView.PageIndex == 0)
+ if (contentPageView.PageIndex == 2)
{
+ btnAddIconBg.Visible = false;
+ btnSecurityTitle.IsSelected = true;
+ btnSecurityTitle.TextSize = CSS_FontSize.HeadlineFontSize;
+ btnSecurityTitle.IsBold = true;
+ btnSceneTilte.IsSelected = false;
+ btnSceneTilte.TextSize = CSS_FontSize.TextFontSize;
+ btnSceneTilte.IsBold = false;
+ btnAutomationTitle.IsSelected = false;
+ btnAutomationTitle.TextSize = CSS_FontSize.TextFontSize;
+ btnAutomationTitle.IsBold = false;
+ }
+ else if (contentPageView.PageIndex == 0)
+ {
+ btnAddIconBg.Visible = true;
+ if (btnSecurityTitle != null)
+ {
+ btnSecurityTitle.IsSelected = false;
+ btnSecurityTitle.TextSize = CSS_FontSize.TextFontSize;
+ btnSecurityTitle.IsBold = false;
+ }
btnSceneTilte.IsSelected = true;
btnSceneTilte.TextSize = CSS_FontSize.HeadlineFontSize;
btnSceneTilte.IsBold = true;
@@ -493,6 +629,13 @@
}
else
{
+ btnAddIconBg.Visible = true;
+ if (btnSecurityTitle != null)
+ {
+ btnSecurityTitle.IsSelected = false;
+ btnSecurityTitle.TextSize = CSS_FontSize.TextFontSize;
+ btnSecurityTitle.IsBold = false;
+ }
btnAutomationTitle.IsSelected = true;
btnAutomationTitle.TextSize = CSS_FontSize.HeadlineFontSize;
btnAutomationTitle.IsBold = true;
@@ -508,6 +651,12 @@
{
return;
}
+
+ if (btnSecurityTitle != null)
+ {
+ btnSecurityTitle.IsSelected = false;
+ btnSecurityTitle.TextSize = CSS_FontSize.TextFontSize;
+ }
btnSceneTilte.IsSelected = true;
btnSceneTilte.TextSize = CSS_FontSize.HeadlineFontSize;
btnAutomationTitle.IsSelected = false;
@@ -520,13 +669,35 @@
{
return;
}
+
+ if (btnSecurityTitle != null)
+ {
+ btnSecurityTitle.IsSelected = false;
+ btnSecurityTitle.TextSize = CSS_FontSize.TextFontSize;
+ }
btnAutomationTitle.IsSelected = true;
btnAutomationTitle.TextSize = CSS_FontSize.HeadlineFontSize;
btnSceneTilte.IsSelected = false;
btnSceneTilte.TextSize = CSS_FontSize.TextFontSize;
contentPageView.PageIndex = 1;
-
};
+ if (btnSecurityTitle != null)
+ {
+ btnSecurityTitle.MouseUpEventHandler = (sender, e) =>
+ {
+ if (btnSecurityTitle.IsSelected)
+ {
+ return;
+ }
+ btnSecurityTitle.IsSelected = true;
+ btnSecurityTitle.TextSize = CSS_FontSize.HeadlineFontSize;
+ btnAutomationTitle.IsSelected = false;
+ btnAutomationTitle.TextSize = CSS_FontSize.TextFontSize;
+ btnSceneTilte.IsSelected = false;
+ btnSceneTilte.TextSize = CSS_FontSize.TextFontSize;
+ contentPageView.PageIndex = 2;
+ };
+ }
}
#endregion
--
Gitblit v1.8.0