From 23bbed132eea46eef51c6d01c21b346238e29ee2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 六月 2022 13:39:12 +0800
Subject: [PATCH] Merge branch 'wxr0114' into V1.5.9
---
HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs | 52 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 34 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
index 016de0c..37eb371 100644
--- a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
@@ -109,7 +109,16 @@
}else if (interphoneType == InterphoneType.HDL.ToString())
{
//HDLLinphone 鐙勮�愬厠
- HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo,false);
+ HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo);
+ ////鍏ㄨ閫�
+ //NSDictionary deviceInfo = new NSDictionary("deviceCode","3-1-11-2", "deviceName", mESVideoInfo.DeviceName);
+ //Shared.IOS.HDLFVSDK.Video.Monitor(deviceInfo);
+ } 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);
}
else
{
@@ -120,7 +129,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);
@@ -147,24 +156,27 @@
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,false);
+ 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
- }
+ }
/// <summary>
/// 琚懠鍙〉闈�
@@ -296,21 +308,12 @@
intent.PutExtra("callId", mESVideoInfo.callId);
intent.PutExtra("Type", 1);
-
-
-
Shared.Application.Activity.StartActivity(intent);
}
else
{
HDLUtils.WriteLine("鏈敮鎸佺殑鍙瀵硅绫诲瀷");
-
}
-
-
-
-
-
#endregion
#endif
}
@@ -822,6 +825,16 @@
/// 璁惧sip璐﹀彿 interphoneType鏄疕DL鏃舵墠浼氭湁鍊�
/// </summary>
public string deviceSipAccount;
+ /// <summary>
+ /// spk
+ /// </summary>
+ public string spk="";
+
+ //========================鍏ㄨ閫�==========================
+ /// <summary>
+ /// 璁惧缂栧彿锛岀浉褰撲簬鍏ㄨ閫氱殑LocalDirectory瀛楁
+ /// </summary>
+ public string deviceCode;
}
@@ -865,7 +878,10 @@
/// 鐙勮�愬厠 HDL Linphone
/// </summary>
HDL,
-
+ /// <summary>
+ /// 鍏ㄨ閫氬璁�
+ /// </summary>
+ FREEVIEW,
}
}
--
Gitblit v1.8.0