wxr
2024-09-24 691dbe24f5724f153e07947c7b75bdfea5f0b6d5
HDL_ON/Common/HDLCommon.cs
@@ -537,20 +537,25 @@
            switch (UserInfo.Current.AccountString)
            {
                case "464027401@qq.com":
                case "649362315@qq.com":
                case "13580507523":
                case "15626203746":
                case "18316672920":
                    
                    return;
            }
            //未登录不用处理
            if (!UserInfo.Current.IsLogin) return;
            //账号在别处登陆,被踢下线 跳转到登录页面
            new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show();
            //if (!UserInfo.Current.IsLogin) return;
            try
            {
                Application.RunOnMainThread(() =>
                {
                    //账号在别处登陆,被踢下线 跳转到登录页面
                    new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show();
                });
            }
            catch (Exception ex)
            {
                MainPage.Log("Error", $"挤下线提示窗口异常:{ex.StackTrace}");
            }
            try
            {
                Logout();
@@ -581,8 +586,10 @@
                            //2.注销推送
                            new HttpServerRequest().SignOutPush();
                            //3.跳转登录页面
                            UserInfo.Current.LastTime = DateTime.MinValue;
                            UserInfo.Current.ValidToken = false;
                            UserInfo.Current.SaveUserInfo();
                            OnAppConfig.Instance.LastLoginUserId = "";
                            OnAppConfig.Instance.SaveConfig();
                            DB_ResidenceData.Instance.EixtAccount();
                            MainPage.Log("退出账号清空数据");
                            //4.注销HDLSIP账号登录 2021-08-20
@@ -595,7 +602,7 @@
                            //6.清空Siri共享数据信息
                            new Other.SkipControl().SetData(false, "", "", "", "");
                            var sDM = new SiriKit.SceneDateManager();
                            Console.WriteLine($"IsLogin:{sDM.IsLgoin};accessToken:{sDM.AccessToken};refreshToken:{sDM.RefreshToken};RegionUrl:{sDM.RegionUrl};HomeId:{sDM.HomeId}");
                            //Console.WriteLine($"IsLogin:{sDM.IsLgoin};accessToken:{sDM.AccessToken};refreshToken:{sDM.RefreshToken};RegionUrl:{sDM.RegionUrl};HomeId:{sDM.HomeId}");
#endif
                        }
                        catch (Exception ex)
@@ -636,7 +643,7 @@
        public void ShowAlarmPushMessage(JPushMessageInfo jpushMessageInfo, bool isAlarm)
        {
            //没登录不处理
            if (UserInfo.Current == null || !UserInfo.Current.IsLogin || MainPage.BasePageView == null)
            if (UserInfo.Current == null || MainPage.BasePageView == null)
            {
                return;
            }