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 | 80 ++++++++++++++++++++++++++--------------
1 files changed, 52 insertions(+), 28 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index 10d2b81..230d2f6 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -16,6 +16,9 @@
PageLayout contentPageView;
Button btnAutomationTitle;
+ Button btnAddIconBg;
+
+
#region 瀹夐槻鍖哄煙
FrameLayout securityView;
Button btnSecurityTitle;
@@ -83,7 +86,7 @@
//鍒ゆ柇鏄惁闇�瑕侀殣钘忚嚜鍔ㄥ寲
if (HideAutoPage)
{
- if (DB_ResidenceData.Instance.GatewayType == 1)//缃戝叧闇�瑕佸姞杞藉畨闃�--2021-11-28 19:56:53 鍒樻檽杈夊皢瀹夐槻鏀惧叆鏀圭晫闈�
+ if (false && DB_ResidenceData.Instance.GatewayType == 1)//缃戝叧闇�瑕佸姞杞藉畨闃�--2021-11-28 19:56:53 鍒樻檽杈夊皢瀹夐槻鏀惧叆鏀圭晫闈�
{
btnSceneTilte = new Button()
{
@@ -109,7 +112,7 @@
TextSize = CSS_FontSize.TextFontSize,
TextColor = CSS_Color.PromptingColor1,
SelectedTextColor = CSS_Color.MainColor,
- TextID = StringId.SecurityCenter,
+ TextID = StringId.anfang,
};
topView.AddChidren(btnSecurityTitle);
btnAutomationTitle = new Button();
@@ -136,9 +139,9 @@
}
else
{
- if (DB_ResidenceData.Instance.GatewayType == 1)//缃戝叧闇�瑕佸姞杞藉畨闃�--2021-11-28 19:56:53 鍒樻檽杈夊皢瀹夐槻鏀惧叆鏀圭晫闈�
+ if (false && DB_ResidenceData.Instance.GatewayType == 1)//缃戝叧闇�瑕佸姞杞藉畨闃�--2021-11-28 19:56:53 鍒樻檽杈夊皢瀹夐槻鏀惧叆鏀圭晫闈�
{
- btnAutomationTitle = new Button()
+ btnAutomationTitle = new Button()
{
Y = Application.GetRealHeight(30),
Gravity = Gravity.CenterHorizontal,
@@ -182,7 +185,7 @@
TextSize = CSS_FontSize.TextFontSize,
TextColor = CSS_Color.PromptingColor1,
SelectedTextColor = CSS_Color.MainColor,
- TextID = StringId.SecurityCenter,
+ TextID = StringId.anfang,
};
topView.AddChidren(btnSecurityTitle);
}
@@ -217,7 +220,7 @@
topView.AddChidren(btnAutomationTitle);
}
}
- var btnAddIconBg = new Button()
+ btnAddIconBg = new Button()
{
X = Application.GetRealWidth(337),
Y = Application.GetRealHeight(29),
@@ -597,6 +600,7 @@
{
if (contentPageView.PageIndex == 2)
{
+ btnAddIconBg.Visible = false;
btnSecurityTitle.IsSelected = true;
btnSecurityTitle.TextSize = CSS_FontSize.HeadlineFontSize;
btnSecurityTitle.IsBold = true;
@@ -609,9 +613,13 @@
}
else if (contentPageView.PageIndex == 0)
{
- btnSecurityTitle.IsSelected = false;
- btnSecurityTitle.TextSize = CSS_FontSize.TextFontSize;
- btnSecurityTitle.IsBold = false;
+ 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;
@@ -621,9 +629,13 @@
}
else
{
- btnSecurityTitle.IsSelected = false;
- btnSecurityTitle.TextSize = CSS_FontSize.TextFontSize;
- btnSecurityTitle.IsBold = false;
+ 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;
@@ -639,8 +651,12 @@
{
return;
}
- btnSecurityTitle.IsSelected = false;
- btnSecurityTitle.TextSize = CSS_FontSize.TextFontSize;
+
+ if (btnSecurityTitle != null)
+ {
+ btnSecurityTitle.IsSelected = false;
+ btnSecurityTitle.TextSize = CSS_FontSize.TextFontSize;
+ }
btnSceneTilte.IsSelected = true;
btnSceneTilte.TextSize = CSS_FontSize.HeadlineFontSize;
btnAutomationTitle.IsSelected = false;
@@ -653,27 +669,35 @@
{
return;
}
- btnSecurityTitle.IsSelected = false;
- btnSecurityTitle.TextSize = CSS_FontSize.TextFontSize;
+
+ 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;
};
- btnSecurityTitle.MouseUpEventHandler = (sender, e) => {
- if(btnSecurityTitle.IsSelected )
+ if (btnSecurityTitle != null)
+ {
+ btnSecurityTitle.MouseUpEventHandler = (sender, e) =>
{
- 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;
- };
+ 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