From b1b3f47f3eeff8536b1a2851781da0b04f346fef Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 18 五月 2022 16:04:14 +0800
Subject: [PATCH] Merge branch 'wxr1215' into dev
---
HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
index 0965c39..9d359ea 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);
+ HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo,false);
+ ////鍏ㄨ閫�
+ //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
{
@@ -154,7 +163,7 @@
else if (interphoneType == InterphoneType.HDL.ToString())
{
//HDLLinphone 鐙勮�愬厠
- HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo);
+ HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo,false);
}
else
{
@@ -164,7 +173,7 @@
#endif
- }
+ }
/// <summary>
/// 琚懠鍙〉闈�
@@ -822,6 +831,16 @@
/// 璁惧sip璐﹀彿 interphoneType鏄疕DL鏃舵墠浼氭湁鍊�
/// </summary>
public string deviceSipAccount;
+ /// <summary>
+ /// spk
+ /// </summary>
+ public string spk="";
+
+ //========================鍏ㄨ閫�==========================
+ /// <summary>
+ /// 璁惧缂栧彿锛岀浉褰撲簬鍏ㄨ閫氱殑LocalDirectory瀛楁
+ /// </summary>
+ public string deviceCode;
}
@@ -865,7 +884,10 @@
/// 鐙勮�愬厠 HDL Linphone
/// </summary>
HDL,
-
+ /// <summary>
+ /// 鍏ㄨ閫氬璁�
+ /// </summary>
+ FREEVIEW,
}
}
--
Gitblit v1.8.0