From 203c3a3ffde6259413d9743f6a723b95b1e7989c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 06 七月 2023 22:43:05 +0800
Subject: [PATCH] 门锁功能
---
HDL_ON/Common/HDLCommon.cs | 61 +++++++++++++++++++-----------
1 files changed, 38 insertions(+), 23 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 1e5d28d..2b9b99d 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -258,6 +258,8 @@
{
try
{
+ MainPage.Log($"鎺ユ敹鍒版帹閫�");
+
//Extras涓虹┖涓嶅鐞�
if (string.IsNullOrEmpty(jpushMessageInfo.Extras)) return;
@@ -275,10 +277,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 +389,16 @@
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)
@@ -440,6 +436,16 @@
/// </summary>
public void CheckLogout()
{
+#if __IOS__
+ try{
+ HDL_ON_iOS.AppDelegate.rootViewController.PopToRootViewController(false);
+ }catch(Exception ex){
+ MainPage.Log($"鍥炲埌璺熺被澶辫触:{ex.Message}");
+ }
+#else
+ //Application.Activity.StartActivity()
+#endif
+
//娴嬭瘯璐﹀彿锛屼笉鎸や笅绾�
switch (UserInfo.Current.AccountString)
{
@@ -454,7 +460,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,12 +489,14 @@
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.鍏ㄨ閫氱櫥鍑�
- Shared.IOS.HDLFVSDK.Video.Logout();
+ //Shared.IOS.HDLFVSDK.Video.Logout();
//6.娓呯┖Siri鍏变韩鏁版嵁淇℃伅
new Other.SkipControl().SetData(false, "", "", "", "");
var sDM = new SiriKit.SceneDateManager();
@@ -499,6 +513,7 @@
{
if (waitPage != null)
{
+ waitPage.Hide();
waitPage.RemoveFromParent();
waitPage = null;
}
@@ -589,9 +604,9 @@
}
- #endregion
+#endregion
- #region 鈻� 甯哥敤鏂规硶_______________________
+#region 鈻� 甯哥敤鏂规硶_______________________
/// <summary>
/// 璁剧疆涓嬪垝绾挎寜閽姸鎬�
/// 缁熶竴灏佽璁剧疆鏂规硶
@@ -666,9 +681,9 @@
Control.Ins.SearchLoaclGateway();
}
}
- #endregion
+#endregion
- #region 璺宠浆鎵撳紑钀ょ煶浜戞柟娉�
+#region 璺宠浆鎵撳紑钀ょ煶浜戞柟娉�
/// <summary>
/// 鑾峰彇瀛愯处鍙穞oken骞惰烦杞澶囧垪琛ㄩ〉闈�
@@ -789,6 +804,6 @@
{ IsBackground = true }.Start();
}
- #endregion
+#endregion
}
}
--
Gitblit v1.8.0