From bca03b5f891af5966a06b1ecd00f6cd573659ce6 Mon Sep 17 00:00:00 2001
From: panlili2024 <14743743+panlili2024@user.noreply.gitee.com>
Date: 星期四, 27 二月 2025 14:34:21 +0800
Subject: [PATCH] 兼容安卓14
---
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneMonitorActivity.java | 8 +++++++-
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneIntercomActivity.java | 6 +++++-
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneReverseCallActivity.java | 6 +++++-
HDLLinphoneSDKDemoNew/HDLLinphoneSDK/build.gradle | 10 +++++-----
HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/MainActivity.java | 7 ++++---
HDLLinphoneSDKDemoNew/app/build.gradle | 4 ++--
6 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/build.gradle b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/build.gradle
index 934f42e..65e19a6 100644
--- a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/build.gradle
+++ b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/build.gradle
@@ -4,14 +4,14 @@
apply plugin: 'com.kezong.fat-aar'
android {
- compileSdkVersion 31
- buildToolsVersion "28.0.0"
+ compileSdkVersion 33
+ //buildToolsVersion "28.0.0"
defaultConfig {
minSdkVersion 23
- targetSdkVersion 31
- versionCode 5
- versionName "1.0.7"
+ targetSdkVersion 34
+ versionCode 6
+ versionName "1.0.8"
ndk {
abiFilters 'arm64-v8a'
diff --git a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneIntercomActivity.java b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneIntercomActivity.java
index d5aa789..ada857e 100644
--- a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneIntercomActivity.java
+++ b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneIntercomActivity.java
@@ -178,7 +178,11 @@
callFilter = new IntentFilter();
callFilter.addAction("com.hdl.homepro.call.action");
callBroadcastReceiver = new CallBroadcastReceiver();
- registerReceiver(callBroadcastReceiver, callFilter);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ registerReceiver(callBroadcastReceiver, callFilter, RECEIVER_EXPORTED);
+ } else {
+ registerReceiver(callBroadcastReceiver, callFilter);
+ }
if (callBroadcastReceiver != null) {
String finalInterphoneType = interphoneType;
diff --git a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneMonitorActivity.java b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneMonitorActivity.java
index a339f9c..29d713a 100644
--- a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneMonitorActivity.java
+++ b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneMonitorActivity.java
@@ -5,6 +5,7 @@
import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.graphics.Bitmap;
+import android.os.Build;
import android.os.Bundle;
import android.os.CountDownTimer;
import android.support.annotation.NonNull;
@@ -140,7 +141,11 @@
callFilter = new IntentFilter();
callFilter.addAction("com.hdl.homepro.call.action");
callBroadcastReceiver = new CallBroadcastReceiver();
- registerReceiver(callBroadcastReceiver, callFilter);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ registerReceiver(callBroadcastReceiver, callFilter, RECEIVER_EXPORTED);
+ } else {
+ registerReceiver(callBroadcastReceiver, callFilter);
+ }
if (callBroadcastReceiver != null) {
String finalInterphoneType = interphoneType;
@@ -388,6 +393,7 @@
Core core = HDLLinphoneKit.getInstance().getCore();
if (core != null) {
core.removeListener(mCoreListener);
+ Log.d("panlili", "HDLLinphoneMonitorActivity.java:onDestroyLinphone----->removeListener ");
core.setNativeVideoWindowId(null);
core.setNativePreviewWindowId(null);
}
diff --git a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneReverseCallActivity.java b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneReverseCallActivity.java
index e55dce7..e8aa861 100644
--- a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneReverseCallActivity.java
+++ b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneReverseCallActivity.java
@@ -187,7 +187,11 @@
callFilter = new IntentFilter();
callFilter.addAction("com.hdl.homepro.call.action");
callBroadcastReceiver = new CallBroadcastReceiver();
- registerReceiver(callBroadcastReceiver, callFilter);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ registerReceiver(callBroadcastReceiver, callFilter, RECEIVER_EXPORTED);
+ } else {
+ registerReceiver(callBroadcastReceiver, callFilter);
+ }
if (callBroadcastReceiver != null) {
String finalInterphoneType = interphoneType;
diff --git a/HDLLinphoneSDKDemoNew/app/build.gradle b/HDLLinphoneSDKDemoNew/app/build.gradle
index 4def722..8c5f2ce 100644
--- a/HDLLinphoneSDKDemoNew/app/build.gradle
+++ b/HDLLinphoneSDKDemoNew/app/build.gradle
@@ -3,12 +3,12 @@
}
android {
- compileSdkVersion 28
+ compileSdkVersion 33
defaultConfig {
applicationId "com.example.hdllinphonesdkdemo"
minSdkVersion 23
- targetSdkVersion 28
+ targetSdkVersion 34
versionCode 1
versionName "1.0"
diff --git a/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/MainActivity.java b/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/MainActivity.java
index da988a8..9bdcefd 100644
--- a/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/MainActivity.java
+++ b/HDLLinphoneSDKDemoNew/app/src/main/java/com/example/hdllinphonesdkdemo/MainActivity.java
@@ -42,17 +42,18 @@
mTextView.setOnClickListener(v -> HDLLinphoneKit.getInstance()
.setAccountAndLogin(
- "677890543690887170",
- "xFNxyrTIM8gLAOGDw3OiuzV5F",
+ "1855881532683550721",
+ "wp5Z3MlACFgnMKcdaIW89mrgb",
"47.96.88.250:25060",
HDLLinphoneKit.INTER_PHONE_TYPE_HDL
));
+// {"code":0,"data":{"proxy":"sip:47.96.88.250:25060","realm":"47.96.88.250:25060","sipAccount":"1855881532683550721","sipPasswd":"wp5Z3MlACFgnMKcdaIW89mrgb"},"requestId":"48a980dcb27cf3e5d00e084865afec7d","timestamp":"1731920523514","isSuccess":true}
mTextView4.setOnClickListener(v -> HDLLinphoneKit.getInstance().setAccountAndLogin("A183372453821457", "592436", "139.159.157.75:47000", HDLLinphoneKit.INTER_PHONE_TYPE_FREEVIEW));
mMonitorText.setOnClickListener(v -> {
// String sip_account = "sip:D" + space_code + "@yun";
- HDLLinphoneKit.getInstance().callTo("sip:D26-11-1@139.159.157.75:46000", true);
+ HDLLinphoneKit.getInstance().callTo("sip:101003@47.96.88.250:25060", true);
// HDLLinphoneKit.getInstance().callTo("D22-1-21-1", true);
startActivity(HDLLinphoneMonitorActivity.class);
});
--
Gitblit v1.8.0