From c53a46858f11e00490eb1b734402649536f0b7e2 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 11 六月 2024 14:19:13 +0800
Subject: [PATCH] 修复门锁呼叫问题
---
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs | 49 ++++++++++++++++++++++++++++++-------------------
1 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
index 8f6514e..916e915 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
@@ -52,6 +52,10 @@
this.InitializationAndroidData((isEzChildAccessToken) =>
{
+ if (!isEzChildAccessToken)
+ {
+ return;
+ }
this.SunThread(() =>
{
var list = this.GetVideoDoorLockLockModelsList("notAllowedConfigNetworkModels");
@@ -180,13 +184,19 @@
private void SkipRTVActivity(string deviceSerial, string deviceId, string spk, string msgId)
{
-#if __IOS__
//鎵撳紑钀ょ煶瑙嗛鐣岄潰
- EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(deviceSerial, deviceId, spk, msgId);
-
+ this.InitializationAndroidData((isBools) =>
+ {
+ this.MainThread(() =>
+ {
+#if __IOS__
+ EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(deviceSerial, deviceId, spk, msgId);
#else
- HDLEzvizSdk.Instance.JumpToEZRealPlayActivity(Application.Activity, deviceId, deviceSerial, spk, msgId);
+ HDLEzvizSdk.Instance.JumpToEZRealPlayActivity(Application.Activity, deviceId, deviceSerial, spk, msgId);
#endif
+ });
+ });
+
}
@@ -332,6 +342,7 @@
return lockModels.notAllowedConfigNetworkModels;
}
}
+
/// <summary>
/// 闂ㄩ攣鎺ㄩ��
/// </summary>
@@ -358,22 +369,21 @@
{
return;
}
- //if (jpushMessageInfo.messageType.Contains(PushMessageType.DOOR_BELL.ToString()))
- //{
- // ///鎵撳紑瑙嗛闂ㄩ攣
- // string currentTimeStr = Utlis.GetTimestamp(); // 褰撳墠鏃堕棿
+ if (jpushMessageInfo.messageType.Contains(PushMessageType.DOOR_BELL.ToString()))
+ {
+ ///鎵撳紑瑙嗛闂ㄩ攣
+ string currentTimeStr = Utlis.GetTimestamp(); // 褰撳墠鏃堕棿
- // if (string.IsNullOrEmpty(expantContent.currentTime) && string.IsNullOrEmpty(currentTimeStr) && (long.Parse(currentTimeStr) - long.Parse(expantContent.currentTime)) > 30000)
- // { // 瓒呮椂30s
- // this.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId, expantContent.spk, true);
- // }
- // else
- // {
- // this.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId, expantContent.spk, expantContent.msgId);
- // }
- //}
- //else
- if (jpushMessageInfo.messageType.Contains(PushMessageType.Alarm.ToString()))
+ if (string.IsNullOrEmpty(expantContent.currentTime) && string.IsNullOrEmpty(currentTimeStr) && (long.Parse(currentTimeStr) - long.Parse(expantContent.currentTime)) > 30000)
+ { // 瓒呮椂30s
+ this.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId, expantContent.spk, true);
+ }
+ else
+ {
+ this.SkipRTVActivity(expantContent.devSerial, expantContent.deviceId, expantContent.spk, expantContent.msgId);
+ }
+ }
+ else if (jpushMessageInfo.messageType.Contains(PushMessageType.Alarm.ToString()))
{
//浣庣數閲忔帹閫�
this.UpdateDoorLockState(PushMessageType.Alarm);
@@ -391,6 +401,7 @@
});
}
+
/// <summary>
/// 鏇存柊寮�閿佸浘鏍囧拰鐢垫睜鐘舵��
/// </summary>
--
Gitblit v1.8.0