Merge pull request #100 from BoleLiu/dev

Release for v6.3.0
pili-engineering · Aug 9, 2024 · 7e2b350 · 7e2b350
2 parents 3e3bc1c + f3bb3c7
commit 7e2b350
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 5 deletions.
diff --git 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 50
-        versionName "6.2.0"
+        versionCode 51
+        versionName "6.3.0"
         buildConfigField "long", "BUILD_TIMESTAMP", System.currentTimeMillis() + "L"
     }
 

diff --git a/...oidRTCDemo/app/libs/qndroid-rtc-6.2.0.jar → ...oidRTCDemo/app/libs/qndroid-rtc-6.3.0.jar b/...oidRTCDemo/app/libs/qndroid-rtc-6.2.0.jar → ...oidRTCDemo/app/libs/qndroid-rtc-6.3.0.jar
diff --git a/QNDroidRTCDemo/app/src/main/jniLibs/arm64-v8a/libqndroid_rtc.so b/QNDroidRTCDemo/app/src/main/jniLibs/arm64-v8a/libqndroid_rtc.so
diff --git a/QNDroidRTCDemo/app/src/main/jniLibs/armeabi-v7a/libqndroid_rtc.so b/QNDroidRTCDemo/app/src/main/jniLibs/armeabi-v7a/libqndroid_rtc.so
diff --git a/QNDroidRTCDemo/app/src/main/jniLibs/x86/libqndroid_rtc.so b/QNDroidRTCDemo/app/src/main/jniLibs/x86/libqndroid_rtc.so
diff --git 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 7
-        versionName "1.0.6"
+        versionCode 8
+        versionName "1.0.7"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField "long", "BUILD_TIMESTAMP", System.currentTimeMillis() + "L"

diff --git a/...I-Examples/app/libs/qndroid-rtc-6.2.0.jar → ...I-Examples/app/libs/qndroid-rtc-6.3.0.jar b/...I-Examples/app/libs/qndroid-rtc-6.2.0.jar → ...I-Examples/app/libs/qndroid-rtc-6.3.0.jar
diff --git a/...mples/app/src/main/java/com/qiniu/droid/rtc/api/examples/activity/MediaRelayActivity.java b/...mples/app/src/main/java/com/qiniu/droid/rtc/api/examples/activity/MediaRelayActivity.java
@@ -214,7 +214,12 @@ private void initView() {
                 ToastUtils.showShortToast(this, "token 为空！");
                 return;
             }
-            String roomName = Utils.parseRoomToken(roomToken).optString(Config.KEY_ROOM_NAME);
+            JSONObject parseResult = Utils.parseRoomToken(roomToken);
+            if (parseResult == null) {
+                ToastUtils.showShortToast(this, "token 解析失败，请检查合法性！");
+                return;
+            }
+            String roomName = parseResult.optString(Config.KEY_ROOM_NAME);
             if (TextUtils.isEmpty(roomName)) {
                 ToastUtils.showShortToast(this, "非法 token！");
                 return;

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
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
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
diff --git a/ReleaseNotes/release-notes-6.3.0.md b/ReleaseNotes/release-notes-6.3.0.md
@@ -0,0 +1,23 @@
+# QNDroidRTC Release Notes for 6.3.0
+
+## 简介
+
+QNDroidRTC 是七牛推出的一款适用于 Android 平台的音视频通话 SDK，提供了包括美颜、滤镜、音视频通话等多种功能，提供灵活的接口，支持高度定制以及二次开发。
+
+## 版本
+
+- 发布 qndroid-rtc-6.3.0.jar
+- 更新 libqndroid_rtc.so
+
+## 功能
+
+- 支持视频上下行分段 FEC 功能
+
+## 注意事项
+- 混音的使用姿势发生了改变，详情可参考[背景音乐混音](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 的崩溃信息，为非必需依赖项
+
+## 问题反馈
+
+当你遇到任何问题时，可以通过在 GitHub 的 repo 提交 `issues` 来反馈问题，请尽可能的描述清楚遇到的问题，如果有错误信息也一同附带，并且在 ```Labels``` 中指明类型为 bug 或者其他。 [通过这里查看已有的 issues 和提交 bug](https://github.com/pili-engineering/QNRTC-Android/issues)