临时备份

xm

2020-07-31 ecba45c93391066bc30c7bd602c3a7683fbb99a7

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

@@ -582,11 +582,13 @@
                {

                    //设定一个时间

                    Config.Instance.LoginDateTime = new DateTime(1970, 1, 1);

                    Config.Instance.Save();

                    //清空当前住宅id

                    Config.Instance.HomeId = string.Empty;

                    Config.Instance.Save();

                    //收起左菜单

                    CommonPage.Instance.CloseLeftMenu();

                    //关闭全部弹窗

                    ShowMsgControl.CloseAllMsgDialog();

                    //关闭所有打开了的界面

                    CloseAllOpenForm();



@@ -672,6 +674,8 @@
                }

                else if (view is UserView.UserPage)

                {

                    var form = ((UserView.UserPage)view).GetNowActionForm();

                    form?.FormActionAgainEvent();

                    return;

                }

                else

@@ -770,7 +774,7 @@
        public static bool InitUserCenterMenmoryAndThread(bool ShowPrompted = true)

        {

            //调用这个方法,都需要重新刷新主页

            UserView.UserPage.Instance.RefreshForm = true;

            UserView.UserPage.Instance.RefreshAllForm = true;



            //添加网络状态监听

            HdlWifiLogic.Current.StartListenNetWork();

@@ -792,6 +796,10 @@
            if (Common.Config.Instance.HomeId != UserCenterResourse.AccountOption.OldHomeStringId

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

            {

                //借用一下这个变量(检测能否广播到网关)

                UserCenterResourse.DicReceiveGatewayTest = new Dictionary<string, ZigBee.Device.ZbGateway>();

                UserCenterResourse.HideOption.CheckCanReceiveGateway = 1;



                //清空所有成员缓存

                ClearAllMemberMemory();



@@ -804,6 +812,9 @@
                //加载住宅配置信息

                UserCenterResourse.ResidenceOption = UserCenterResourse.ResidenceOption.Load();



                //预创建个人中心全部的文件夹

                HdlFileLogic.Current.CreatAllUserCenterDirectory();



                //初始化登陆账号的信息

                var hadNet = InitUserAccoutInfo(true);

                //如果有网络的话

@@ -814,8 +825,6 @@
                    //读取隐匿配置

                    HdlBackupLogic.Current.LoadHideOption();

                }

                //预创建个人中心全部的文件夹

                HdlFileLogic.Current.CreatAllUserCenterDirectory();



                //关闭所有接收

                HdlGatewayReceiveLogic.Current.RemoveAllEvent();

@@ -867,6 +876,36 @@
                }

                //显示引导界面

                ShowGuideForm(result);



                //关闭debug广播

                UserCenterResourse.HideOption.CheckCanReceiveGateway = 0;

                System.Threading.Thread.Sleep(30);

                if (hadNet == 1)

                {

                    try

                    {

                        bool canReceiveGw = false;

                        foreach (var gateway in UserCenterResourse.DicReceiveGatewayTest.Values)

                        {

                            if (gateway.HomeId == Config.Instance.Home.Id)

                            {

                                //能够搜索得到网关

                                canReceiveGw = true;

                                break;

                            }

                        }

                        UserCenterResourse.DicReceiveGatewayTest = null;

                        //设置远程连接的初始值

                        ZigBee.Device.ZbGateway.IsRemote = canReceiveGw == false;

                        if (canReceiveGw == false)

                        {

                            //如果是远程的话,追加等待时间

                            System.Threading.Thread.Sleep(1500);

                        }

                    }

                    catch { }

                }

                UserCenterResourse.DicReceiveGatewayTest = null;

            }

            //APP缓存加载完成

            UserCenterResourse.AccountOption.AppCanSignout = true;

@@ -1022,7 +1061,7 @@
            if (UserCenterResourse.UserInfo.HeadImage != null)

            {

                //写入头像内容

                Shared.IO.FileUtils.WriteFileByBytes(UserCenterResourse.UserInfo.UserIconFile, UserCenterResourse.UserInfo.HeadImage);

                HdlFileLogic.Current.SaveByteToFile(UserCenterResourse.UserInfo.UserIconFile, UserCenterResourse.UserInfo.HeadImage);

            }

            UserCenterResourse.UserInfo.HeadImage = null;

            //手势密码

@@ -1246,7 +1285,7 @@
        {

            try

            {

                if (strPsw == string.Empty)

                if (string.IsNullOrEmpty(strPsw) == true)

                {

                    return strPsw;

                }