合并嘉乐lc代码

wxr

2021-07-01 adc150efb13a0506f45a3c344c3ee2ef2dba8e90

 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs

@@ -234,9 +234,45 @@

            #endregion

            //体验模式
            if(MainPage.NoLoginMode)
            {
                Button btnExit = new Button()
                {
                    Y = Application.GetRealHeight(258) + personalInfoView.Bottom,
                    Gravity = Gravity.CenterHorizontal,
                    Height = Application.GetRealHeight(60),
                    Width = Application.GetRealWidth(330),
                    TextAlignment = TextAlignment.Center,
                    SelectedTextColor = CSS_Color.MainColor,
                    TextColor = CSS_Color.WarningColor,
                    TextSize = CSS_FontSize.SubheadingFontSize,
                    TextID = StringId.NextStep,
                    Radius = 10,
                    BackgroundColor = CSS_Color.MainBackgroundColor,
                    SelectedBackgroundColor = CSS_Color.MainBackgroundColor,
                };
                if(Language.CurrentLanguage =="Chinese")
                {
                    btnExit.Text = "退出体验模式";
                }
                else
                {
                    btnExit.Text = "Exit dome";
                }
                btnExit.MouseUpEventHandler = (sender, e) =>
                {
                    UserInfo.Current.ClearUserInfo();
                    HDLCommon.Current.Logout();
                };
                bodyView.AddChidren(btnExit);
                return;
            }

            contentView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(8) + personalInfoView.Bottom,

                Height = Application.GetRealHeight(400),
                ScrollEnabled = false
            };
@@ -298,7 +334,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
                Text = DB_ResidenceData.Instance.CurrentRegion.Name,
                Text = DB_ResidenceData.Instance.CurrentRegion.homeName,
                IsBold = true
            };
            residenceInfoView.AddChidren(btnCurResidenceName);
@@ -312,7 +348,7 @@
                BackgroundImagePath = "PersonalCenter/UserTypebg.png",
            };
            residenceInfoView.AddChidren(userTypeView);
            if (Language.CurrentLanguage != "Chinese" && !DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            if (Language.CurrentLanguage != "Chinese" )//&& !DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            {
                userTypeView.X = Application.GetRealWidth(200);
                userTypeView.Width = Application.GetRealWidth(180);
@@ -325,7 +361,7 @@
                Y = Application.GetRealHeight(15),
                Width = Application.GetMinRealAverage(20),
                Height = Application.GetMinRealAverage(20),
                UnSelectedImagePath = DB_ResidenceData.Instance.CurrentRegion.IsOthreShare
                UnSelectedImagePath = DB_ResidenceData.Instance.CurrentRegion.isOtherShare
                                    == false ? "PersonalCenter/AdminTypeIcon.png" : "PersonalCenter/MemberTypeIcon.png",
            };
            userTypeView.AddChidren(btnUserTypeIcon);
@@ -337,14 +373,14 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = CSS_Color.MainBackgroundColor,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                TextID = DB_ResidenceData.Instance.CurrentRegion.IsOthreShare
                TextID = DB_ResidenceData.Instance.CurrentRegion.isOtherShare
                        == false ? StringId.Administrators : StringId.Member
            };
            userTypeView.AddChidren(btnUserTypeName);
            #endregion
            #region 住宅管理

            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            {
                #region ---住宅管理区域
                residenceManageView = new FrameLayout()
@@ -749,7 +785,7 @@


            #region 智能音箱
            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            {
                //supportView 加高 显示3行 3*44
                supportView.Height = Application.GetRealWidth(3*44);