From e66503d70f26a3109fbadf47abcb8ba31d619e3c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 10 三月 2023 16:56:03 +0800
Subject: [PATCH] 2023年03月10日16:56:00
---
HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs | 71 ++++++++++++++++++++++++++---------
1 files changed, 53 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
index 04910cd..d7f4105 100644
--- a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -65,7 +65,7 @@
/// false锛氭敹鍒版帹閫佸苟涓斿凡缁忔敹鍒皊ip鍛煎彨鎵嶈烦杞懠鍙〉闈�
/// true锛氬師鐢熸敹鍒板懠鍙┈涓婅烦杞懠鍙〉闈紝涓嶇瓑寰呮帹閫佽繃鏉�
/// </summary>
- bool IsAutoJumpCallView = false;
+ bool IsAutoJumpCallView = true;
/// <summary>
/// 鏄惁鍒濆鍖栦簡SDK
/// </summary>
@@ -108,25 +108,48 @@
#endif
}
-
/// <summary>
/// 璁剧疆sip鐧诲綍璐﹀彿
/// </summary>
/// <param name="mHDLSipInfo"></param>
- public void SetAccountAndLogin(HDLSipInfo mHDLSipInfo)
+ public void SetAccountAndLogin(HDLSipInfo mHDLSipInfo, string mInterphoneType)
{
this.currentHDLSipInfo = mHDLSipInfo;
- if (mHDLSipInfo == null) return;
+ if (mHDLSipInfo == null) {
+ //new alert
+ return;
+ }
+
+
#if __IOS__
+ //Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().Login("1003", "123456", "192.168.31.194:5060");
//Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().Login("6666", "85521566", "116.62.26.215:5060");
Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().Login(mHDLSipInfo.sipAccount, mHDLSipInfo.sipPasswd, mHDLSipInfo.realm);
#else
- HDLLinphoneKit.Instance.SetAccountAndLogin(mHDLSipInfo.sipAccount, mHDLSipInfo.sipPasswd, mHDLSipInfo.realm);
+ if (mInterphoneType == InterphoneType.FREEVIEW.ToString())
+ {
+ HDLLinphoneKit.Instance.SetAccountAndLogin(
+ mHDLSipInfo.sipAccount,
+ mHDLSipInfo.sipPasswd,
+ "139.159.157.75:47000",//mHDLSipInfo.realm,
+ "sip:139.159.157.75:47000;transport=udp",
+ HDLLinphoneKit.InterPhoneTypeFreeview
+ );
+ }
+ else
+ {
+ HDLLinphoneKit.Instance.SetAccountAndLogin(
+ mHDLSipInfo.sipAccount,
+ mHDLSipInfo.sipPasswd,
+ mHDLSipInfo.realm,
+ "sip:139.159.157.75:47000;transport=udp",
+ HDLLinphoneKit.InterPhoneTypeHdl
+ );
+ }
#endif
-
}
/// <summary>
@@ -197,28 +220,30 @@
/// 璇锋眰鏈嶅姟鍣ㄨ幏鍙栧綋鍓嶄綇瀹匰ip璐﹀彿淇℃伅骞跺垵濮嬪寲LinphoneSDK鍜岀櫥褰�
/// </summary>
/// <param name="homeId"></param>
- public void GetHDLSipInfoAndInitSDK(string homeId, bool clearCallInfo = true)
+ public void GetHDLSipInfoAndInitSDK(HDLCallVideoInfo mHDLCallVideoInfo, bool clearCallInfo = true)
{
try
{
-
-
//鍏堟竻绌哄懠鍙拰鐩戣璁惧淇℃伅
if (clearCallInfo)
{
InitCallInfo(null);
}
- HDLSipInfo mHDLSipInfo = GetHDLSipInfo(homeId);
+ HDLSipInfo mHDLSipInfo = GetHDLSipInfo(mHDLCallVideoInfo.HomeId);
if (mHDLSipInfo != null)
{
Application.RunOnMainThread(() =>
{
InitLinphone();
- mHDLSipInfo.homeId = homeId;
- SetAccountAndLogin(mHDLSipInfo);
+ mHDLSipInfo.homeId = mHDLCallVideoInfo.HomeId;
+ SetAccountAndLogin(mHDLSipInfo, mHDLCallVideoInfo.InterphoneType);
Utlis.WriteLine("CALL 鑾峰彇SIP璐﹀彿鎴愬姛锛�" + mHDLSipInfo.sipAccount);
});
+ }
+ else
+ {
+ new Alert("", $"鑾峰彇Sip璐﹀彿淇℃伅澶辫触.", "纭畾").Show();
}
}
catch { }
@@ -382,7 +407,7 @@
/// 璺宠浆鐩戞帶椤甸潰
/// </summary>
/// <param name="mESVideoInfo"></param>
- public void ShowESVideoMonitor(ESVideoInfo mESVideoInfo)
+ public void ShowESVideoMonitor(ESVideoInfo mESVideoInfo,string mInterphoneType)
{
InitLinphone();
//sip璐﹀彿涓虹┖
@@ -396,7 +421,7 @@
mHDLCallVideoInfo.HomeId = mESVideoInfo.HomeId;
mHDLCallVideoInfo.DeviceId = mESVideoInfo.Lc_DeviceId;
mHDLCallVideoInfo.DeviceName = mESVideoInfo.DeviceName;
- mHDLCallVideoInfo.InterphoneType = InterphoneType.HDL.ToString();
+ mHDLCallVideoInfo.InterphoneType = mInterphoneType;
mHDLCallVideoInfo.DeviceSipAccount = mESVideoInfo.deviceSipAccount;//鐩戣涓诲姩鍛煎彨闂ㄥ彛鏈烘椂鐢ㄥ埌
InitCallInfo(mHDLCallVideoInfo);
@@ -422,7 +447,7 @@
/// 鏀跺埌鎺ㄩ�侊紝鍚庡垽鏂懠鍙綇瀹呮槸鍚︿负褰撳墠浣忓畢锛屼笉鏄殑璇濋噸鏂拌幏鍙朣IP璐﹀彿骞剁櫥褰�
/// </summary>
/// <param name="mESVideoInfo"></param>
- public void ShowESVideoIntercom(ESVideoInfo mESVideoInfo)
+ public void ShowESVideoIntercom(ESVideoInfo mESVideoInfo,string mInterphoneType)
{
InitLinphone();
@@ -431,7 +456,7 @@
mHDLCallVideoInfo.HomeId = mESVideoInfo.HomeId;
mHDLCallVideoInfo.DeviceId = mESVideoInfo.Lc_DeviceId;
mHDLCallVideoInfo.DeviceName = mESVideoInfo.DeviceName;
- mHDLCallVideoInfo.InterphoneType = InterphoneType.HDL.ToString();
+ mHDLCallVideoInfo.InterphoneType = mInterphoneType;
mHDLCallVideoInfo.DeviceSipAccount = mESVideoInfo.deviceSipAccount;
mHDLCallVideoInfo.spk = mESVideoInfo.spk;
InitCallInfo(mHDLCallVideoInfo);
@@ -449,7 +474,7 @@
Utlis.WriteLine("CALL 鏀跺埌鎺ㄩ�� 鍏朵粬浣忓畢锛岄噸鏂拌幏鍙栧懠鍙綇瀹呯殑SIP璐﹀彿骞剁櫥褰�");
new Thread(() =>
{
- GetHDLSipInfoAndInitSDK(mESVideoInfo.HomeId, false);
+ GetHDLSipInfoAndInitSDK(mHDLCallVideoInfo, false);
})
{ IsBackground = false }.Start();
@@ -471,6 +496,15 @@
#if __IOS__
//鑷爺鍙瀵硅
HDLLinPhoneSDK.Instance().GotoHDLSRLinphoneIntercomVC(mHDLCallVideoInfo.DeviceName,mHDLCallVideoInfo.DeviceSipAccount);
+#else
+ var intent = new Intent(Shared.Application.Activity, typeof(Com.Hdl.Hdllinphonesdk.Activity.HDLLinphoneReverseCallActivity));
+ if (mHDLCallVideoInfo != null)
+ {
+ //intent.PutExtra(HDLLinphoneKit.KeyTitleName, mHDLCallVideoInfo.DeviceName);
+ intent.PutExtra("lpTitleName", mHDLCallVideoInfo.DeviceName);
+ intent.PutExtra("lpSipAccount", mHDLCallVideoInfo.DeviceSipAccount);
+ }
+ Shared.Application.Activity.StartActivity(intent);
#endif
}
else {
@@ -520,7 +554,8 @@
var intent = new Intent(Shared.Application.Activity, typeof(Com.Hdl.Hdllinphonesdk.Activity.HDLLinphoneIntercomActivity));
if (mHDLCallVideoInfo != null)
{
- intent.PutExtra(HDLLinphoneKit.KeyTitleName, mHDLCallVideoInfo.DeviceName);
+ //intent.PutExtra(HDLLinphoneKit.KeyTitleName, mHDLCallVideoInfo.DeviceName);
+ intent.PutExtra(HDLLinphoneKit.KeyTitleName, mHDLCallVideoInfo.CallId);
}
Shared.Application.Activity.StartActivity(intent);
#endif
--
Gitblit v1.8.0