Merge branch 'dev' into lss

lss

2022-05-17 ae86b09b30621e1a8512c6bcdd7e22e9c67a5402

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

@@ -703,52 +703,59 @@

            //访客管理
            #region 个人选项-访客管理
            optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });

            visitorManagementView = new FrameLayout()
            if (!Entity.DB_ResidenceData.Instance.SupportVisitorManage)//判断是否支持访客管理
            {
                Height = Application.GetRealHeight(50),
            };
            optionListView.AddChidren(visitorManagementView);
                optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });

            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);
                visitorManagementView = new FrameLayout()
                {
                    Height = Application.GetRealHeight(50),
                };
                optionListView.AddChidren(visitorManagementView);

            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) =>
            {
                //刷新接口请求所需要的参数
                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();
            };
                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);

            #endregion
            #endregion
                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) =>
                {
#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>
@@ -798,9 +805,9 @@
            //};
            //interpretationSettingsView.AddChidren(btnInterpretationSettingsRight);
            //interpretationSettingsView.AddChidren(new LineView(interpretationSettingsView.Height));
            #endregion
#endregion

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

            #endregion
#endregion


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

            #endregion
#endregion

            btnLogout = new Button()
            {