Merge branch 'wxr0114' into V1.5.9

wxr

2022-06-30 23bbed132eea46eef51c6d01c21b346238e29ee2

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

@@ -3,7 +3,10 @@
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
@@ -174,6 +177,17 @@
        Button btnFaceManagementText;
        #endregion

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

        #endregion

@@ -266,10 +280,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>
@@ -678,6 +703,58 @@

            }

            //访客管理
#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()
            {