合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs

old mode 100755
new mode 100644
@@ -13,7 +13,7 @@
        /// <summary>

        /// 主菜单背景框

        /// </summary>

        private FrameLayout frameMainMenuBack = null;

        private NormalFrameLayout frameMainMenuBack = null;

        /// <summary>

        /// 其他菜单的容器控件

        /// </summary>

@@ -50,17 +50,20 @@
        /// </summary>

        public void ShowForm()

        {

            this.FormID = "UserMainForm";



            //特殊处理：恢复可关闭进度条，别问为什么，我也不知道为什么，以防万一而已

            ProgressBar.SetCloseBarFlag(false);

            //初始化框架

            this.InitForm();

            //初始化头部控件

            this.InitTopFrameLayout();

            //初始化中部控件

            this.InitBodyFrameLayout();

            //移除返回键

            base.RemoveBackButton();



            //body占完整个屏幕,除了底部菜单

            bodyFrameLayout.Y = 0;

            bodyFrameLayout.Height = ControlCommonResourse.TopMenuFrameHeight + ControlCommonResourse.TopFrameHeight

                + ControlCommonResourse.BodyFrameHeight - ControlCommonResourse.BottomFrameHeight;

            bodyFrameLayout.Height = this.Height;

            bodyFrameLayout.BackgroundColor = UserCenterColor.Current.BlackBackGround;



            //初始化中部控件

@@ -76,7 +79,7 @@
            this.ClearBodyFrame();



            //个人中心

            var btnTitle = new NormalViewControl(350, 100, true);

            var btnTitle = new NormalViewControl(450, 100, true);

            btnTitle.X = ControlCommonResourse.XXLeft;

            btnTitle.Y = Application.GetRealHeight(112);

            btnTitle.TextColor = UserCenterColor.Current.White;

@@ -215,7 +218,7 @@
            else

            {

                //背景框

                frameMainMenuBack = new FrameLayout();

                frameMainMenuBack = new NormalFrameLayout();

                frameMainMenuBack.Y = Application.GetRealHeight(288);

                frameMainMenuBack.Gravity = Gravity.CenterHorizontal;

                frameMainMenuBack.Height = Application.GetRealHeight(371);

@@ -311,8 +314,32 @@
                frame.ButtonClickEvent += (sender, e) =>

                {

                    //住宅接口不需要特殊的登陆Token

                    var form = new Residence.ResidenceListForm();

                    var form = new Residence.ResidenceListMainForm();

                    form.AddForm();

                };

            }

            //人脸管理
            unSelectPic = "Center/FaceManagement.png";

            TextID = R.MyInternationalizationString.uFace;

            if (UserCenterResourse.UserInfo.AuthorityNo == 1)//是主账号才展示

            {

                //生成控件

                var frame = this.CreatMainMenuControl(frameMenu, TextID, unSelectPic);

                frame.ButtonClickEvent += (sender, e) =>

                {
                    if (Common.Config.Instance.Home.IsVirtually == true)

                    {

                        //如果住宅为虚拟住宅,则此功能无效

                        return;

                    }
                    //打开人脸管理页面
#if iOS

                    Shared.IOS.HDLFVSDK.Video.ShowFaceManagement();
#endif

#if Android

                    Com.Evoyohome.Sphonelibs.Global.Global.OpenFaceManageActivity(Application.Activity);
#endif
                };

            }



@@ -397,7 +424,40 @@
                frameOtherMenuContr.Y = Application.GetRealHeight(698);

                frameOtherMenuContr.Height = ControlCommonResourse.ListViewRowHeight * 4 + Application.GetRealHeight(26 * 4);

                frameWhite.AddChidren(frameOtherMenuContr);

            }

            }

            //可视对讲
            var rowVideo = new FrameRowControl(frameOtherMenuContr.rowSpace / 2);
            frameOtherMenuContr.AddChidren(rowVideo);
            //向右图标
            var btnBackVDRight = rowVideo.AddRightArrow();
            btnBackVDRight.X -= ControlCommonResourse.XXLeft / 2;
            //图标
            var btnBackVDIcon = rowVideo.AddLeftIcon();
            btnBackVDIcon.X -= ControlCommonResourse.XXLeft / 2;
            btnBackVDIcon.UnSelectedImagePath = "Item/videoIntercom.png";
            //底线
            var btnBackVDLine = rowVideo.AddBottomLine();
            btnBackVDLine.X -= ControlCommonResourse.XXLeft / 2;
            //数据备份View
            var btnBackVDView = rowVideo.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.videoIntercom), 300);
            btnBackVDView.X -= ControlCommonResourse.XXLeft / 2;
            rowVideo.ButtonClickEvent += (sender, e) =>
            {
                if (Common.Config.Instance.Home.IsVirtually == true)
                {
                    //如果住宅为虚拟住宅,则此功能无效
                    return;
                }

#if iOS

                Shared.IOS.HDLFVSDK.Video.ShowDeviceList();
#endif
#if Android

                Com.Evoyohome.Sphonelibs.Global.Global.OpenIntercomActivity(Application.Activity);
#endif
            };



            if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)

            {

@@ -424,8 +484,8 @@
                        //如果住宅为虚拟住宅,则此功能无效

                        return;

                    }

                    var form = new HdlBackup.HdlBackupListForm();

                    form.AddForm();

                    var form = new HdlBackup.HdlBackupListForm();
                    ; form.AddForm();

                };

            }



@@ -469,13 +529,8 @@
            btnAbountView.X -= ControlCommonResourse.XXLeft / 2;

            rowAbount.ButtonClickEvent += (sender, e) =>

            {

                if (Common.Config.Instance.Home.IsVirtually == true)

                {

                    //如果住宅为虚拟住宅,则此功能无效

                    return;

                }

                var form = new Abount.AbountForm();

                form.AddForm();

                form.AddForm(false);

            };



            if (UserCenterResourse.HideOption.CenterHideMenu == 1)