From a3dfbcd5218270f9a75e6e32807b08215270b657 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期三, 11 九月 2024 11:48:23 +0800
Subject: [PATCH] Merge branch 'feature/v2.5_极光推送' into feature/V2.6.0_google
---
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index 4fdd6fa..8893874 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -83,6 +83,7 @@
//涓嶆槸A缃戝叧鎴栬�呮槸鎴愬憳 鍙厑璁告坊鍔犲満鏅殣钘忚嚜鍔ㄥ寲
var HideAutoPage = DB_ResidenceData.Instance.CurrentRegion.isOtherShare;
+ bool hideSecurity = true;
//鍒ゆ柇鏄惁闇�瑕侀殣钘忚嚜鍔ㄥ寲
if (HideAutoPage)
{
@@ -159,7 +160,6 @@
var otherWidth = (Application.GetRealWidth(375) - btnAutomationTitle.Width) / 2;
btnAutomationTitle.X = otherWidth;
-
btnSceneTilte = new Button()
{
Y = Application.GetRealHeight(40),
@@ -174,7 +174,6 @@
};
topView.AddChidren(btnSceneTilte);
-
btnSecurityTitle = new Button()
{
X = btnAutomationTitle.Right,
@@ -188,6 +187,7 @@
TextID = StringId.anfang,
};
topView.AddChidren(btnSecurityTitle);
+ hideSecurity = false;
}
else
{
@@ -253,7 +253,10 @@
{
LoadAutomationPageView();
}
- LoadSecurityPageView();
+ if (!hideSecurity)
+ {
+ LoadSecurityPageView();
+ }
LoadEventList();
}
--
Gitblit v1.8.0