同步了全部的代码

黄学彪

2019-11-18 16604a593202f2f87adf71abd57d036fe7da3b52

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs

@@ -649,27 +649,22 @@
        /// </summary>

        public static void CloseAllOpenForm()

        {

            var listForm = new List<CommonFormBase>();

            var listId = new List<string>();

            foreach (CommonFormBase form in UserCenterResourse.DicActionForm.Values)

            while (UserView.HomePage.Instance.ChildrenCount > 0)

            {

                if (form.FormID != "UserMainForm")

                var view = UserView.HomePage.Instance.GetChildren(UserView.HomePage.Instance.ChildrenCount - 1);

                if (view is CommonFormBase)

                {

                    listForm.Insert(0, form);

                    listId.Add(form.FormID);

                    ((CommonFormBase)view).CloseForm();

                }

                else if (view is UserView.UserPage)

                {

                    break;

                }

                else

                {

                    view.RemoveFromParent();

                }

            }

            foreach (var id in listId)

            {

                UserCenterResourse.DicActionForm.Remove(id);

            }



            //关闭所有画面

            foreach (CommonFormBase form in listForm)

            {

                form.CloseForm();

            }

            listForm.Clear();

        }



        #endregion

@@ -791,9 +786,6 @@
            //APP缓存加载开始

            UserCenterResourse.Option.AppCanSignout = false;



            //强制指定不关闭进度条

            ProgressBar.SetCloseBarFlag(true);



            //只有在住宅ID不一样的时候才做这个操作

            if (Common.Config.Instance.HomeId != UserCenterResourse.Option.OldHomeStringId

                || Common.Config.Instance.Account != UserCenterResourse.Option.OldAccountId)

@@ -851,9 +843,6 @@
                //刷新APP前一次选择的网关ID(可以反复调用,需要在网关初始化完了之后才能调用)

                HdlGatewayLogic.Current.RefreshAppOldSelectGatewayId();



                //清空强制指定文本的附加信息

                ProgressBar.SetAppendText(string.Empty);



                //0:已经同步过，不需要同步,这个时候需要提示备份

                //if (result == 0)

                //{

@@ -861,9 +850,6 @@
                //    HdlAutoBackupLogic.ShowAutoBackupPromptedForm();

                //}

            }



            //恢复可关闭进度条

            ProgressBar.SetCloseBarFlag(false);

            //APP缓存加载完成

            UserCenterResourse.Option.AppCanSignout = true;



@@ -1027,9 +1013,9 @@
            Config.Instance.AdminRequestBaseUrl = string.Empty;

            Config.Instance.AdminRequestToken = string.Empty;



            if (UserCenterResourse.UserInfo.AuthorityNo != 2)

            if (UserCenterResourse.UserInfo.AuthorityNo != 2 && UserCenterResourse.UserInfo.AuthorityNo != 3)

            {

                //拥有管理员权限的成员才能这样搞,  这里必须是2

                //时代变了,这里管理员和成员都能调用

                return true;

            }

            var pra = new