From 8056b53176cddb9d154e3c3ffc4a11354b338fcf Mon Sep 17 00:00:00 2001
From: panlili2024 <14743743+panlili2024@user.noreply.gitee.com>
Date: 星期四, 25 九月 2025 13:46:17 +0800
Subject: [PATCH] 代码同步

---
 HDLLinphoneSDKDemoNew/.idea/misc.xml                                                                                   |    3 +
 HDLLinphoneSDKDemoNew/.idea/compiler.xml                                                                               |    2 
 HDLLinphoneSDKDemoNew/app/build.gradle                                                                                 |    2 
 HDLLinphoneSDKDemoNew/build.gradle                                                                                     |   16 +++++++
 HDLLinphoneSDKDemoNew/gradle/wrapper/gradle-wrapper.properties                                                         |    3 +
 HDLLinphoneSDKDemoNew.rar                                                                                              |    0 
 HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneMonitorActivity.java     |   23 ++++++++---
 HDLLinphoneSDKDemoNew/.idea/deploymentTargetSelector.xml                                                               |    3 +
 HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneIntercomActivity.java    |   20 ++++++---
 HDLLinphoneSDKDemoNew/HDLLinphoneSDK/src/main/java/com/hdl/hdllinphonesdk/activity/HDLLinphoneReverseCallActivity.java |   22 ++++++----
 HDLLinphoneSDKDemoNew/gradle.properties                                                                                |    8 +++
 HDLLinphoneSDKDemoNew/HDLLinphoneSDK/build.gradle                                                                      |    8 +++-
 HDLLinphoneSDKDemoNew/settings.gradle                                                                                  |    2 
 13 files changed, 80 insertions(+), 32 deletions(-)

diff --git a/HDLLinphoneSDKDemoNew.rar b/HDLLinphoneSDKDemoNew.rar
new file mode 100644
index 0000000..34ce728
--- /dev/null
+++ b/HDLLinphoneSDKDemoNew.rar
Binary files differ
diff --git a/HDLLinphoneSDKDemoNew/.idea/compiler.xml b/HDLLinphoneSDKDemoNew/.idea/compiler.xml
index b589d56..b73660a 100644
--- a/HDLLinphoneSDKDemoNew/.idea/compiler.xml
+++ b/HDLLinphoneSDKDemoNew/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="15" />
   </component>
 </project>
\ No newline at end of file
diff --git a/HDLLinphoneSDKDemoNew/.idea/deploymentTargetSelector.xml b/HDLLinphoneSDKDemoNew/.idea/deploymentTargetSelector.xml
index b268ef3..4d59293 100644
--- a/HDLLinphoneSDKDemoNew/.idea/deploymentTargetSelector.xml
+++ b/HDLLinphoneSDKDemoNew/.idea/deploymentTargetSelector.xml
@@ -5,6 +5,9 @@
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
       </SelectionState>
+      <SelectionState runConfigName="hdlpushactivity">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
     </selectionStates>
   </component>
 </project>
\ No newline at end of file
diff --git a/HDLLinphoneSDKDemoNew/.idea/misc.xml b/HDLLinphoneSDKDemoNew/.idea/misc.xml
index 4a12ecb..09b568d 100644
--- a/HDLLinphoneSDKDemoNew/.idea/misc.xml
+++ b/HDLLinphoneSDKDemoNew/.idea/misc.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
@@ -24,7 +25,7 @@
     </option>
   </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_15" default="true" project-jdk-name="corretto-15" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/build.gradle b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/build.gradle
index 65e19a6..c319029 100644
--- a/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/build.gradle
+++ b/HDLLinphoneSDKDemoNew/HDLLinphoneSDK/build.gradle
@@ -10,8 +10,8 @@
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 34
-        versionCode 6
-        versionName "1.0.8"
+        versionCode 8
+        versionName "1.1.0"
 
         ndk {
             abiFilters 'arm64-v8a'
@@ -53,7 +53,9 @@
         url "https://linphone.org/maven_repository"
     }*/
     google()
+    //jcenter()
     mavenCentral()
+    maven { url 'https://maven.aliyun.com/repository/public' }
     maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' }
     maven { url = uri("https://plugins.gradle.org/m2/") }
     maven {
@@ -70,10 +72,12 @@
     implementation 'com.android.support.constraint:constraint-layout:2.0.4'
 //    implementation "org.linphone:linphone-sdk-android:4.5.0"
     embed "org.linphone:linphone-sdk-android:4.5.0"
+//    embed 'org.linphone:linphone-sdk-android:5.0+'
     implementation 'com.google.code.gson:gson:2.9.0'
 
     embed 'com.tencent.tinker:tinker-android-lib:1.9.1'
     //娣诲姞StatusBarUtil鐨勪緷璧�
     implementation 'com.jaeger.statusbarutil:library:1.5.1'
+//    api 'com.jaeger.statusbarutil:library:1.5.1'
 
 }
\ No newline at end of file
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 ada857e..43c4a69 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
@@ -11,9 +11,6 @@
 import android.os.CountDownTimer;
 import android.os.SystemClock;
 import android.os.Vibrator;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -27,6 +24,10 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 
 import com.hdl.hdllinphonesdk.HDLLinphoneKit;
 import com.hdl.hdllinphonesdk.R;
@@ -274,12 +275,17 @@
         int id = view.getId();
         if (id == R.id.iv_lp_screenshot) {
             //鍔ㄦ�佹潈闄愮敵璇�
-            if (ContextCompat.checkSelfPermission(HDLLinphoneIntercomActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED
-                    && ActivityCompat.checkSelfPermission(HDLLinphoneIntercomActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-                ActivityCompat.requestPermissions(HDLLinphoneIntercomActivity.this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
-            } else {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                 //鎴浘
                 onClickScreenshot();
+            } else {
+                if (ContextCompat.checkSelfPermission(HDLLinphoneIntercomActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED
+                        && ActivityCompat.checkSelfPermission(HDLLinphoneIntercomActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+                    ActivityCompat.requestPermissions(HDLLinphoneIntercomActivity.this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
+                } else {
+                    //鎴浘
+                    onClickScreenshot();
+                }
             }
         } else if (id == R.id.iv_lp_unlock) {
             //寮�閿�
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 29d713a..1ad7436 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
@@ -8,9 +8,6 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.CountDownTimer;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -23,6 +20,10 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 
 import com.hdl.hdllinphonesdk.HDLLinphoneKit;
 import com.hdl.hdllinphonesdk.R;
@@ -135,6 +136,7 @@
                 tv_lp_title.setText(titleName);
             }
             interphoneType = extras.getString("interphoneType");
+            HDLLog.i(TAG, "initData interphoneType= " + interphoneType);
         }
 
         //鐩戝惉鍛煎彨骞挎挱
@@ -235,12 +237,17 @@
         int id = view.getId();
         if (id == R.id.iv_lp_screenshot) {
             //鍔ㄦ�佹潈闄愮敵璇�
-            if (ContextCompat.checkSelfPermission(HDLLinphoneMonitorActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED
-                    && ActivityCompat.checkSelfPermission(HDLLinphoneMonitorActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-                ActivityCompat.requestPermissions(HDLLinphoneMonitorActivity.this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
-            } else {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                 //鎴浘
                 onClickScreenshot();
+            } else {
+                if (ContextCompat.checkSelfPermission(HDLLinphoneMonitorActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED
+                        && ActivityCompat.checkSelfPermission(HDLLinphoneMonitorActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+                    ActivityCompat.requestPermissions(HDLLinphoneMonitorActivity.this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
+                } else {
+                    //鎴浘
+                    onClickScreenshot();
+                }
             }
         } else if (id == R.id.iv_lp_unlock) {
             //寮�閿�
@@ -347,9 +354,11 @@
      * initLinphone
      */
     void initLinphone() {
+        HDLLog.i(TAG, "initLinphone === ");
         mCoreListener = new CoreListenerStub() {
             @Override
             public void onCallStateChanged(Core core, Call call, Call.State state, String message) {
+                HDLLog.i(TAG, "initLinphone onCallStateChanged state= " + state);
                 if (state == Call.State.End || state == Call.State.Released) {
                     // Once call is finished (end state), terminate the activity
                     // We also check for released state (called a few seconds later) just in case
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 e8aa861..b927780 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
@@ -1,19 +1,14 @@
 package com.hdl.hdllinphonesdk.activity;
 
 import android.Manifest;
-import android.content.Context;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
-import android.media.AudioAttributes;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.os.SystemClock;
 import android.os.Vibrator;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -27,6 +22,10 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 
 import com.hdl.hdllinphonesdk.HDLLinphoneKit;
 import com.hdl.hdllinphonesdk.R;
@@ -288,12 +287,17 @@
         int id = view.getId();
         if (id == R.id.iv_lp_screenshot) {
             //鍔ㄦ�佹潈闄愮敵璇�
-            if (ContextCompat.checkSelfPermission(HDLLinphoneReverseCallActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED
-                    && ActivityCompat.checkSelfPermission(HDLLinphoneReverseCallActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-                ActivityCompat.requestPermissions(HDLLinphoneReverseCallActivity.this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
-            } else {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                 //鎴浘
                 onClickScreenshot();
+            } else {
+                if (ContextCompat.checkSelfPermission(HDLLinphoneReverseCallActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED
+                        && ActivityCompat.checkSelfPermission(HDLLinphoneReverseCallActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+                    ActivityCompat.requestPermissions(HDLLinphoneReverseCallActivity.this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
+                } else {
+                    //鎴浘
+                    onClickScreenshot();
+                }
             }
         } else if (id == R.id.iv_lp_unlock) {
             //寮�閿�
diff --git a/HDLLinphoneSDKDemoNew/app/build.gradle b/HDLLinphoneSDKDemoNew/app/build.gradle
index 8c5f2ce..94fce4c 100644
--- a/HDLLinphoneSDKDemoNew/app/build.gradle
+++ b/HDLLinphoneSDKDemoNew/app/build.gradle
@@ -10,7 +10,7 @@
         minSdkVersion 23
         targetSdkVersion 34
         versionCode 1
-        versionName "1.0"
+        versionName "1.1"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
diff --git a/HDLLinphoneSDKDemoNew/build.gradle b/HDLLinphoneSDKDemoNew/build.gradle
index 9b33e14..d032591 100644
--- a/HDLLinphoneSDKDemoNew/build.gradle
+++ b/HDLLinphoneSDKDemoNew/build.gradle
@@ -3,9 +3,16 @@
     repositories {
         google()
         jcenter()
+        mavenCentral()
+        maven { url 'https://maven.aliyun.com/repository/public' }
+        maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' }
+        maven { url = uri("https://plugins.gradle.org/m2/") }
+        maven {
+            url "https://jitpack.io"
+        }
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.1.2"
+        classpath "com.android.tools.build:gradle:4.1.3"
         classpath 'com.github.kezong:fat-aar:1.3.6'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -18,6 +25,13 @@
     repositories {
         google()
         jcenter()
+        mavenCentral()
+        maven { url 'https://maven.aliyun.com/repository/public' }
+        maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' }
+        maven { url = uri("https://plugins.gradle.org/m2/") }
+        maven {
+            url "https://jitpack.io"
+        }
     }
 
 }
diff --git a/HDLLinphoneSDKDemoNew/gradle.properties b/HDLLinphoneSDKDemoNew/gradle.properties
index 612fd84..fbdffac 100644
--- a/HDLLinphoneSDKDemoNew/gradle.properties
+++ b/HDLLinphoneSDKDemoNew/gradle.properties
@@ -16,4 +16,10 @@
 ## resources declared in the library itself and none from the library's dependencies,
 ## thereby reducing the size of the R class for that library
 #android.nonTransitiveRClass=true
-#android.enableJetifier=true
\ No newline at end of file
+#android.enableJetifier=true
+android.useAndroidX=true
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=false
+android.enableJetifier=true
\ No newline at end of file
diff --git a/HDLLinphoneSDKDemoNew/gradle/wrapper/gradle-wrapper.properties b/HDLLinphoneSDKDemoNew/gradle/wrapper/gradle-wrapper.properties
index ffed3a2..ce91aee 100644
--- a/HDLLinphoneSDKDemoNew/gradle/wrapper/gradle-wrapper.properties
+++ b/HDLLinphoneSDKDemoNew/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+android.disableResourceValidation=true
diff --git a/HDLLinphoneSDKDemoNew/settings.gradle b/HDLLinphoneSDKDemoNew/settings.gradle
index b2a5cc3..dc3066d 100644
--- a/HDLLinphoneSDKDemoNew/settings.gradle
+++ b/HDLLinphoneSDKDemoNew/settings.gradle
@@ -1,3 +1,3 @@
 include ':HDLLinphoneSDK'
 include ':app'
-rootProject.name = "HDLLinphoneSDKDemo"
\ No newline at end of file
+rootProject.name = "HDLLinphoneSDKDemo"

--
Gitblit v1.8.0