From 7ee9224f4779efc78bfc8130e518e7d123864d47 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 11 四月 2023 11:42:38 +0800
Subject: [PATCH] 修复退出登录，挤下线卡死问题
---
HDL_ON/Common/HDLCommon.cs | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 1e5d28d..42a0b9a 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -275,10 +275,10 @@
//鎶ヨ鎺ㄩ�佹墠寮圭獥鎻愮ず锛坢essageType鍖呭惈Alarm鍏抽敭瀛楃殑锛�
if (jpushMessageInfo.messageType.Contains(PushMessageType.Alarm.ToString()))
{
- //钀ょ煶闂ㄩ攣鏇存柊寮�閿佸浘鏍�
- HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.UpdateDoorLockState(PushMessageType.Alarm, jpushMessageInfo.HomeId, jpushMessageInfo.spk, jpushMessageInfo.Extras);
- //鎶ヨ鎺ㄩ�佸脊绐楁彁绀�
- ShowAlarmPushMessage(jpushMessageInfo, true);
+ //鎶ヨ鎺ㄩ�佸脊绐楁彁绀�
+ ShowAlarmPushMessage(jpushMessageInfo, true);
+ //钀ょ煶闂ㄩ攣鎺ㄩ��
+ HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
}
else if (jpushMessageInfo.messageType.Contains(PushMessageType.FLCall.ToString()))
{
@@ -387,22 +387,15 @@
else if (jpushMessageInfo.messageType.Contains(PushMessageType.Prompt.ToString()))
{
ShowAlarmPushMessage(jpushMessageInfo, false);
+ //钀ょ煶闂ㄩ攣鎺ㄩ��
+ HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
}
else if (jpushMessageInfo.messageType.Contains(PushMessageType.DOOR_BELL.ToString()))
{
- try
- {
- if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
- var expantContent = Newtonsoft.Json.JsonConvert.DeserializeObject<UI.UI2.FuntionControlView.VideoDoorLock.ExpantContent>(jpushMessageInfo.expantContent);
- if (expantContent == null)
- {
- return;
- }
- ///瑙嗛闂ㄩ攣
- HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId, expantContent.spk, true);
- }
- catch { }
+ //钀ょ煶闂ㄩ攣鎺ㄩ��
+ HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.DoorLockPush(jpushMessageInfo);
}
+
}
}
catch (Exception EX)
@@ -454,7 +447,13 @@
//璐﹀彿鍦ㄥ埆澶勭櫥闄嗭紝琚涪涓嬬嚎 璺宠浆鍒扮櫥褰曢〉闈�
new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show();
- Logout();
+ try
+ {
+ Logout();
+ }catch (Exception ex)
+ {
+ MainPage.Log($"鎸や笅绾垮紓甯�:{ex.Message}");
+ }
}
/// <summary>
@@ -477,8 +476,10 @@
UserInfo.Current.LastTime = DateTime.MinValue;
UserInfo.Current.SaveUserInfo();
DB_ResidenceData.Instance.EixtAccount();
+ MainPage.Log("閫�鍑鸿处鍙锋竻绌烘暟鎹�");
//4.娉ㄩ攢HDLSIP璐﹀彿鐧诲綍 2021-08-20
HDLLinphone.Current.LogoutAllAccount();
+ MainPage.Log("娉ㄩ攢HDLSIP璐﹀彿鐧诲綍");
#if __IOS__
//5.鍏ㄨ閫氱櫥鍑�
@@ -499,6 +500,7 @@
{
if (waitPage != null)
{
+ waitPage.Hide();
waitPage.RemoveFromParent();
waitPage = null;
}
--
Gitblit v1.8.0