From 641277fdee9310c25c4891310d419131df7a5008 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 28 三月 2023 11:54:47 +0800
Subject: [PATCH] Merge branch 'dev-cqy（1.5.9）' of http://59.41.255.150:6688/r/~wxr/OnPro into dev-cqy（1.5.9）
---
HDL_ON/Common/HDLCommon.cs | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index afe7b93..befc921 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -386,6 +386,21 @@
{
ShowAlarmPushMessage(jpushMessageInfo, false);
}
+ 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 { }
+ }
}
}
catch (Exception EX)
@@ -687,8 +702,8 @@
EZSDK.IOS.EZSDK.SharedInstance().SetRequestHttpsHostAndPlatform(OnAppConfig.Instance.RequestHttpsHost, 1, DB_ResidenceData.Instance.CurrentRegion.id);
//2.璁剧疆钀ょ煶瀛愯处鍙风殑AccessToken鍒癝DK
EZSDK.IOS.EZSDK.SharedInstance().SetEZAccessToken(ezChildAccessToken);
- //Console.WriteLine("loginToken锛�" + UserInfo.Current.LoginTokenString);
- //Console.WriteLine("refreshToken锛�" + UserInfo.Current.RefreshToken);
+ Console.WriteLine("loginToken锛�" + UserInfo.Current.LoginTokenString);
+ Console.WriteLine("refreshToken锛�" + UserInfo.Current.RefreshToken);
////3.鎵撳紑鎽勫儚澶磋澶囧垪琛ㄩ〉闈�
--
Gitblit v1.8.0