From c00da77d00a479fa5d022346a6d9075f90a5c087 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期六, 14 九月 2024 10:05:34 +0800
Subject: [PATCH] 退出登录时间调整，新风，音乐
---
HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs | 134 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 116 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
index 13c9e3c..4898a28 100644
--- a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -13,6 +13,7 @@
using Android.Widget;
using Com.Hdl.Hdllinphonesdk;
#else
+using Other;
using Foundation;
using UIKit;
using Shared.IOS.HDLLinphoneSDK;
@@ -124,18 +125,19 @@
+ //鐧诲綍sip鏈嶅姟鍣�
#if __IOS__
-
- Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().Login(mHDLSipInfo.sipAccount, mHDLSipInfo.sipPasswd, mHDLSipInfo.realm);
+ Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().Login(mHDLSipInfo.sipAccount, mHDLSipInfo.sipPasswd, mHDLSipInfo.realm,"UDP");
#else
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
+ mHDLSipInfo.realm,
+ //"sip:139.159.157.75:47000;transport=udp",
+ HDLLinphoneKit.InterPhoneTypeFreeview,
+ DB_ResidenceData.Instance.linphoneConnectType.ToString()
);
}
else
@@ -144,8 +146,10 @@
mHDLSipInfo.sipAccount,
mHDLSipInfo.sipPasswd,
mHDLSipInfo.realm,
- "sip:139.159.157.75:47000;transport=udp",
- HDLLinphoneKit.InterPhoneTypeHdl
+ //mHDLSipInfo.proxy+ ";transport=udp",
+ //"sip:139.159.157.75:47000;transport=udp",
+ HDLLinphoneKit.InterPhoneTypeHdl,
+ DB_ResidenceData.Instance.linphoneConnectType.ToString()
);
}
#endif
@@ -233,7 +237,7 @@
//鍏堟竻绌哄懠鍙拰鐩戣璁惧淇℃伅
if (clearCallInfo)
{
- InitCallInfo(null);
+ //InitCallInfo(null);//閫犳垚鎺ユ敹鍛煎彨鏃跺紑閿佸紑閿佸紓甯�
}
HDLSipInfo mHDLSipInfo = GetHDLSipInfo(mHDLCallVideoInfo.HomeId);
@@ -241,9 +245,22 @@
{
Application.RunOnMainThread(() =>
{
- InitLinphone();
+ try
+ {
+ InitLinphone();
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"InitLinphone exception : {ex.Message}");
+ }
mHDLSipInfo.homeId = mHDLCallVideoInfo.HomeId;
- SetAccountAndLogin(mHDLSipInfo, mHDLCallVideoInfo.InterphoneType);
+ try {
+ SetAccountAndLogin(mHDLSipInfo, mHDLCallVideoInfo.InterphoneType);
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"SetAccountAndLogin exception : {ex.Message}");
+ }
Utlis.WriteLine("CALL 鑾峰彇SIP璐﹀彿鎴愬姛锛�" + mHDLSipInfo.sipAccount);
});
}
@@ -324,7 +341,7 @@
#region 鈻� -- 鏂版帴鍚拰寮�閿佹帴鍙______________________________
/// <summary>
- /// 寮�閿�
+ /// 鍙瀵硅寮�閿�
/// </summary>
public void HDLUnlockAction()
{
@@ -344,6 +361,10 @@
Application.RunOnMainThread(() =>
{
+ if(revertObj == null)
+ {
+ return;
+ }
#if __IOS__
if (revertObj.Code == StateCode.SUCCESS)
@@ -408,9 +429,39 @@
{ IsBackground = false }.Start();
}
+ /// <summary>
+ /// 鎷掓帴锛堟寕娈垫墍鏈夊懠鍙級
+ /// </summary>
+ public void HDLRejectCallIn() {
+
+ if (CheckmHDLCallVideoInfoIsNullOrEmpty()) return;
+
+ new Thread(() =>
+ {
+ Dictionary<string, object> dic = new Dictionary<string, object>();
+ dic.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+ dic.Add("deviceId", mHDLCallVideoInfo.DeviceId);
+ dic.Add("interphoneType", "HDL");
+ dic.Add("callId", mHDLCallVideoInfo.CallId);//鍛煎彨id
+
+ var requestJson = HttpUtil.GetSignRequestJson(dic);
+ var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_VideoDevice_RejectCallIn, requestJson);
+ if (revertObj.Code == StateCode.SUCCESS)
+ {
+
+ }
+ else
+ {
+ Utlis.WriteLine("POST 鏇存柊鐘舵�佸け璐� code: " + revertObj.Code);
+ }
+
+ })
+ { IsBackground = false }.Start();
+ }
+
#endregion
-
+
#region 鈻� -- 璺宠浆鐩戞帶椤甸潰_______________________________
/// <summary>
/// 璺宠浆鐩戞帶椤甸潰
@@ -436,7 +487,13 @@
#if __IOS__
- Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().CallWithUserName(mHDLCallVideoInfo.DeviceSipAccount, mHDLCallVideoInfo.DeviceName);
+ if (mHDLCallVideoInfo.spk == "door.gate")
+ {
+ Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().CallHDLSRWithUserName(mHDLCallVideoInfo.DeviceSipAccount, mHDLCallVideoInfo.DeviceName);
+ }else{
+ Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().CallWithUserName(mHDLCallVideoInfo.DeviceSipAccount, mHDLCallVideoInfo.DeviceName);
+ }
+
#else
//1.鍏堝懠鍙澶�
@@ -458,6 +515,14 @@
/// <param name="mESVideoInfo"></param>
public void ShowESVideoIntercom(ESVideoInfo mESVideoInfo,string mInterphoneType)
{
+ if(this.mHDLCallVideoInfo != null)
+ {
+ if(this.mHDLCallVideoInfo.CallId == mESVideoInfo.callId)
+ {
+ return;
+ }
+ }
+
InitLinphone();
HDLCallVideoInfo mHDLCallVideoInfo = new HDLCallVideoInfo();
@@ -504,7 +569,7 @@
{
#if __IOS__
//鑷爺鍙瀵硅
- Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().GotoHDLSRLinphoneIntercomVC(mHDLCallVideoInfo.DeviceName, mHDLCallVideoInfo.DeviceSipAccount);
+ HDLLinPhoneSDK.Instance().GotoHDLSRLinphoneIntercomVC(mHDLCallVideoInfo.DeviceName, mHDLCallVideoInfo.DeviceSipAccount);
#else
var intent = new Intent(Shared.Application.Activity, typeof(Com.Hdl.Hdllinphonesdk.Activity.HDLLinphoneReverseCallActivity));
if (mHDLCallVideoInfo != null)
@@ -545,7 +610,7 @@
bool IsIncomingReceivedCallState()
{
#if __IOS__
- return Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().IsIncomingReceivedCallState;
+ return HDLLinPhoneSDK.Instance().IsIncomingReceivedCallState;
#else
return HDLLinphoneKit.Instance.IsIncomingReceivedCallState;
#endif
@@ -558,7 +623,8 @@
#if __IOS__
- Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().GotoHDLLinphoneIntercomVC(mHDLCallVideoInfo.DeviceName);
+
+ HDLLinPhoneSDK.Instance().GotoHDLLinphoneIntercomVC(mHDLCallVideoInfo.DeviceName);
#else
var intent = new Intent(Shared.Application.Activity, typeof(Com.Hdl.Hdllinphonesdk.Activity.HDLLinphoneIntercomActivity));
@@ -690,6 +756,7 @@
public void OnAnswerAction()
{
//showToast("鎺ュ惉");
+ HDLLinphoneKit.Instance.SetMediaPlayerLooping(false);
hdlLinphone.HDLUpdateCallStatus(CallStatusType.RECEIVED, InterphoneType.HDL);
}
/// <summary>
@@ -709,6 +776,7 @@
public void OnRejectCallAction()
{
//showToast("鎷掓帴");
+ HDLLinphoneKit.Instance.SetMediaPlayerLooping(false);
hdlLinphone.HDLUpdateCallStatus(CallStatusType.REJECT, InterphoneType.HDL);
}
@@ -736,6 +804,23 @@
public void OnIncomingCall(string userName)
{
Utlis.WriteLine("OnIncomingCall :" + userName);
+ }
+
+ /// <summary>
+ /// 鎷掓帴浜嬩欢
+ /// 鍏ㄩ儴鎸傛柇
+ /// </summary>
+ public void OnCallAllRejection()
+ {
+ HDLLinphoneKit.Instance.SetMediaPlayerLooping(false);
+ hdlLinphone.HDLUpdateCallStatus(CallStatusType.REJECT, InterphoneType.HDL);
+ hdlLinphone.HDLRejectCallIn();
+ }
+
+ public void OnMissedCallsAction()
+ {
+ HDLLinphoneKit.Instance.SetMediaPlayerLooping(false);
+ hdlLinphone.HDLUpdateCallStatus(CallStatusType.MISSED, InterphoneType.HDL);
}
}
@@ -786,6 +871,7 @@
/// </summary>
public override void OnAnswerAction()
{
+ Other.SoundPlayer.Ins.StopSound();
hdlLinphone.HDLUpdateCallStatus(CallStatusType.RECEIVED, InterphoneType.HDL);
}
@@ -803,6 +889,8 @@
/// </summary>
public override void OnRejectCallAction()
{
+ MainPage.Log("iOS 鍏ㄩ儴鎷掓帴");
+ Other.SoundPlayer.Ins.StopSound();
hdlLinphone.HDLUpdateCallStatus(CallStatusType.REJECT, InterphoneType.HDL);
}
@@ -810,7 +898,7 @@
/// 鎴浘鎴愬姛
/// </summary>
/// <param name = "image" ></ param >
- public void OnScreenshotSuccessfulAction(UIImage image)
+ public override void OnScreenshotSuccessfulAction(UIImage image)
{
//NSData imageData = UIImagePNGRepresentation(image); UIImage
NSData imageData = image.AsPNG();
@@ -836,8 +924,18 @@
Utlis.WriteLine("OnIncomingCall :" + userName);
}
+ public override void OnRejectAllCallAction()
+ {
+ MainPage.Log("iOS 鍏ㄩ儴鎷掓帴");
+ Other.SoundPlayer.Ins.StopSound();
+ hdlLinphone.HDLUpdateCallStatus(CallStatusType.REJECT, InterphoneType.HDL);
+ hdlLinphone.HDLRejectCallIn();
+ }
-
+ //public override void OnScreenshotSuccessfulAction(UIImage image)
+ //{
+ // throw new NotImplementedException();
+ //}
}
#endregion
--
Gitblit v1.8.0