From f9181a9c8125136f597add7c30cb2ff508d54ba7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 17:34:32 +0800
Subject: [PATCH] 2024年07月25日17:33:40
---
HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs | 90 +++++++++++++++++++++++++++------------------
1 files changed, 54 insertions(+), 36 deletions(-)
diff --git a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
index dd1c235..c7174a6 100644
--- a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
@@ -82,7 +82,7 @@
if (interphoneType == InterphoneType.IMOUVISIAL.ToString())
{
//涔愭鍙瀵硅
- //1.鍒濆鍖朙COpenSDK_Api
+ //1.鍒濆鍖朙COpenSDK_Api(Shared.IOS.LCVideoOnSDK)
LCApiKit.SharedInstance().IsChinaMainland = GetIsChinaMainland();
LCApiKit.SharedInstance().InitSDKOpenApi(mESVideoInfo.Lc_AccessToken);
LCApiKit.SharedInstance().CurrentDevicePlayToken = mESVideoInfo.Lc_PlayToken;
@@ -98,27 +98,22 @@
}
else if(interphoneType == InterphoneType.FLVI.ToString())
{
-
+ //Shared.IOS.ESVideoOnSDK
ESOnMonitorViewController vc = new ESOnMonitorViewController();
vc.MESVideoID = mESVideoInfo.ESVideoUUID;
vc.MESRoomID = roomID;
vc.DeviceName = mESVideoInfo.DeviceName;
- //vc.RoomName = mESVideoInfo.RoomName;
- //vc.MESCallDelegate = new OnESCallDelegate(this);
Shared.Application.currentVC.NavigationController.PushViewController(vc, true);
- }else if (interphoneType == InterphoneType.HDL.ToString())
+ }
+ else if (interphoneType == InterphoneType.HDL.ToString())
{
//HDLLinphone 鐙勮�愬厠
- HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo);
- ////鍏ㄨ閫�
- //NSDictionary deviceInfo = new NSDictionary("deviceCode","3-1-11-2", "deviceName", mESVideoInfo.DeviceName);
- //Shared.IOS.HDLFVSDK.Video.Monitor(deviceInfo);
+ HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo, interphoneType);
} else if (interphoneType == InterphoneType.FREEVIEW.ToString())
{
//鍏ㄨ閫氱洃瑙�
- NSDictionary deviceInfo = new NSDictionary("deviceCode",mESVideoInfo.deviceCode, "deviceName", mESVideoInfo.DeviceName);
- Shared.IOS.HDLFVSDK.Video.Monitor(deviceInfo);
- //HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo);
+ //NSDictionary deviceInfo = new NSDictionary("deviceCode",mESVideoInfo.deviceCode, "deviceName", mESVideoInfo.DeviceName);
+ //Shared.IOS.HDLFVSDK.Video.Monitor(deviceInfo);
}
else
{
@@ -129,7 +124,7 @@
if (interphoneType == InterphoneType.IMOUVISIAL.ToString())
{
intent = new Intent(Shared.Application.Activity, typeof(HDL_ON_Android.LeChengVideoActivity));
-
+
//=========涔愭==========
intent.PutExtra("Type", 0);
intent.PutExtra("callId", mESVideoInfo.callId);
@@ -156,22 +151,26 @@
intent.PutExtra("callId", mESVideoInfo.callId);
intent.PutExtra("Type", 0);
-
+
Shared.Application.Activity.StartActivity(intent);
}
else if (interphoneType == InterphoneType.HDL.ToString())
{
//HDLLinphone 鐙勮�愬厠
- HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo);
+ HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo, InterphoneType.HDL.ToString());
+ }
+ else if (interphoneType == InterphoneType.FREEVIEW.ToString())
+ {
+ string sip_account = "sip:D" + mESVideoInfo.deviceCode + "@139.159.157.75:46000";
+
+ mESVideoInfo.deviceSipAccount = sip_account;
+ HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo, InterphoneType.FREEVIEW.ToString());
}
else
{
HDLUtils.WriteLine("鏈鎺ワ紝涓嶆敮鎸佺洃瑙�");
}
-
-
-
#endif
}
@@ -188,7 +187,7 @@
if (interphoneType == InterphoneType.IMOUVISIAL.ToString())
{
//涔愭鍙瀵硅
- //1.鍒濆鍖朙COpenSDK_Api
+ //1.鍒濆鍖朙COpenSDK_Api(Shared.IOS.LCVideoOnSDK)
LCApiKit.SharedInstance().IsChinaMainland = GetIsChinaMainland();
LCApiKit.SharedInstance().InitSDKOpenApi(mESVideoInfo.Lc_AccessToken);
//2021-05-18 鐩墠鎺ㄩ�佺殑PlayToken;鏈夐棶棰樹細瀵艰嚧SDK宕╂簝锛屾殏鏃朵笉浼�
@@ -215,8 +214,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())
{
@@ -226,7 +231,7 @@
}
else if (interphoneType == InterphoneType.FLVI.ToString())
{
-
+ //Shared.IOS.ESVideoOnSDK
ESOnIntercomViewController vc = new ESOnIntercomViewController();
vc.MESVideoID = mESVideoInfo.ESVideoUUID;
vc.MESRoomID = roomID;
@@ -236,7 +241,8 @@
mOnESCallDelegate = new OnESCallDelegate(this);
vc.MESCallDelegate = mOnESCallDelegate;
Shared.Application.currentVC.NavigationController.PushViewController(vc, true);
- }else{
+ }
+ else{
HDLUtils.WriteLine("鏈敮鎸佺殑鍙瀵硅绫诲瀷");
}
@@ -279,8 +285,21 @@
bundle.PutString("HomeId", mESVideoInfo.HomeId);
bundle.PutString("DeviceSerial", mESVideoInfo.DeviceSerial);
intent.PutExtras(bundle);
- intent.SetComponent(new Android.Content.ComponentName(Shared.Application.Activity, "com.videogo.MainActivity"));
- Shared.Application.Activity.StartActivity(intent);
+ //鑾峰彇钀ょ煶token锛屽垵濮嬪寲sdk
+ var result = new HttpServerRequest().EZGetChildToken();
+ if (result.Code == StateCode.SUCCESS)
+ {
+ var ezChildAccessToken = result.Data.ToString();
+
+ Com.Videogo.Hdl.HDLEzvizSdk.Instance.Init(Application.Activity.Application, ezChildAccessToken, UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken, OnAppConfig.Instance.RequestHttpsHost, "1aa98a90489b4838b966b57018b4b04b", 1, DB_ResidenceData.Instance.CurrentRegion.id,
+ HttpUtil.APP_KEY, HttpUtil.SECRET_KEY);
+
+ Com.Videogo.Hdl.HDLEzvizSdk.Instance.JumpToEZRealPlayActivity(Application.Activity,
+ mESVideoInfo.Lc_DeviceId, mESVideoInfo.DeviceSerial, mESVideoInfo.spk, mESVideoInfo.msgId);
+ }
+
+ //intent.SetComponent(new Android.Content.ComponentName(Shared.Application.Activity, "com.videogo.MainActivity"));
+ //Shared.Application.Activity.StartActivity(intent);
}
});
return;
@@ -305,21 +324,12 @@
intent.PutExtra("callId", mESVideoInfo.callId);
intent.PutExtra("Type", 1);
-
-
-
Shared.Application.Activity.StartActivity(intent);
}
else
{
HDLUtils.WriteLine("鏈敮鎸佺殑鍙瀵硅绫诲瀷");
-
}
-
-
-
-
-
#endregion
#endif
}
@@ -577,7 +587,7 @@
#if __IOS__
#region OnESCallDelegate
/////// <summary>
- /////// OnESCallDelegate 缁ф壙鍝嶅簲浜嬩欢
+ /////// OnESCallDelegate 缁ф壙鍝嶅簲浜嬩欢(Shared.IOS.ESVideoOnSDK)
/////// </summary>
OnESCallDelegate mOnESCallDelegate;
@@ -653,7 +663,7 @@
#region OnLCCallDelegate
/////// <summary>
- /////// OnLCCallDelegate 缁ф壙鍝嶅簲浜嬩欢
+ /////// OnLCCallDelegate 缁ф壙鍝嶅簲浜嬩欢(Shared.IOS.LCVideoOnSDK)
/////// </summary>
OnLCCallDelegate mOnLCCallDelegate;
@@ -721,7 +731,7 @@
#endregion
-
+
#endif
///// <summary>
@@ -826,6 +836,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