From bd428f23e1eb103c19ebbf1f0165f9e2e7b0a9d0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 09 五月 2023 09:11:18 +0800
Subject: [PATCH] Merge branch 'Dev-Wxr' into Dev-Branch
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index f09d43a..b70cf7f 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -297,7 +297,7 @@
#region 浣忓畢淇℃伅鍖哄煙
if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare
&& DB_ResidenceData.Instance.GatewayType == 1
- && DB_ResidenceData.Instance.CurrentRegion.isSupportGroupControl)
+ && DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
{
residenceInfoView = new FrameLayout()
{
@@ -587,7 +587,7 @@
residenceAddFunctionView.AddChidren(btnResidenceAddFunctionText);
#endregion
- if (DB_ResidenceData.Instance.CurrentRegion.isSupportGroupControl)
+ if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
{
residenceFunctionCount++;
#region ---缁勫悎璋冨厜
@@ -616,7 +616,8 @@
TextID = StringId.CombinedDimming,
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ IsMoreLines = true,
};
faceManagementView.AddChidren(btnFaceManagementText);
--
Gitblit v1.8.0