From f16fd06aa226e9f97a27858624d4ea7cf8975d25 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 07 五月 2024 17:24:38 +0800
Subject: [PATCH] 增加了萤石摄像头
---
HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs | 228 --------------------------------------------------------
1 files changed, 3 insertions(+), 225 deletions(-)
diff --git a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
index 222b3d4..f18aba5 100644
--- a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
@@ -7,8 +7,6 @@
using HDL_ON.Entity;
#if __IOS__
-using Shared.IOS.ESVideoOnSDK;
-using Shared.IOS.LCVideoOnSDK;
using UIKit;
using Foundation;
#else
@@ -79,41 +77,10 @@
int.TryParse(mESVideoInfo.roomno, out roomID);
#if __IOS__
- if (interphoneType == InterphoneType.IMOUVISIAL.ToString())
- {
- //涔愭鍙瀵硅
- //1.鍒濆鍖朙COpenSDK_Api(Shared.IOS.LCVideoOnSDK)
- LCApiKit.SharedInstance().IsChinaMainland = GetIsChinaMainland();
- LCApiKit.SharedInstance().InitSDKOpenApi(mESVideoInfo.Lc_AccessToken);
- LCApiKit.SharedInstance().CurrentDevicePlayToken = mESVideoInfo.Lc_PlayToken;
- LCApiKit.SharedInstance().CurrentDeviceId = mESVideoInfo.Lc_DeviceId;
- LCApiKit.SharedInstance().CurrentDeviceName = mESVideoInfo.DeviceName;
- LCApiKit.SharedInstance().CurrentPsk = mESVideoInfo.Lc_Psk;
- //2.璋冩暣鐩戣椤甸潰
- LCOnMonitorViewController vc = new LCOnMonitorViewController();
- mOnLCCallDelegate = new OnLCCallDelegate(this);
- vc.MLCCallDelegate = mOnLCCallDelegate;
- //vc.MLCCallDelegate = new OnLCCallDelegate(this);
- Shared.Application.currentVC.NavigationController.PushViewController(vc, true);
- }
- else if(interphoneType == InterphoneType.FLVI.ToString())
- {
- //Shared.IOS.ESVideoOnSDK
- ESOnMonitorViewController vc = new ESOnMonitorViewController();
- vc.MESVideoID = mESVideoInfo.ESVideoUUID;
- vc.MESRoomID = roomID;
- vc.DeviceName = mESVideoInfo.DeviceName;
- Shared.Application.currentVC.NavigationController.PushViewController(vc, true);
- }
- else if (interphoneType == InterphoneType.HDL.ToString())
+ if (interphoneType == InterphoneType.HDL.ToString())
{
//HDLLinphone 鐙勮�愬厠
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);
}
else
{
@@ -143,63 +110,11 @@
int roomID = 0;
int.TryParse(mESVideoInfo.roomno, out roomID);
#if __IOS__
- if (interphoneType == InterphoneType.IMOUVISIAL.ToString())
- {
- //涔愭鍙瀵硅
- //1.鍒濆鍖朙COpenSDK_Api(Shared.IOS.LCVideoOnSDK)
- LCApiKit.SharedInstance().IsChinaMainland = GetIsChinaMainland();
- LCApiKit.SharedInstance().InitSDKOpenApi(mESVideoInfo.Lc_AccessToken);
- //2021-05-18 鐩墠鎺ㄩ�佺殑PlayToken;鏈夐棶棰樹細瀵艰嚧SDK宕╂簝锛屾殏鏃朵笉浼�
- //LCApiKit.SharedInstance().CurrentDevicePlayToken = mESVideoInfo.Lc_PlayToken;
- LCApiKit.SharedInstance().CurrentDeviceId = mESVideoInfo.Lc_DeviceId;
- LCApiKit.SharedInstance().CurrentDeviceName = mESVideoInfo.DeviceName;
- LCApiKit.SharedInstance().CurrentPsk = mESVideoInfo.Lc_Psk;
- //2.璺宠浆涔愭鍛煎彨椤甸潰
- LCOnIntercomViewController vc = new LCOnIntercomViewController();
- mOnLCCallDelegate = new OnLCCallDelegate(this);
- vc.MLCCallDelegate = mOnLCCallDelegate;
- //vc.MLCCallDelegate = new OnLCCallDelegate(this);
- Shared.Application.currentVC.NavigationController.PushViewController(vc, true);
- }
- else if (interphoneType == InterphoneType.EZVIZ.ToString())
- {
- //钀ょ煶鐚溂鍛煎彨
- //鍒濆鍖栬悿鐭充簯SDK锛屼腑鏂囧浗鍐卥ey銆佽嫳鏂囨捣澶杒ey 寮�鍙戣�呰处鍙蜂娇鐢ㄥ簲鐢ㄥ寘鍚嶇敵璇风殑APPKEY锛屼笉鍚屽寘鍚嶅簲鐢ㄩ渶閰嶇疆涓嶅悓鐨凙PPKEY
- EZSDK.IOS.EZSDK.SharedInstance().InitLibWithAppKey("1aa98a90489b4838b966b57018b4b04b", "1aa98a90489b4838b966b57018b4b04b");
- //1.璁剧疆鎵�闇�娌充笢鐨凙ccessToken鍜孯efreshToken銆佸煙鍚嶅湴鍧�
- EZSDK.IOS.EZSDK.SharedInstance().SetHDlAccessToken(UserInfo.Current.LoginTokenString, UserInfo.Current.RefreshToken);
-
- EZSDK.IOS.EZSDK.SharedInstance().SetRequestHttpsHostAndPlatform(OnAppConfig.Instance.RequestHttpsHost, 1, mESVideoInfo.HomeId);
- //2.璁剧疆钀ょ煶瀛愯处鍙风殑AccessToken鍒癝DK
- EZSDK.IOS.EZSDK.SharedInstance().SetEZAccessToken(mESVideoInfo.Lc_AccessToken);
- //3.鎵撳紑瑙嗛鎾斁椤甸潰
- 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())
+ if (interphoneType == InterphoneType.HDL.ToString())
{
//HDL Linphone 鐙勮�愬厠
- }
- else if (interphoneType == InterphoneType.FLVI.ToString())
- {
- //Shared.IOS.ESVideoOnSDK
- ESOnIntercomViewController vc = new ESOnIntercomViewController();
- vc.MESVideoID = mESVideoInfo.ESVideoUUID;
- vc.MESRoomID = roomID;
- vc.DeviceName = mESVideoInfo.DeviceName;
- //vc.RoomName = mESVideoInfo.RoomName;
- //vc.MESCallDelegate = new OnESCallDelegate(this);
- mOnESCallDelegate = new OnESCallDelegate(this);
- vc.MESCallDelegate = mOnESCallDelegate;
- Shared.Application.currentVC.NavigationController.PushViewController(vc, true);
}
else{
HDLUtils.WriteLine("鏈敮鎸佺殑鍙瀵硅绫诲瀷");
@@ -473,148 +388,11 @@
#if __IOS__
#region OnESCallDelegate
- /////// <summary>
- /////// OnESCallDelegate 缁ф壙鍝嶅簲浜嬩欢(Shared.IOS.ESVideoOnSDK)
- /////// </summary>
- OnESCallDelegate mOnESCallDelegate;
-
- /// <summary>
- /// iOS鍘熺敓濮旀墭浜嬩欢
- /// </summary>
- public class OnESCallDelegate : ESCallDelegate
- {
- /// <summary>
- /// ESOnVideo
- /// </summary>
- [Weak] ESOnVideo _ESOnVideo;
-
- /// <summary>
- /// 鍒濆鍖�
- /// </summary>
- /// <param name="mESOnVideo">鍛煎彨鐩稿叧鐨勫弬鏁�</param>
- public OnESCallDelegate(ESOnVideo mESOnVideo)
- {
- _ESOnVideo = mESOnVideo;
- }
-
- /// <summary>
- /// 鎺ュ惉
- /// </summary>
- public override void OnAnswerAction()
- {
- _ESOnVideo.AnswerAction();
- }
-
- /// <summary>
- /// 鎸傛柇
- /// </summary>
- /// <param name="callDuration"></param>
- public override void OnHangUpAction(int callDuration)
- {
- _ESOnVideo.HangUpAction(callDuration);
- }
-
- /// <summary>
- /// 鎷掓帴
- /// </summary>
- public override void OnRejectCallAction()
- {
- _ESOnVideo.RejectCallAction();
- }
-
- /// <summary>
- /// 鎴浘鎴愬姛
- /// </summary>
- /// <param name="image"></param>
- public override void OnScreenshotSuccessfulAction(UIImage image)
- {
- //NSData imageData = UIImagePNGRepresentation(image); UIImage
- NSData imageData = image.AsPNG();
- byte[] dataBytes = new byte[imageData.Length];
- System.Runtime.InteropServices.Marshal.Copy(imageData.Bytes, dataBytes, 0, Convert.ToInt32(imageData.Length));
- //image.g
- _ESOnVideo.ScreenshotSuccessfulAction(dataBytes);
- }
-
- /// <summary>
- /// 寮�閿佹垚鍔�
- /// </summary>
- public override void OnUnlockAction()
- {
- _ESOnVideo.UnlockAction();
- }
-
- }
#endregion
#region OnLCCallDelegate
- /////// <summary>
- /////// OnLCCallDelegate 缁ф壙鍝嶅簲浜嬩欢(Shared.IOS.LCVideoOnSDK)
- /////// </summary>
- OnLCCallDelegate mOnLCCallDelegate;
- /// <summary>
- ///
- /// </summary>
- public class OnLCCallDelegate : LCCallDelegate
- {
-
- [Weak] ESOnVideo _ESOnVideo;
-
- public OnLCCallDelegate(ESOnVideo mESOnVideo)
- {
- _ESOnVideo = mESOnVideo;
- }
-
- /// <summary>
- /// 鎺ュ惉
- /// </summary>
- public override void OnAnswerAction()
- {
- _ESOnVideo.HDLUpdateCallStatus(CallStatusType.RECEIVED, InterphoneType.IMOUVISIAL);
- }
-
- /// <summary>
- /// 鎸傛柇
- /// </summary>
- /// <param name="callDuration"></param>
- public override void OnHangUpAction(int callDuration)
- {
- _ESOnVideo.HDLUpdateCallStatus(CallStatusType.RECEIVED, InterphoneType.IMOUVISIAL, callDuration);
- }
-
- /// <summary>
- /// 鎷掓帴
- /// </summary>
- public override void OnRejectCallAction()
- {
- _ESOnVideo.HDLUpdateCallStatus(CallStatusType.REJECT, InterphoneType.IMOUVISIAL);
- }
-
- /// <summary>
- /// 鎴浘鎴愬姛
- /// </summary>
- /// <param name="image"></param>
- public override void OnScreenshotSuccessfulAction(UIImage image)
- {
- ////NSData imageData = UIImagePNGRepresentation(image); UIImage
- //NSData imageData = image.AsPNG();
- //byte[] dataBytes = new byte[imageData.Length];
- //System.Runtime.InteropServices.Marshal.Copy(imageData.Bytes, dataBytes, 0, Convert.ToInt32(imageData.Length));
- ////image.g
- ////_ESOnVideo.ScreenshotSuccessfulAction(dataBytes);
- }
-
- /// <summary>
- /// 寮�閿佹垚鍔�
- /// </summary>
- public override void OnUnlockAction()
- {
- _ESOnVideo.HDLUnlockAction();
- }
-
- }
#endregion
@@ -778,6 +556,6 @@
/// 鐙勮�愬厠 HDL Linphone
/// </summary>
HDL,
-
+ EZVIZ,
}
}
--
Gitblit v1.8.0