From b4f5f74d74a0a0996358d8348956601b30f17266 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 08 十二月 2021 16:07:51 +0800
Subject: [PATCH] 隐藏安防
---
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 46 +++++++++++++++++++++++++++++-----------------
1 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index e0a6bf2..230d2f6 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -86,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()
{
@@ -112,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();
@@ -134,15 +134,14 @@
};
topView.AddChidren(btnSceneTilte);
btnAutomationTitle = new Button();
- btnAutomationTitle = new Button();
}
}
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,
@@ -186,7 +185,7 @@
TextSize = CSS_FontSize.TextFontSize,
TextColor = CSS_Color.PromptingColor1,
SelectedTextColor = CSS_Color.MainColor,
- TextID = StringId.SecurityCenter,
+ TextID = StringId.anfang,
};
topView.AddChidren(btnSecurityTitle);
}
@@ -219,7 +218,6 @@
TextID = StringId.Automation,
};
topView.AddChidren(btnAutomationTitle);
- btnAutomationTitle = new Button();
}
}
btnAddIconBg = new Button()
@@ -616,9 +614,12 @@
else if (contentPageView.PageIndex == 0)
{
btnAddIconBg.Visible = true;
- btnSecurityTitle.IsSelected = false;
- btnSecurityTitle.TextSize = CSS_FontSize.TextFontSize;
- btnSecurityTitle.IsBold = false;
+ 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;
@@ -629,9 +630,12 @@
else
{
btnAddIconBg.Visible = true;
- btnSecurityTitle.IsSelected = false;
- btnSecurityTitle.TextSize = CSS_FontSize.TextFontSize;
- btnSecurityTitle.IsBold = false;
+ 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;
@@ -647,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;
@@ -661,8 +669,12 @@
{
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;
--
Gitblit v1.8.0