Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google

wxr

2024-09-27 acc8caee31c4be90bd38d1af18136b0e84f6fe94

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

@@ -1,14 +1,16 @@
    using System;
using System;
using HDL_ON.DAL.Server;
using HDL_ON.UI;
using HDL_ON.UI.CSS;
using Shared;

#if IOS
using Foundation;
#endif
namespace HDL_ON.UI
{
    public partial class PersonalDataPage : FrameLayout
    {
        #region 控件列表
#region 控件列表
        /// <summary>
        /// 当前
        /// </summary>
@@ -27,7 +29,7 @@
        /// </summary>
        ImageView userHeadImageView;

        #region 图标选择部分图标
#region 图标选择部分图标
        /// <summary>
        /// 背景图选项区域
        /// </summary>
@@ -48,14 +50,14 @@
        /// 取消按钮
        /// </summary>
        Button btnCancel;
        #endregion
#endregion

        #region 个人信息选项区域
#region 个人信息选项区域
        /// <summary>
        /// 个人信息选项区域
        /// </summary>
        VerticalScrolViewLayout optionListView;
        #region 个人选项-名字区域
#region 个人选项-名字区域
        /// <summary>
        /// 个人选项-名字区域
        /// </summary>
@@ -72,8 +74,8 @@
        /// 修改用户名称按钮
        /// </summary>
        Button btnEditUserNameIcon;
        #endregion
        #region 个人选项-二维码区域
#endregion
#region 个人选项-二维码区域
        /// <summary>
        /// 个人选项-二维码区域
        /// </summary>
@@ -90,8 +92,8 @@
        /// 二维码前进图标
        /// </summary>
        Button btnQRcodeRight;
        #endregion
        #region 个人选项-邮箱信息区域
#endregion
#region 个人选项-邮箱信息区域
        /// <summary>
        /// 个人选项-邮箱信息区域
        /// </summary>
@@ -108,8 +110,8 @@
        /// 用户邮箱信息前进图标
        /// </summary>
        Button btnUserEmailRight;
        #endregion
        #region 个人选项-手机信息区域
#endregion
#region 个人选项-手机信息区域
        /// <summary>
        /// 个人选项-手机信息区域
        /// </summary>
@@ -126,8 +128,8 @@
        /// 用户手机信息前进图标
        /// </summary>
        Button btnUserPhoneRight;
        #endregion
        #region 个人选项-第三方授权区域
#endregion
#region 个人选项-第三方授权区域
        /// <summary>
        /// 个人选项-第三方授权区域
        /// </summary>
@@ -137,7 +139,7 @@
        /// </summary>
        Button btnThirdPartyAuthorizationTitle;
        Button btnThirdPartyAuthorizationRight;
        #region 个人选项-修改登录密码区域
#region 个人选项-修改登录密码区域
        /// <summary>
        /// 个人选项-修改登录密码区域
        /// </summary>
@@ -147,10 +149,10 @@
        /// </summary>
        Button btnResetPasswordText;
        Button btnResetPasswordRight;
        #endregion
#endregion


        #region 个人选项-新增住宅
#region 个人选项-新增住宅
        /// <summary>
        /// 个人选项-新增住宅区域
        /// </summary>
@@ -160,10 +162,10 @@
        /// </summary>
        Button btnAddResidenceText;
        Button btnAddResidenceScan;
        #endregion
#endregion


        #region 个人选项-人脸通讯管理
#region 个人选项-人脸通讯管理
        /// <summary>
        /// 个人选项-人脸通行管理行
        /// </summary>
@@ -172,29 +174,40 @@
        /// 人脸通行管理文本
        /// </summary>
        Button btnFaceManagementText;
        #endregion
#endregion

#region 个人选项-访客管理
        /// <summary>
        /// 个人选项-访客管理
        ///
        /// </summary>
        FrameLayout visitorManagementView;
        /// <summary>
        /// 人脸通行管理文本isitor
        /// </summary>
        Button btnisitorVManagementText;
#endregion

        #endregion
#endregion

        #endregion
#endregion

        #region 解锁设置区域
#region 解锁设置区域
        /// <summary>
        /// 解锁设置区域
        /// </summary>
        FrameLayout interpretationSettingsView;
        Button btnInterpretationSettingsTitle;
        Button btnInterpretationSettingsTip;
        Button btnInterpretationSettingsRight;
        #endregion
        //FrameLayout interpretationSettingsView;
        //Button btnInterpretationSettingsTitle;
        //Button btnInterpretationSettingsTip;
        //Button btnInterpretationSettingsRight;
#endregion

        /// <summary>
        /// 退出登录按钮
        /// </summary>
        Button btnLogout;

        #endregion
#endregion
        /// <summary>
        /// 更新头像的回调函数
        /// </summary>
@@ -214,19 +227,21 @@
        public void LoadView()
        {
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            new TopViewDiv(bodyView, Language.StringByID(StringId.PersonalCenter)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.PersonalCenter));
            topView.maginY = 10;
            topView.LoadTopView();

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

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

            headPortraitView = new FrameLayout()
@@ -266,10 +281,21 @@
            };
            bodyScrolView.AddChidren(optionListView);

            //根据需要添加行
            int addRow = 0;
            if(Entity.DB_ResidenceData.Instance.SupportFacePass)
            {
                optionListView.Height = Application.GetRealHeight(51 * (6 + 1));
                addRow += 1;
            }

            if (Entity.DB_ResidenceData.Instance.SupportVisitorManage)
            {
                addRow += 1;
            }

            //有全视通的情况
            optionListView.Height = Application.GetRealHeight(51 * (6 + addRow));


            #region 个人选项-名字区域
            /// <summary>
@@ -465,8 +491,8 @@
            };
            userPhoneInfoView.AddChidren(btnUserPhoneRight);
            optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
            #endregion
            #region 个人选项-第三方授权区域
#endregion
#region 个人选项-第三方授权区域
            //2020-12-08 暂时隐藏第三方授权功能
            /// <summary>
            /// 个人选项-第三方授权区域
@@ -498,8 +524,8 @@
                UnSelectedImagePath = "Public/Right.png",
            };
            thirdPartyAuthorizationView.AddChidren(btnThirdPartyAuthorizationRight);
            #endregion
            #region 个人选项-修改登录密码区域
#endregion
#region 个人选项-修改登录密码区域
            /// <summary>
            /// 个人选项-修改登录密码区域
            /// </summary>
@@ -531,12 +557,12 @@
            };
            resetPasswordView.AddChidren(btnResetPasswordRight);
            optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
            #endregion

            #region 个人选项-添加住宅
#endregion
            
#region 个人选项-添加住宅
            addResidenceView = new FrameLayout()
            {
                Height = Application.GetRealHeight(50),
                    Height = Application.GetRealHeight(50),
            };
            optionListView.AddChidren(addResidenceView);
            btnAddResidenceScan = new Button()
@@ -560,7 +586,7 @@

            btnAddResidenceText.MouseUpEventHandler = (sender, e) =>
            {
                Scan.OpenScan((scanString) =>
                Scan.Ins.OpenScan((scanString) =>
                {
                    if (string.IsNullOrEmpty(scanString))
                    {
@@ -580,8 +606,8 @@
                                    });
                                    var sendString = scanString.Replace("source://bind/", "");
                                    MainPage.Log($"绑定source屏:{sendString}");
                                //绑定source屏
                                var pack = new HttpServerRequest().BindSourcePanel(sendString);
                                    //绑定source屏
                                    var pack = new HttpServerRequest().BindSourcePanel(sendString);
                                    Application.RunOnMainThread(() =>
                                    {
                                        var title = Language.StringByID(StringId.Tip);
@@ -633,11 +659,11 @@
                });
            };

            #endregion
#endregion

            if (Entity.DB_ResidenceData.Instance.SupportFacePass)
            {
                #region 个人选项-人脸通行管理
#region 个人选项-人脸通行管理
                optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });

                faceManagementView = new FrameLayout()
@@ -674,70 +700,18 @@
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                };

                #endregion
#endregion

            }

            #endregion

            #region 解锁设置区域
#endregion
            var topPaddingView2 = new FrameLayout()
            {
                Height = Application.GetRealHeight(8)
            };
            bodyScrolView.AddChidren(topPaddingView2);
            /// <summary>
            /// 解锁设置区域
            /// </summary>
            interpretationSettingsView = new FrameLayout()
            {
                BackgroundColor = CSS_Color.MainBackgroundColor,
                Height = Application.GetRealHeight(70),
            };
            bodyScrolView.AddChidren(interpretationSettingsView);
            if(Language.CurrentLanguage != "Chinese")
            {
                interpretationSettingsView.Height = Application.GetRealHeight(80);
            }

            btnInterpretationSettingsTitle = new Button()
            {
                X = Application.GetRealWidth(16),
                Height = Application.GetRealHeight(32),
                TextAlignment = TextAlignment.BottomLeft,
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.SubheadingFontSize,
                TextID = StringId.InterpretationSettings,
            };
            interpretationSettingsView.AddChidren(btnInterpretationSettingsTitle);

            btnInterpretationSettingsTip = new Button()
            {
                X = Application.GetRealWidth(16),
                Y = btnInterpretationSettingsTitle.Bottom,
                Height = Application.GetRealHeight(32),
                Width = Application.GetRealWidth(310),
                TextAlignment = TextAlignment.TopLeft,
                TextColor = CSS_Color.PromptingColor1,
                TextSize = CSS_FontSize.TextFontSize,
                TextID = StringId.AppUnlockSettingsTip,
                IsMoreLines = true,
            };
            interpretationSettingsView.AddChidren(btnInterpretationSettingsTip);

            btnInterpretationSettingsRight = new Button()
            {
                X = Application.GetRealWidth(339),
                Gravity = Gravity.CenterVertical,
                Width = Application.GetMinRealAverage(16),
                Height = Application.GetMinRealAverage(16),
                UnSelectedImagePath = "Public/Right.png",
            };
            interpretationSettingsView.AddChidren(btnInterpretationSettingsRight);
            interpretationSettingsView.AddChidren(new LineView(interpretationSettingsView.Height));
            #endregion

            #region 服务器信息
#region 服务器信息
            ListCellView myServerInfoCellView = new ListCellView()
            {
            };
@@ -749,16 +723,37 @@
                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();
            //myServerInfoCellView.LineView.RemoveFromParent();

#endregion


#region 注销账号
            ListCellView logOffView = new ListCellView()
            {
            };
            bodyScrolView.AddChidren(logOffView);
            //注销账号界面
            Action logOffAction = () =>
            {
                var myServerInfoPage = new CancelAccountPage();
                MainPage.BasePageView.AddChidren(myServerInfoPage);
                myServerInfoPage.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
            logOffView.GoAction = logOffAction;
            logOffView.BtnTilte.Text = Language.StringByID(StringId.CancelAccount);
            logOffView.LineView.RemoveFromParent();

            #endregion

            btnLogout = new Button()
            {
                Y = Application.GetRealHeight(623),
                Y = Application.GetRealHeight(624),
                Height = Application.GetRealHeight(50),
                TextAlignment = TextAlignment.Center,
                TextSize = CSS_FontSize.SubheadingFontSize,