Merge pull request #98 from BoleLiu/dev

Release for v6.2.0
pili-engineering · Jun 28, 2024 · 3e3bc1c · 3e3bc1c
2 parents eedc68f + a44a6c2
commit 3e3bc1c
Show file tree

Hide file tree

Showing 22 changed files with 713 additions and 6 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 49
-        versionName "6.1.0"
+        versionCode 50
+        versionName "6.2.0"
         buildConfigField "long", "BUILD_TIMESTAMP", System.currentTimeMillis() + "L"
     }
 

diff --git a/...oidRTCDemo/app/libs/qndroid-rtc-6.1.0.jar → ...oidRTCDemo/app/libs/qndroid-rtc-6.2.0.jar b/...oidRTCDemo/app/libs/qndroid-rtc-6.1.0.jar → ...oidRTCDemo/app/libs/qndroid-rtc-6.2.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 6
-        versionName "1.0.5"
+        versionCode 7
+        versionName "1.0.6"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField "long", "BUILD_TIMESTAMP", System.currentTimeMillis() + "L"

diff --git a/...I-Examples/app/libs/qndroid-rtc-6.1.0.jar → ...I-Examples/app/libs/qndroid-rtc-6.2.0.jar b/...I-Examples/app/libs/qndroid-rtc-6.1.0.jar → ...I-Examples/app/libs/qndroid-rtc-6.2.0.jar
diff --git a/QNRTC-API-Examples/app/src/main/AndroidManifest.xml b/QNRTC-API-Examples/app/src/main/AndroidManifest.xml
@@ -75,6 +75,8 @@
             android:screenOrientation="portrait" />
         <activity android:name=".activity.CDNStreamingActivity"
             android:screenOrientation="portrait" />
+        <activity android:name=".activity.MediaRecorderActivity"
+            android:screenOrientation="portrait" />
     </application>
 
 </manifest>
diff --git a/...PI-Examples/app/src/main/java/com/qiniu/droid/rtc/api/examples/activity/MainActivity.java b/...PI-Examples/app/src/main/java/com/qiniu/droid/rtc/api/examples/activity/MainActivity.java
@@ -29,7 +29,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Locale;
 
-import static com.qiniu.droid.rtc.api.examples.BuildConfig.VERSION_NAME;
+import static com.qiniu.droid.rtc.BuildConfig.VERSION_NAME;
 
 public class MainActivity extends AppCompatActivity {
     private static final int REQUEST_CODE_SCAN_TOKEN = 1000;
@@ -149,6 +149,8 @@ public void onClickScenes(View v) {
             intent = new Intent(this, CDNStreamingActivity.class);
         } else if (v.getId() == R.id.media_relay) {
             intent = new Intent(this, MediaRelayActivity.class);
+        } else if (v.getId() == R.id.media_recorder) {
+            intent = new Intent(this, MediaRecorderActivity.class);
         }
         if (intent != null) {
             startActivity(intent);