diff --git a/QNDroidRTCDemo/app/build.gradle b/QNDroidRTCDemo/app/build.gradle index 6408709..3978d74 100644 --- a/QNDroidRTCDemo/app/build.gradle +++ b/QNDroidRTCDemo/app/build.gradle @@ -6,8 +6,8 @@ android { applicationId "com.qiniu.droid.rtc.demo" minSdkVersion 18 targetSdkVersion 31 - versionCode 48 - versionName "6.0.0" + versionCode 49 + versionName "6.1.0" buildConfigField "long", "BUILD_TIMESTAMP", System.currentTimeMillis() + "L" } diff --git a/QNDroidRTCDemo/app/libs/qndroid-rtc-6.0.0.jar b/QNDroidRTCDemo/app/libs/qndroid-rtc-6.0.0.jar deleted file mode 100644 index d572bb8..0000000 Binary files a/QNDroidRTCDemo/app/libs/qndroid-rtc-6.0.0.jar and /dev/null differ diff --git a/QNDroidRTCDemo/app/libs/qndroid-rtc-6.1.0.jar b/QNDroidRTCDemo/app/libs/qndroid-rtc-6.1.0.jar new file mode 100644 index 0000000..1427055 Binary files /dev/null and b/QNDroidRTCDemo/app/libs/qndroid-rtc-6.1.0.jar differ diff --git a/QNDroidRTCDemo/app/src/main/java/com/qiniu/droid/rtc/demo/activity/SettingActivity.java b/QNDroidRTCDemo/app/src/main/java/com/qiniu/droid/rtc/demo/activity/SettingActivity.java index 450f3a7..11c92b1 100644 --- a/QNDroidRTCDemo/app/src/main/java/com/qiniu/droid/rtc/demo/activity/SettingActivity.java +++ b/QNDroidRTCDemo/app/src/main/java/com/qiniu/droid/rtc/demo/activity/SettingActivity.java @@ -34,6 +34,8 @@ import java.util.List; import java.util.Locale; +import static com.qiniu.droid.rtc.demo.BuildConfig.VERSION_NAME; + public class SettingActivity extends AppCompatActivity { private EditText mUserNameEditText; @@ -258,7 +260,7 @@ protected String getBuildTimeDescription() { } protected String getSdkVersion() { - return com.qiniu.droid.rtc.BuildConfig.VERSION_NAME + "-" + com.qiniu.droid.rtc.BuildConfig.GIT_HASH; + return VERSION_NAME + "-" + com.qiniu.droid.rtc.BuildConfig.GIT_HASH; } private boolean isTestMode() { diff --git a/QNDroidRTCDemo/app/src/main/jniLibs/arm64-v8a/libqndroid_rtc.so b/QNDroidRTCDemo/app/src/main/jniLibs/arm64-v8a/libqndroid_rtc.so index 15732f1..ca14e57 100755 Binary files a/QNDroidRTCDemo/app/src/main/jniLibs/arm64-v8a/libqndroid_rtc.so and b/QNDroidRTCDemo/app/src/main/jniLibs/arm64-v8a/libqndroid_rtc.so differ diff --git a/QNDroidRTCDemo/app/src/main/jniLibs/armeabi-v7a/libqndroid_rtc.so b/QNDroidRTCDemo/app/src/main/jniLibs/armeabi-v7a/libqndroid_rtc.so index 1e9aafb..7294ae3 100755 Binary files a/QNDroidRTCDemo/app/src/main/jniLibs/armeabi-v7a/libqndroid_rtc.so and b/QNDroidRTCDemo/app/src/main/jniLibs/armeabi-v7a/libqndroid_rtc.so differ diff --git a/QNDroidRTCDemo/app/src/main/jniLibs/x86/libqndroid_rtc.so b/QNDroidRTCDemo/app/src/main/jniLibs/x86/libqndroid_rtc.so index f152185..a88c442 100755 Binary files a/QNDroidRTCDemo/app/src/main/jniLibs/x86/libqndroid_rtc.so and b/QNDroidRTCDemo/app/src/main/jniLibs/x86/libqndroid_rtc.so differ diff --git a/QNDroidRTCDemo/build.gradle b/QNDroidRTCDemo/build.gradle index 017e531..5c1e761 100644 --- a/QNDroidRTCDemo/build.gradle +++ b/QNDroidRTCDemo/build.gradle @@ -9,7 +9,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.4.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/QNDroidRTCDemo/gradle/wrapper/gradle-wrapper.jar b/QNDroidRTCDemo/gradle/wrapper/gradle-wrapper.jar index 1948b90..13372ae 100644 Binary files a/QNDroidRTCDemo/gradle/wrapper/gradle-wrapper.jar and b/QNDroidRTCDemo/gradle/wrapper/gradle-wrapper.jar differ diff --git a/QNDroidRTCDemo/gradle/wrapper/gradle-wrapper.properties b/QNDroidRTCDemo/gradle/wrapper/gradle-wrapper.properties index d2c45a4..c4ae615 100644 --- a/QNDroidRTCDemo/gradle/wrapper/gradle-wrapper.properties +++ b/QNDroidRTCDemo/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Thu Nov 01 11:52:52 CST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip diff --git a/QNDroidRTCDemo/gradlew b/QNDroidRTCDemo/gradlew index cccdd3d..9d82f78 100755 --- a/QNDroidRTCDemo/gradlew +++ b/QNDroidRTCDemo/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash ############################################################################## ## @@ -6,38 +6,20 @@ ## ############################################################################## -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn () { +warn ( ) { echo "$*" } -die () { +die ( ) { echo echo "$*" echo @@ -48,7 +30,6 @@ die () { cygwin=false msys=false darwin=false -nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -59,11 +40,26 @@ case "`uname`" in MINGW* ) msys=true ;; - NONSTOP* ) - nonstop=true - ;; esac +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -89,7 +85,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -154,19 +150,11 @@ if $cygwin ; then esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") } -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" -exec "$JAVACMD" "$@" +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/QNDroidRTCDemo/gradlew.bat b/QNDroidRTCDemo/gradlew.bat index e95643d..aec9973 100644 --- a/QNDroidRTCDemo/gradlew.bat +++ b/QNDroidRTCDemo/gradlew.bat @@ -8,14 +8,14 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -46,9 +46,10 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windows variants +@rem Get command-line arguments, handling Windowz variants if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -59,6 +60,11 @@ set _SKIP=2 if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ :execute @rem Setup the command line diff --git a/QNRTC-API-Examples/app/build.gradle b/QNRTC-API-Examples/app/build.gradle index c50cd4f..0ad0142 100644 --- a/QNRTC-API-Examples/app/build.gradle +++ b/QNRTC-API-Examples/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.qiniu.droid.rtc.api.examples" minSdkVersion 18 targetSdkVersion 30 - versionCode 5 - versionName "1.0.4" + versionCode 6 + versionName "1.0.5" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" buildConfigField "long", "BUILD_TIMESTAMP", System.currentTimeMillis() + "L" diff --git a/QNRTC-API-Examples/app/libs/qndroid-rtc-6.0.0.jar b/QNRTC-API-Examples/app/libs/qndroid-rtc-6.0.0.jar deleted file mode 100644 index d572bb8..0000000 Binary files a/QNRTC-API-Examples/app/libs/qndroid-rtc-6.0.0.jar and /dev/null differ diff --git a/QNRTC-API-Examples/app/libs/qndroid-rtc-6.1.0.jar b/QNRTC-API-Examples/app/libs/qndroid-rtc-6.1.0.jar new file mode 100644 index 0000000..1427055 Binary files /dev/null and b/QNRTC-API-Examples/app/libs/qndroid-rtc-6.1.0.jar differ diff --git a/QNRTC-API-Examples/app/src/main/java/com/qiniu/droid/rtc/api/examples/activity/MainActivity.java b/QNRTC-API-Examples/app/src/main/java/com/qiniu/droid/rtc/api/examples/activity/MainActivity.java index ecdb775..7e7bbbd 100644 --- a/QNRTC-API-Examples/app/src/main/java/com/qiniu/droid/rtc/api/examples/activity/MainActivity.java +++ b/QNRTC-API-Examples/app/src/main/java/com/qiniu/droid/rtc/api/examples/activity/MainActivity.java @@ -29,6 +29,8 @@ import java.text.SimpleDateFormat; import java.util.Locale; +import static com.qiniu.droid.rtc.api.examples.BuildConfig.VERSION_NAME; + public class MainActivity extends AppCompatActivity { private static final int REQUEST_CODE_SCAN_TOKEN = 1000; @@ -168,6 +170,6 @@ private String getBuildTimeDescription() { } private String getSdkVersion() { - return com.qiniu.droid.rtc.BuildConfig.VERSION_NAME + "-" + com.qiniu.droid.rtc.BuildConfig.GIT_HASH; + return VERSION_NAME + "-" + com.qiniu.droid.rtc.BuildConfig.GIT_HASH; } } diff --git a/QNRTC-API-Examples/app/src/main/jniLibs/arm64-v8a/libqndroid_rtc.so b/QNRTC-API-Examples/app/src/main/jniLibs/arm64-v8a/libqndroid_rtc.so index 15732f1..ca14e57 100755 Binary files a/QNRTC-API-Examples/app/src/main/jniLibs/arm64-v8a/libqndroid_rtc.so and b/QNRTC-API-Examples/app/src/main/jniLibs/arm64-v8a/libqndroid_rtc.so differ diff --git a/QNRTC-API-Examples/app/src/main/jniLibs/armeabi-v7a/libqndroid_rtc.so b/QNRTC-API-Examples/app/src/main/jniLibs/armeabi-v7a/libqndroid_rtc.so index 1e9aafb..7294ae3 100755 Binary files a/QNRTC-API-Examples/app/src/main/jniLibs/armeabi-v7a/libqndroid_rtc.so and b/QNRTC-API-Examples/app/src/main/jniLibs/armeabi-v7a/libqndroid_rtc.so differ diff --git a/QNRTC-API-Examples/app/src/main/jniLibs/x86/libqndroid_rtc.so b/QNRTC-API-Examples/app/src/main/jniLibs/x86/libqndroid_rtc.so index f152185..a88c442 100755 Binary files a/QNRTC-API-Examples/app/src/main/jniLibs/x86/libqndroid_rtc.so and b/QNRTC-API-Examples/app/src/main/jniLibs/x86/libqndroid_rtc.so differ diff --git a/QNRTC-API-Examples/build.gradle b/QNRTC-API-Examples/build.gradle index d7f14e2..1387510 100644 --- a/QNRTC-API-Examples/build.gradle +++ b/QNRTC-API-Examples/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:4.1.3" + classpath 'com.android.tools.build:gradle:3.4.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/QNRTC-API-Examples/gradle/wrapper/gradle-wrapper.properties b/QNRTC-API-Examples/gradle/wrapper/gradle-wrapper.properties index 132f8f4..3a1077d 100644 --- a/QNRTC-API-Examples/gradle/wrapper/gradle-wrapper.properties +++ b/QNRTC-API-Examples/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip diff --git a/ReleaseNotes/release-notes-6.1.0.md b/ReleaseNotes/release-notes-6.1.0.md new file mode 100644 index 0000000..aded90a --- /dev/null +++ b/ReleaseNotes/release-notes-6.1.0.md @@ -0,0 +1,30 @@ +# QNDroidRTC Release Notes for 6.1.0 + +## 简介 + +QNDroidRTC 是七牛推出的一款适用于 Android 平台的音视频通话 SDK,提供了包括美颜、滤镜、音视频通话等多种功能,提供灵活的接口,支持高度定制以及二次开发。 + +## 版本 + +- 发布 qndroid-rtc-6.1.0.jar +- 更新 libqndroid_rtc.so + +## 优化 + +- 优化弱网下的音频连麦体验 + +## 缺陷 + +- 修复特定场景下偶现的崩溃问题 +- 修复订阅统计信息失效的问题 + +## 注意事项 +- 混音的使用姿势发生了改变,详情可参考[背景音乐混音](https://developer.qiniu.com/rtc/8771/background-music-mix-android)、[多音效混音](https://developer.qiniu.com/rtc/11965/android_audio_effect_mixing)、[音频裸数据混音](https://developer.qiniu.io/rtc/12581/android_audio_source_mixing)使用指南 +- libqnquic.so 用于优化弱网下的信令传输,为非必需依赖项 +- libqcrash.so 用于搜集 SDK 的崩溃信息,为非必需依赖项 +- 从 5.2.4 开始,org.webrtc 包被重命名为 org.qnwebrtc,请注意适配修改 +- 从 5.2.4 开始,接口 QNRTCSetting.setAEC3Enabled 被删除,请使用 QNRTCSetting.setAudioScene 接口 + +## 问题反馈 + +当你遇到任何问题时,可以通过在 GitHub 的 repo 提交 `issues` 来反馈问题,请尽可能的描述清楚遇到的问题,如果有错误信息也一同附带,并且在 ```Labels``` 中指明类型为 bug 或者其他。 [通过这里查看已有的 issues 和提交 bug](https://github.com/pili-engineering/QNRTC-Android/issues) diff --git a/releases/arm64-v8a/libqndroid_rtc.so b/releases/arm64-v8a/libqndroid_rtc.so index 15732f1..ca14e57 100755 Binary files a/releases/arm64-v8a/libqndroid_rtc.so and b/releases/arm64-v8a/libqndroid_rtc.so differ diff --git a/releases/armeabi-v7a/libqndroid_rtc.so b/releases/armeabi-v7a/libqndroid_rtc.so index 1e9aafb..7294ae3 100755 Binary files a/releases/armeabi-v7a/libqndroid_rtc.so and b/releases/armeabi-v7a/libqndroid_rtc.so differ diff --git a/releases/qndroid-rtc-6.0.0.jar b/releases/qndroid-rtc-6.0.0.jar deleted file mode 100644 index d572bb8..0000000 Binary files a/releases/qndroid-rtc-6.0.0.jar and /dev/null differ diff --git a/releases/qndroid-rtc-6.1.0.jar b/releases/qndroid-rtc-6.1.0.jar new file mode 100644 index 0000000..1427055 Binary files /dev/null and b/releases/qndroid-rtc-6.1.0.jar differ diff --git a/releases/x86/libqndroid_rtc.so b/releases/x86/libqndroid_rtc.so index f152185..a88c442 100755 Binary files a/releases/x86/libqndroid_rtc.so and b/releases/x86/libqndroid_rtc.so differ