Merge branch 'CJL-NEW'

wxr

2020-12-09 d60b92c58ac09197642eb6dac9b905f0898dacb8

 HDL_ON/Common/HDLCommon.cs

@@ -245,20 +245,16 @@
        /// <param name="jpushMessageInfo"></param>
        public void AdjustPushMessage(JPushMessageInfo jpushMessageInfo)
        {
#if DEBUG
            return;
#endif
            try
            {
                if (jpushMessageInfo.Extras != null && jpushMessageInfo.Extras.Contains("OffLine"))
                {
                    Shared.Application.RunOnMainThread(() =>
                    {
                        
                        //账号在别处登陆，被踢下线 跳转到登录页面
                        new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show();
                        //2020-12-04 待增加退出登录操作
                        Logout();
                        //退出登录操作
                        CheckLogout();
                    });
                    return;
                }
@@ -269,7 +265,6 @@
                        new Alert(jpushMessageInfo.Title, jpushMessageInfo.Content, Language.StringByID(StringId.Close)).Show();
                    });
                    return;

                }
            }
            catch
@@ -281,24 +276,31 @@
        /// <summary>
        /// 退出登录操作
        /// </summary>
        public void Logout()
        public void CheckLogout()
        {
#if DEBUG
            return;
            try
            {
#endif
                //未登录不用处理
                if (!UserInfo.Current.IsLogin) return;

                Shared.Application.RunOnMainThread(() =>
            Logout();
        }

        /// <summary>
        /// 退出登录操作
        /// </summary>
        public void Logout()
                {
                    #region 保存本地数据至文件夹
                    string oldRegionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID.ToString());
                    new System.Threading.Thread(() =>
                    {
                        try
                        {
                            var backuplist = FileUtils.ReadFiles();
                    #region 保存本地数据至文件夹
                    string oldRegionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID.ToString());
                    //清空之前的住宅文件
                            FileUtils.DeleteRegionFiles(oldRegionRootPath);
                    var backuplist = FileUtils.ReadFiles();
                            //移动文件
                            foreach (var fileName in backuplist)
                            {
@@ -309,6 +311,7 @@
                                    MainPage.Log("move file : " + fileName);
                                }
                            }
                    #endregion
                        }
                        catch (Exception ex)
                        {
@@ -317,26 +320,21 @@
                        finally
                        {
                            FileUtils.DeleteAllFile();
                        }
                    }).Start();
                    #endregion

                    ////2.注销推送
                    //2.注销推送
                    new HttpServerRequest().SignOutPush();
                    //3.跳转登录页面
                    UserInfo.Current.LastTime = DateTime.MinValue;
                    UserInfo.Current.headImagePagePath = "LoginIcon/2.png";//重置用户头像
                    UserInfo.Current.SaveUserInfo();
                    Shared.Application.RunOnMainThread(() =>
                    {
                    MainPage.GoLoginPage(UserInfo.Current);
                    DB_ResidenceData.residenceData.EixtAccount();
                });
                }
            }).Start();
        }

            }
            catch (Exception ex)
            {
                MainPage.Log($"xxx:{ex.Message}");
            }
        }
        #endregion

    }