Merge branch 'Dev-Wxr' into Dev-Branch

wxr

2023-05-09 bd428f23e1eb103c19ebbf1f0165f9e2e7b0a9d0

 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);