From 0f19b35176d6ef1c17a98d942b3d629c46215213 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 25 七月 2023 17:57:39 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wxr-2.0
---
HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings | 2 +-
HDL-ON_iOS/Resources/en.lproj/Localizable.strings | 2 +-
HDL_ON/Common/HDLCommon.cs | 8 ++++++++
DLL/IOS/EZSDK.IOS.dll | 0
HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs | 16 +++++++++++++++-
5 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/DLL/IOS/EZSDK.IOS.dll b/DLL/IOS/EZSDK.IOS.dll
index 81c670a..caa6cde 100644
--- a/DLL/IOS/EZSDK.IOS.dll
+++ b/DLL/IOS/EZSDK.IOS.dll
Binary files differ
diff --git a/HDL-ON_iOS/Resources/en.lproj/Localizable.strings b/HDL-ON_iOS/Resources/en.lproj/Localizable.strings
index 7937614..0d5be5d 100644
--- a/HDL-ON_iOS/Resources/en.lproj/Localizable.strings
+++ b/HDL-ON_iOS/Resources/en.lproj/Localizable.strings
@@ -73,7 +73,7 @@
"device_open_success"="Success to open the door!";
"device_please_input_door_password"="Input the unlock password";
"device_history"="History";
-"device_his_no_more_data"="No more data";
+"device_his_no_more_data"="In the end";
"device_temp_pass"="Temporary password";
"device_temp_year"=".";
"device_temp_month"=".";
diff --git a/HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings b/HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings
index 01e9e45..2a5f549 100644
--- a/HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings
+++ b/HDL-ON_iOS/Resources/zh-Hans.lproj/Localizable.strings
@@ -85,7 +85,7 @@
"device_open_success"="寮�闂ㄦ垚鍔燂紒";
"device_please_input_door_password"="璇疯緭鍏ュ紑閿佸瘑鐮�";
"device_history"="鍘嗗彶璁板綍";
-"device_his_no_more_data"="娌℃湁鏇村鏁版嵁";
+"device_his_no_more_data"="鍒板簳鍟�";
"device_temp_pass"="涓存椂瀵嗙爜";
"device_temp_year"="骞�";
"device_temp_month"="鏈�";
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 472927b..24e612e 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -358,6 +358,14 @@
eSVideoInfo.Lc_AccessToken = json["subToken"].ToString();//"瀛愯处鍙穞oken
eSVideoInfo.DeviceSerial = json["devSerial"].ToString();//璁惧搴忓垪鍙�
eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
+ if (json.ContainsKey("msgId") && !string.IsNullOrEmpty(json["msgId"].ToString()))
+ {
+ eSVideoInfo.msgId = json["msgId"].ToString();
+ }
+ if (json.ContainsKey("currentTime") && !string.IsNullOrEmpty(json["currentTime"].ToString()))
+ {
+ eSVideoInfo.currentTime = json["currentTime"].ToString();
+ }
}
else if (interphoneTypeEnum == InterphoneType.HDL.ToString())
{
diff --git a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
index e583183..c67c196 100644
--- a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
@@ -213,8 +213,14 @@
//2.璁剧疆钀ょ煶瀛愯处鍙风殑AccessToken鍒癝DK
EZSDK.IOS.EZSDK.SharedInstance().SetEZAccessToken(mESVideoInfo.Lc_AccessToken);
//3.鎵撳紑瑙嗛鎾斁椤甸潰
- EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(mESVideoInfo.DeviceSerial);
+ string currentTimeStr = Utlis.GetTimestamp(); // 褰撳墠鏃堕棿
+ if (string.IsNullOrEmpty(mESVideoInfo.currentTime) && string.IsNullOrEmpty(currentTimeStr) && (long.Parse(currentTimeStr) - long.Parse(mESVideoInfo.currentTime)) > 30000) { // 瓒呮椂30s
+ EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(mESVideoInfo.DeviceSerial);
+ }
+ else {
+ EZSDK.IOS.EZSDK.SharedInstance().PlayWithDeviceSerial(mESVideoInfo.DeviceSerial, mESVideoInfo.msgId);
+ }
}
else if (interphoneType == InterphoneType.HDL.ToString())
{
@@ -816,6 +822,14 @@
/// 璁惧搴忓垪鍙�
/// </summary>
public string DeviceSerial = string.Empty;
+ /// <summary>
+ /// 鏈嶅姟鍣ㄦ帹閫佹椂闂�
+ /// </summary>
+ public string currentTime = string.Empty;
+ /// <summary>
+ /// 娑堟伅id
+ /// </summary>
+ public string msgId = string.Empty;
//========================HDL SIP==========================
/// <summary>
/// 璁惧sip璐﹀彿 interphoneType鏄疕DL鏃舵墠浼氭湁鍊�
--
Gitblit v1.8.0