From c0c734d7a84cf7105401878ffc4b64cbb67621d1 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 01 十一月 2024 15:02:24 +0800
Subject: [PATCH] 更新极光Sdk531
---
HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs | 71 ++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 31 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
index 274ef64..916e915 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/CommonMethod.cs
@@ -47,11 +47,15 @@
/// android,ios婧愮敓娣诲姞璁惧鍒颁簯绔垚鍔熷悗鍥炶皟鏂规硶
/// 鍐嶈鍙栦簯绔殑涓婅悿鐭宠澶囧垪琛�
/// <paramref name="spk"/>spk</param>
- public void SkipAddDeviceActivity(string spk)
+ public void SkipAddDeviceActivity(string spk ,Action setAddCallback)
{
this.InitializationAndroidData((isEzChildAccessToken) =>
{
+ if (!isEzChildAccessToken)
+ {
+ return;
+ }
this.SunThread(() =>
{
var list = this.GetVideoDoorLockLockModelsList("notAllowedConfigNetworkModels");
@@ -77,15 +81,13 @@
#else
HDLEzvizSdk.Instance.JumpToEZScanActivity(Application.Activity, spk, list);
- HDLEzvizSdk.SetAddCallback(new
- AndroidIHdlInterface((isBool, serials) =>
- {
- if (isBool)
- {
- this.GetYingshiDeviceList(serials);
- }
-
- }));
+ HDLEzvizSdk.SetAddCallback(new AndroidIHdlInterface((isBool, serials) => {
+ if (isBool)
+ {
+ this.GetYingshiDeviceList(serials);
+ setAddCallback?.Invoke();
+ }
+ }));
#endif
});
@@ -182,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
+ });
+ });
+
}
@@ -334,6 +342,7 @@
return lockModels.notAllowedConfigNetworkModels;
}
}
+
/// <summary>
/// 闂ㄩ攣鎺ㄩ��
/// </summary>
@@ -360,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);
@@ -393,6 +401,7 @@
});
}
+
/// <summary>
/// 鏇存柊寮�閿佸浘鏍囧拰鐢垫睜鐘舵��
/// </summary>
@@ -420,12 +429,12 @@
/// <returns></returns>
public List<Function> GetVideoDoorLockList()
{
- //var list = FunctionList.List.GetVideoDoorLockList();
+ var list = FunctionList.List.GetVideoDoorLockList();
#if DEBUG
//list.Add(new Function { name = "瑙嗛闂ㄩ攣涓�", sid = "23456789", spk = SPK.VideoDoorLock });
//list.Add(new Function { name = "瑙嗛闂ㄩ攣浜�", sid = "2345678922", spk = SPK.VideoDoorLock });
#endif
- return new List<Function>();
+ return list;
}
#region --------- 鍔熻兘鏂囦欢淇濆瓨锛屽垹闄� --------
/// <summary>
--
Gitblit v1.8.0