From 56dfdc1bf7e7f2bb2456f29c3686dfa935a89e80 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期四, 30 六月 2022 13:59:45 +0800 Subject: [PATCH] 2022年06月30日13:59:08 --- HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs index 854604f..5a6cd33 100644 --- a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs +++ b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs @@ -117,6 +117,7 @@ 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 @@ -397,7 +398,10 @@ if (isCallIn) { +#if __IOS__ +#else HDLLinphoneKit.Instance.HangUp(); +#endif } else { @@ -431,10 +435,10 @@ } - #endregion +#endregion - #region 鈻� -- 璺宠浆鍛煎彨椤甸潰_______________________________ +#region 鈻� -- 璺宠浆鍛煎彨椤甸潰_______________________________ /// <summary> /// 鏀跺埌鎺ㄩ�侊紝鍚庡垽鏂懠鍙綇瀹呮槸鍚︿负褰撳墠浣忓畢锛屼笉鏄殑璇濋噸鏂拌幏鍙朣IP璐﹀彿骞剁櫥褰� /// </summary> @@ -452,6 +456,8 @@ mHDLCallVideoInfo.InterphoneType = InterphoneType.HDL.ToString(); mHDLCallVideoInfo.DeviceSipAccount = mESVideoInfo.deviceSipAccount; InitCallInfo(mHDLCallVideoInfo); + + if (isHdlLinphone) { @@ -535,7 +541,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 @@ -629,10 +636,10 @@ return checkIncomingCallThread == null || checkIncomingCallThread.ThreadState != ThreadState.Running; } - #endregion +#endregion - #region 鈻� -- Android鐩稿叧鎿嶄綔_______________________________ +#region 鈻� -- Android鐩稿叧鎿嶄綔_______________________________ #if __Android__ @@ -727,13 +734,13 @@ } #endif - #endregion +#endregion - #region 鈻� -- iOS鐩稿叧鎿嶄綔_______________________________ +#region 鈻� -- iOS鐩稿叧鎿嶄綔_______________________________ #if __IOS__ - #region OnHDLLinphoneCallDelegate +#region OnHDLLinphoneCallDelegate /// <summary> /// /// </summary> @@ -810,10 +817,10 @@ } - #endregion +#endregion #endif - #endregion +#endregion } -- Gitblit v1.8.0