From b5d11d4b592f2ee398d5174ad6e2e22f1db367e8 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 18 八月 2021 11:51:52 +0800
Subject: [PATCH] 2021-08-18 1.完善Android对接LinphoneSDK 2.完善SIP相关接口对接
---
HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs | 27 +++++++++++++++++++--------
HDL_ON/Common/HDLCommon.cs | 2 +-
.vs/HDL_APP_Project/xs/UserPrefs.xml | 11 +++++------
DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll | 0
HDL-ON_Android/Other/JPush/JPushReceiver.cs | 2 ++
5 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 9bbb04f..bee7b0d 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -2,8 +2,8 @@
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.08FD445C-3EE8-4ED2-BF28-B42ADD0DA92C" />
<MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs">
<Files>
- <File FileName="HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs" Line="173" Column="67" />
- <File FileName="HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/Common/HDLCommon.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs" Line="9" Column="16" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -16,11 +16,10 @@
<Node name="HDLLinphone.cs" selected="True" />
</Node>
</Node>
- <Node name="Entity" expanded="True" />
- <Node name="UI" expanded="True" />
</Node>
- <Node name="HDL-ON_Android" expanded="True" />
- <Node name="HDL-ON_iOS" expanded="True" />
+ <Node name="HDL-ON_Android" expanded="True">
+ <Node name="Packages" expanded="True" />
+ </Node>
</Node>
</State>
</Pad>
diff --git a/DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll b/DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll
index ec3c25f..1120984 100644
--- a/DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll
+++ b/DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll
Binary files differ
diff --git a/HDL-ON_Android/Other/JPush/JPushReceiver.cs b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
index 2116ed2..063eb47 100644
--- a/HDL-ON_Android/Other/JPush/JPushReceiver.cs
+++ b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
@@ -1,5 +1,6 @@
锘�
using System;
+using Android.App;
using Android.Content;
using CN.Jpush.Android.Api;
using CN.Jpush.Android.Service;
@@ -70,6 +71,7 @@
{
HDLCommon.Current.AdjustPushMessage(pushMes);
});
+
}
/// <summary>
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index c010d80..68b8800 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -307,7 +307,6 @@
//1.瑙嗗璁插巶瀹剁被鍨�
string interphoneTypeEnum = json["interphoneTypeEnum"].ToString();
if (string.IsNullOrEmpty(interphoneTypeEnum)) return;
- //
ESVideoInfo eSVideoInfo = new ESVideoInfo();// GetESOnVideoJson(jpushMessageInfo.expantContent);
//2.鏍规嵁鍙瀵硅鍘傚绫诲瀷锛屽鐞嗕笉鍚岀殑鏁版嵁
if (interphoneTypeEnum == InterphoneType.IMOUVISIAL.ToString())
@@ -337,6 +336,7 @@
eSVideoInfo.DeviceName = json["deviceName"].ToString();
eSVideoInfo.deviceSipAccount = json["deviceSipAccount"].ToString();
//ShowAlert("鐙勮�愬厠闂ㄥ彛鏈哄懠鍙�");
+ //鎵撳紑鍛煎彨椤甸潰
HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo);
return;
}
diff --git a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
index 347ddd6..6055281 100644
--- a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -6,6 +6,7 @@
using HDL_ON.DAL.Server;
using HDL_ON.Entity;
#if __Android__
+using Android.App;
using Android.Content;
using Android.Graphics;
using Android.Widget;
@@ -20,6 +21,8 @@
{
public HDLLinphone()
{
+ //鍒ゆ柇鏈夋病鏈夊垵濮嬪寲SDK锛屾病鍒濆鍖栬繃鍒濆鍖栦竴娆�
+ InitLinphone();
}
/// <summary>
@@ -110,12 +113,11 @@
/// <returns></returns>
bool CheckmHDLCallVideoInfoIsNullOrEmpty()
{
- //return false;
return (mHDLCallVideoInfo == null || string.IsNullOrEmpty(mHDLCallVideoInfo.CallId));
}
/// <summary>
- /// 鎴浘鎴愬姛
+ /// 鎴浘鎴愬姛 鏆傛椂搴熷純
/// </summary>
public void ScreenshotSuccessfulAction(byte[] dataBytes)
{
@@ -168,9 +170,9 @@
{
Dictionary<string, object> dic = new Dictionary<string, object>();
dic.Add("deviceId", mHDLCallVideoInfo.DeviceId);//璁惧id
- dic.Add("callId", mHDLCallVideoInfo.CallId);
- dic.Add("interphoneType", mHDLCallVideoInfo.InterphoneType);
- dic.Add("homeId", mHDLCallVideoInfo.HomeId);
+ dic.Add("callId", mHDLCallVideoInfo.CallId);//褰撳墠鍛煎彨id
+ dic.Add("interphoneType", mHDLCallVideoInfo.InterphoneType);//鍙瀵硅鍘傚绫诲瀷
+ dic.Add("homeId", mHDLCallVideoInfo.HomeId);//浣忓畢ID
var requestJson = HttpUtil.GetSignRequestJson(dic);
var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_VideoDevice_OpenDoorbell, requestJson);
@@ -199,7 +201,6 @@
}
#endif
-
});
@@ -220,7 +221,7 @@
Dictionary<string, object> dic = new Dictionary<string, object>();
dic.Add("callId", mHDLCallVideoInfo.CallId);//鍛煎彨id
dic.Add("callStatus", callStatusType.ToString());//鍙敤鍊�:MISSED,RECEIVED,REJECT
- dic.Add("interphoneTypeEnum", interphoneType.ToString());//鍙敤鍊�:FLVI,IMOUVISIAL
+ dic.Add("interphoneTypeEnum", interphoneType.ToString());
if (callStatusType == CallStatusType.RECEIVED && callDuration > 0)
{
dic.Add("callDuration", callDuration);//閫氳瘽鏃堕暱锛堢锛�
@@ -327,9 +328,11 @@
#if __IOS__
#else
+ //1.鍏堝懠鍙澶�
Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.CallTo(mHDLCallVideoInfo.DeviceSipAccount, true);
+ //2.璺宠浆鎵撳紑鐩戞帶椤甸潰
var intent = new Intent(Shared.Application.Activity, typeof(Com.Hdl.Hdllinphonesdk.Activity.HDLLinphoneMonitorActivity)); ;
- intent.PutExtra(HDLLinphoneKit.KeyTitleName, mHDLCallVideoInfo.DeviceName);
+ intent.PutExtra(HDLLinphoneKit.KeyTitleName, mHDLCallVideoInfo.DeviceName);//浼犲叆璁惧鍚嶇О涓烘樉绀烘爣棰�
Shared.Application.Activity.StartActivity(intent);
#endif
@@ -427,6 +430,14 @@
HDLLinphoneKit.Instance.OnHDLLinphoneCallListener = new HDLLinphoneCallListener(this);
}
+ /// <summary>
+ /// 娓呮閫氱煡鏍忔墍鏈夐�氱煡
+ /// </summary>
+ void CancelAllNotification() {
+ NotificationManager nMgr = (NotificationManager)Application.Activity.GetSystemService(Context.NotificationService);
+ nMgr.CancelAll();
+ }
+
#endif
#endregion
}
--
Gitblit v1.8.0