Revert "20201127 合并嘉乐代码"

wei

2020-11-27 7ca4d7e50871c558e5927b6b0eeecb2071fdf14c

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

@@ -13,11 +13,6 @@
        /// </summary>
        FrameLayout bodyView;
        /// <summary>
        /// 当前
        /// </summary>
        VerticalScrolViewLayout bodyScrolView;

        /// <summary>
        /// 头像区域
        /// </summary>
        FrameLayout headPortraitView;
@@ -188,27 +183,13 @@
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            new TopViewDiv(bodyView, Language.StringByID(StringId.PersonalCenter)).LoadTopView();

            bodyScrolView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(64),
                VerticalScrollBarEnabled = false,
                Height = Application.GetRealHeight(551),
            };
            bodyView.AddChidren(bodyScrolView);

            if (MainPage.Increase)
            {
                bodyScrolView.Height = Application.GetRealHeight(541);
            }

            headPortraitView = new FrameLayout()
            {
                //Y = Application.GetRealHeight(64),
                Y = Application.GetRealHeight(64),
                Height = Application.GetRealHeight(124),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };

            bodyScrolView.AddChidren(headPortraitView);
            bodyView.AddChidren(headPortraitView);

            userHeadImageView = new ImageView()
            {
@@ -216,28 +197,22 @@
                Width = Application.GetMinRealAverage(84),
                Height = Application.GetMinRealAverage(84),
                Radius = (uint)Application.GetMinRealAverage(42),
                ImagePath = UserInfo.Current.headImagePagePath,
                ImagePath =  UserInfo.Current.headImagePagePath,
            };
            headPortraitView.AddChidren(userHeadImageView);

            #region 个人信息选项区域
            var topPaddingView = new FrameLayout()
            {
                Height = Application.GetRealHeight(8)
            };
            bodyScrolView.AddChidren(topPaddingView);

            /// <summary>
            /// 个人信息选项区域
            /// </summary>
            optionListView = new VerticalScrolViewLayout()
            {
                //Y = headPortraitView.Bottom + Application.GetRealHeight(8),
                Y = headPortraitView.Bottom + Application.GetRealHeight(8),
                Height = Application.GetRealHeight(51 * 6),
                BackgroundColor = CSS_Color.MainBackgroundColor,
                ScrollEnabled = false,
            };
            bodyScrolView.AddChidren(optionListView);
            bodyView.AddChidren(optionListView);
            #region 个人选项-名字区域
            /// <summary>
            /// 个人选项-名字区域
@@ -270,7 +245,7 @@
                TextAlignment = TextAlignment.CenterRight,
                TextColor = CSS_Color.PromptingColor1,
                TextSize = CSS_FontSize.TextFontSize,
                Text = string.IsNullOrEmpty(UserInfo.Current.userName) ? Language.StringByID(StringId.UsersWhoNameIsEmpty) : UserInfo.Current.userName
                Text = string.IsNullOrEmpty( UserInfo.Current.userName) ? Language.StringByID(StringId.UsersWhoNameIsEmpty) :  UserInfo.Current.userName
            };
            userNameView.AddChidren(btnUserName);
            /// <summary>
@@ -367,7 +342,7 @@
                TextAlignment = TextAlignment.CenterRight,
                TextColor = CSS_Color.PromptingColor1,
                TextSize = CSS_FontSize.TextFontSize,
                Text = GetBindAccountText(UserInfo.Current.userEmailInfo)
                Text = GetBindAccountText( UserInfo.Current.userEmailInfo)
            };
            userEmailInfoView.AddChidren(btnUserEmailInfo);
            /// <summary>
@@ -416,7 +391,7 @@
                TextAlignment = TextAlignment.CenterRight,
                TextColor = CSS_Color.PromptingColor1,
                TextSize = CSS_FontSize.TextFontSize,
                Text = GetBindAccountText(UserInfo.Current.userMobileInfo)
                Text = GetBindAccountText( UserInfo.Current.userMobileInfo)
            };
            userPhoneInfoView.AddChidren(btnUserPhoneInfo);
            /// <summary>
@@ -502,21 +477,16 @@
            #endregion

            #region 解锁设置区域
            var topPaddingView2 = new FrameLayout()
            {
                Height = Application.GetRealHeight(8)
            };
            bodyScrolView.AddChidren(topPaddingView2);
            /// <summary>
            /// 解锁设置区域
            /// </summary>
            interpretationSettingsView = new FrameLayout()
            {
                //Y = optionListView.Bottom + Application.GetRealHeight(8),
                Y = optionListView.Bottom + Application.GetRealHeight(8),
                BackgroundColor = CSS_Color.MainBackgroundColor,
                Height = Application.GetRealHeight(66),
                Height = Application.GetRealHeight(65),
            };
            bodyScrolView.AddChidren(interpretationSettingsView);
            bodyView.AddChidren(interpretationSettingsView);
            btnInterpretationSettingsTitle = new Button()
            {
                X = Application.GetRealWidth(16),
@@ -527,7 +497,6 @@
                TextID = StringId.InterpretationSettings,
            };
            interpretationSettingsView.AddChidren(btnInterpretationSettingsTitle);

            btnInterpretationSettingsTip = new Button()
            {
                X = Application.GetRealWidth(16),
@@ -549,26 +518,6 @@
                UnSelectedImagePath = "Public/Right.png",
            };
            interpretationSettingsView.AddChidren(btnInterpretationSettingsRight);
            interpretationSettingsView.AddChidren(new LineView(interpretationSettingsView.Height));
            #endregion

            #region 服务器信息
            ListCellView myServerInfoCellView = new ListCellView()
            {
            };
            bodyScrolView.AddChidren(myServerInfoCellView);
            //跳转服务器信息
            Action selectAction = () =>
            {
                var myServerInfoPage = new MyServerInfoPage();
                MainPage.BasePageView.AddChidren(myServerInfoPage);
                myServerInfoPage.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
            myServerInfoCellView.GoAction = selectAction;
            myServerInfoCellView.BtnTilte.Text = Language.StringByID(StringId.ServerInformation);
            myServerInfoCellView.LineView.RemoveFromParent();

            #endregion

            btnLogout = new Button()