From cda315b3a19919cae922bdbe96bc20eab4e29fcc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 六月 2022 18:03:24 +0800
Subject: [PATCH] 版本合并冲突修改
---
HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
index f05d092..c2af0dd 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>
@@ -120,19 +120,18 @@
if (mHDLSipInfo == null) 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
if (mInterphoneType == InterphoneType.FREEVIEW.ToString())
{
- //HDLLinphoneKit.Instance.SetAccountAndLogin(
- // mHDLSipInfo.sipAccount,
- // mHDLSipInfo.sipPasswd,
- // mHDLSipInfo.realm,
- // HDLLinphoneKit.InterPhoneTypeFreeview
- // );
-
- HDLLinphoneKit.Instance.SetAccountAndLogin("A583853817423247", "763548", "139.159.157.75:46000", HDLLinphoneKit.InterPhoneTypeFreeview);
+ HDLLinphoneKit.Instance.SetAccountAndLogin(
+ mHDLSipInfo.sipAccount,
+ mHDLSipInfo.sipPasswd,
+ "139.159.157.75:46000",
+ HDLLinphoneKit.InterPhoneTypeFreeview
+ );
}
else
{
@@ -143,7 +142,6 @@
HDLLinphoneKit.InterPhoneTypeHdl
);
}
- // "A583853817423247","763548","139.159.157.75:46000",
#endif
}
@@ -487,6 +485,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 {
@@ -536,7 +543,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