From f703a411c0ebdf7ada490fda75b52fd839dae079 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 16 三月 2023 14:04:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-cqy（1.5.9）' into dev--wxr
---
HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
index 700f956..37fc391 100644
--- a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
@@ -98,7 +98,6 @@
}
else if(interphoneType == InterphoneType.FLVI.ToString())
{
-
ESOnMonitorViewController vc = new ESOnMonitorViewController();
vc.MESVideoID = mESVideoInfo.ESVideoUUID;
vc.MESRoomID = roomID;
@@ -106,13 +105,11 @@
//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, interphoneType);
- ////鍏ㄨ閫�
- //NSDictionary deviceInfo = new NSDictionary("deviceCode","3-1-11-2", "deviceName", mESVideoInfo.DeviceName);
- //Shared.IOS.HDLFVSDK.Video.Monitor(deviceInfo);
} else if (interphoneType == InterphoneType.FREEVIEW.ToString())
{
//鍏ㄨ閫氱洃瑙�
@@ -229,7 +226,6 @@
}
else if (interphoneType == InterphoneType.FLVI.ToString())
{
-
ESOnIntercomViewController vc = new ESOnIntercomViewController();
vc.MESVideoID = mESVideoInfo.ESVideoUUID;
vc.MESRoomID = roomID;
@@ -239,7 +235,8 @@
mOnESCallDelegate = new OnESCallDelegate(this);
vc.MESCallDelegate = mOnESCallDelegate;
Shared.Application.currentVC.NavigationController.PushViewController(vc, true);
- }else{
+ }
+ else{
HDLUtils.WriteLine("鏈敮鎸佺殑鍙瀵硅绫诲瀷");
}
--
Gitblit v1.8.0