From 1dfc4324f2ce375b79da1021e50417023e6b2da9 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 28 三月 2023 09:05:27 +0800
Subject: [PATCH] 备份
---
HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs | 37 ++++++++++++++-----------------------
1 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
index dd1c235..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);
- ////鍏ㄨ閫�
- //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())
{
//鍏ㄨ閫氱洃瑙�
@@ -129,7 +126,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 +153,25 @@
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
}
@@ -226,7 +226,6 @@
}
else if (interphoneType == InterphoneType.FLVI.ToString())
{
-
ESOnIntercomViewController vc = new ESOnIntercomViewController();
vc.MESVideoID = mESVideoInfo.ESVideoUUID;
vc.MESRoomID = roomID;
@@ -236,7 +235,8 @@
mOnESCallDelegate = new OnESCallDelegate(this);
vc.MESCallDelegate = mOnESCallDelegate;
Shared.Application.currentVC.NavigationController.PushViewController(vc, true);
- }else{
+ }
+ else{
HDLUtils.WriteLine("鏈敮鎸佺殑鍙瀵硅绫诲瀷");
}
@@ -305,21 +305,12 @@
intent.PutExtra("callId", mESVideoInfo.callId);
intent.PutExtra("Type", 1);
-
-
-
Shared.Application.Activity.StartActivity(intent);
}
else
{
HDLUtils.WriteLine("鏈敮鎸佺殑鍙瀵硅绫诲瀷");
-
}
-
-
-
-
-
#endregion
#endif
}
--
Gitblit v1.8.0