Merge branch 'wxr0114' into V1.5.9

wxr

2022-06-30 23bbed132eea46eef51c6d01c21b346238e29ee2

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

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

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

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

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


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


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

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

        #endregion
#endregion

        #endregion
#endregion

        #region 解锁设置区域
#region 解锁设置区域
        /// <summary>
        /// 解锁设置区域
        /// </summary>
@@ -187,14 +201,14 @@
        //Button btnInterpretationSettingsTitle;
        //Button btnInterpretationSettingsTip;
        //Button btnInterpretationSettingsRight;
        #endregion
#endregion

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

        #endregion
#endregion
        /// <summary>
        /// 更新头像的回调函数
        /// </summary>
@@ -248,7 +262,7 @@
            };
            headPortraitView.AddChidren(userHeadImageView);

            #region 个人信息选项区域
#region 个人信息选项区域
            var topPaddingView = new FrameLayout()
            {
                Height = Application.GetRealHeight(8)
@@ -266,12 +280,23 @@
            };
            bodyScrolView.AddChidren(optionListView);

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

            #region 个人选项-名字区域
            if (Entity.DB_ResidenceData.Instance.SupportVisitorManage)
            {
                addRow += 1;
            }

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


#region 个人选项-名字区域
            /// <summary>
            /// 个人选项-名字区域
            /// </summary>
@@ -319,8 +344,8 @@
            };
            userNameView.AddChidren(btnEditUserNameIcon);
            optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
            #endregion
            #region 个人选项-二维码区域
#endregion
#region 个人选项-二维码区域
            /// <summary>
            /// 个人选项-二维码区域
            /// </summary>
@@ -367,8 +392,8 @@
                UnSelectedImagePath = "Public/Right.png",
            };
            _QRcodeView.AddChidren(btnQRcodeRight);
            #endregion
            #region 个人选项-邮箱信息区域
#endregion
#region 个人选项-邮箱信息区域
            /// <summary>
            /// 个人选项-邮箱信息区域
            /// </summary>
@@ -416,8 +441,8 @@
            };
            userEmailInfoView.AddChidren(btnUserEmailRight);
            optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
            #endregion
            #region 个人选项-手机信息区域
#endregion
#region 个人选项-手机信息区域
            /// <summary>
            /// 个人选项-手机信息区域
            /// </summary>
@@ -465,8 +490,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 +523,8 @@
                UnSelectedImagePath = "Public/Right.png",
            };
            thirdPartyAuthorizationView.AddChidren(btnThirdPartyAuthorizationRight);
            #endregion
            #region 个人选项-修改登录密码区域
#endregion
#region 个人选项-修改登录密码区域
            /// <summary>
            /// 个人选项-修改登录密码区域
            /// </summary>
@@ -531,9 +556,9 @@
            };
            resetPasswordView.AddChidren(btnResetPasswordRight);
            optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
            #endregion
#endregion

            #region 个人选项-添加住宅
#region 个人选项-添加住宅
            addResidenceView = new FrameLayout()
            {
                Height = Application.GetRealHeight(50),
@@ -633,11 +658,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,18 +699,70 @@
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                };

                #endregion
#endregion

            }

            #endregion
            //访客管理
#region 个人选项-访客管理
            if (Entity.DB_ResidenceData.Instance.SupportVisitorManage)//判断是否支持访客管理
            {
                optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });

                visitorManagementView = new FrameLayout()
                {
                    Height = Application.GetRealHeight(50),
                };
                optionListView.AddChidren(visitorManagementView);


                var btnVisitorManagementRight = new Button()
                {
                    X = Application.GetRealWidth(339),
                    Gravity = Gravity.CenterVertical,
                    Width = Application.GetMinRealAverage(16),
                    Height = Application.GetMinRealAverage(16),
                    UnSelectedImagePath = "Public/Right.png",
                };
                visitorManagementView.AddChidren(btnVisitorManagementRight);

                btnisitorVManagementText = new Button()
                {
                    X = Application.GetRealWidth(16),
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    TextSize = CSS_FontSize.SubheadingFontSize,
                    TextID = StringId.VisitorManage,
                };
                visitorManagementView.AddChidren(btnisitorVManagementText);

                btnisitorVManagementText.MouseUpEventHandler = (sender, e) =>
                {
                    var page = new VisitorQRCodePage();
                    MainPage.BasePageView.AddChidren(page);
                    page.LoadPage();
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

#if __IOS__
                    //刷新接口请求所需要的参数
                    NSDictionary info = new NSDictionary("regionUrl", HttpUtil.GlobalRequestHttpsHost, "token", UserInfo.Current.LoginTokenString, "appkey", "HDL-HOME-APP-TEST", "secret", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", "refreshToken", UserInfo.Current.RefreshToken);
                    Shared.IOS.HDLFVSDK.Video.RefreshInfo(info);
                    //跳转访客管理界面
                    Shared.IOS.HDLFVSDK.Video.ShowVisitorManager();
#endif
                };
            }


#endregion
#endregion
            var topPaddingView2 = new FrameLayout()
            {
                Height = Application.GetRealHeight(8)
            };
            bodyScrolView.AddChidren(topPaddingView2);

            #region 解锁设置区域
#region 解锁设置区域
            ///// <summary>
            ///// 解锁设置区域
            ///// </summary>
@@ -735,9 +812,9 @@
            //};
            //interpretationSettingsView.AddChidren(btnInterpretationSettingsRight);
            //interpretationSettingsView.AddChidren(new LineView(interpretationSettingsView.Height));
            #endregion
#endregion

            #region 服务器信息
#region 服务器信息
            ListCellView myServerInfoCellView = new ListCellView()
            {
            };
@@ -754,10 +831,10 @@
            myServerInfoCellView.BtnTilte.Text = Language.StringByID(StringId.ServerInformation);
            //myServerInfoCellView.LineView.RemoveFromParent();

            #endregion
#endregion


            #region 注销账号
#region 注销账号
            ListCellView logOffView = new ListCellView()
            {
            };
@@ -774,7 +851,7 @@
            logOffView.BtnTilte.Text = Language.StringByID(StringId.CancelAccount);
            logOffView.LineView.RemoveFromParent();

            #endregion
#endregion

            btnLogout = new Button()
            {