From 641277fdee9310c25c4891310d419131df7a5008 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 28 三月 2023 11:54:47 +0800
Subject: [PATCH] Merge branch 'dev-cqy（1.5.9）' of http://59.41.255.150:6688/r/~wxr/OnPro into dev-cqy（1.5.9）
---
HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
index 37fc391..ca12ddc 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,12 +98,11 @@
}
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())
@@ -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宕╂簝锛屾殏鏃朵笉浼�
@@ -226,6 +225,7 @@
}
else if (interphoneType == InterphoneType.FLVI.ToString())
{
+ //Shared.IOS.ESVideoOnSDK
ESOnIntercomViewController vc = new ESOnIntercomViewController();
vc.MESVideoID = mESVideoInfo.ESVideoUUID;
vc.MESRoomID = roomID;
@@ -568,7 +568,7 @@
#if __IOS__
#region OnESCallDelegate
/////// <summary>
- /////// OnESCallDelegate 缁ф壙鍝嶅簲浜嬩欢
+ /////// OnESCallDelegate 缁ф壙鍝嶅簲浜嬩欢(Shared.IOS.ESVideoOnSDK)
/////// </summary>
OnESCallDelegate mOnESCallDelegate;
@@ -644,7 +644,7 @@
#region OnLCCallDelegate
/////// <summary>
- /////// OnLCCallDelegate 缁ф壙鍝嶅簲浜嬩欢
+ /////// OnLCCallDelegate 缁ф壙鍝嶅簲浜嬩欢(Shared.IOS.LCVideoOnSDK)
/////// </summary>
OnLCCallDelegate mOnLCCallDelegate;
@@ -712,7 +712,7 @@
#endregion
-
+
#endif
///// <summary>
--
Gitblit v1.8.0