feat: update AliVCSDK to v1.6.0

aliyunvideo · Dec 2, 2022 · 50eeda9 · 50eeda9
1 parent 9e246de
commit 50eeda9
Show file tree

Hide file tree

Showing 94 changed files with 3,288 additions and 1,420 deletions.
diff --git a/AIOApp/src/main/java/com/aliyun/aio/demo/AIOApplication.java b/AIOApp/src/main/java/com/aliyun/aio/demo/AIOApplication.java
@@ -10,13 +10,10 @@
 import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatDelegate;
 import androidx.multidex.MultiDex;
-import androidx.multidex.MultiDexApplication;
 
 import com.aliyun.aio.avtheme.AVBaseThemeApplication;
 import com.aliyun.aio.demo.utils.ReflectUtils;
-import com.aliyun.common.utils.Assert;
 import com.umeng.analytics.MobclickAgent;
 import com.umeng.commonsdk.UMConfigure;
 

diff --git a/AIOApp/src/main/java/com/aliyun/aio/demo/MainActivity.java b/AIOApp/src/main/java/com/aliyun/aio/demo/MainActivity.java
@@ -1,5 +1,6 @@
 package com.aliyun.aio.demo;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.text.method.LinkMovementMethod;
 import android.widget.GridView;
@@ -41,6 +42,18 @@ protected int specifiedThemeMode() {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        /*
+            launcher Activity 不是 TaskRoot && 从桌面启动时，finish 当前 Activity
+         */
+        if (!this.isTaskRoot() && getIntent() != null) {
+            String action = getIntent().getAction();
+            if (getIntent().hasCategory(Intent.CATEGORY_LAUNCHER) && Intent.ACTION_MAIN.equals(action)) {
+                finish();
+                return;
+            }
+        }
+
         setContentView(R.layout.aio_activity_main);
         initView();
         initData();

diff --git a/AUIFoundation/AVTheme/src/main/res/.!33800!.DS_Store b/AUIFoundation/AVTheme/src/main/res/.!33800!.DS_Store
diff --git a/AUIFoundation/AVTheme/src/main/res/.!65161!.DS_Store b/AUIFoundation/AVTheme/src/main/res/.!65161!.DS_Store
diff --git a/AliLivePushDemo/README.md b/AliLivePushDemo/README.md
@@ -1 +1 @@
-# AlivcLivePusher 4.4.6
+# AlivcLivePusher 4.4.8
diff --git a/AliLivePushDemo/alivc-livepusher-demo/dependencies.gradle b/AliLivePushDemo/alivc-livepusher-demo/dependencies.gradle
@@ -14,8 +14,7 @@ dependencies {
     implementation project(':commonutils')
     implementation project(':commonbiz')
     implementation 'com.aliyun.animoji:animoji:1.2.1@aar'
-    implementation externalPlayerPart
-    implementation externalAlivcFFmpeg
+    implementation externalPlayerFull
     implementation externalARTC
     if (hasRTS() && !"true".equalsIgnoreCase(allInOne)) {
         implementation externalRtsSDK

diff --git a/AliLivePushDemo/alivc-livepusher-demo/src/alivctest/AndroidManifest.xml b/AliLivePushDemo/alivc-livepusher-demo/src/alivctest/AndroidManifest.xml
@@ -35,9 +35,9 @@
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
     <application
-        tools:replace="android:label, name"
+        tools:replace="android:label,name,allowBackup"
         android:name="com.alivc.live.test.LiveApplication"
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/incName"
         android:supportsRtl="true"

diff --git a/AliLivePushDemo/alivc-livepusher-demo/src/main/AndroidManifest.xml b/AliLivePushDemo/alivc-livepusher-demo/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.alivc.live.pusher.demo">
 
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -22,33 +23,31 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
 
     <application
         android:name=".LiveApplication"
-        android:allowBackup="true"
         android:extractNativeLibs="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true">
-
         <activity
             android:name=".PushMainActivity"
-            android:theme="@style/AVAppTheme"
-            android:screenOrientation="portrait"
+            android:exported="false"
             android:launchMode="singleTask"
-            android:exported="false" />
+            android:screenOrientation="portrait"
+            android:theme="@style/AVAppTheme" />
         <activity
             android:name=".MainActivity"
             android:alwaysRetainTaskState="true"
             android:clearTaskOnLaunch="false"
             android:configChanges="orientation"
+            android:exported="true"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar"
-            android:windowSoftInputMode="stateHidden|adjustPan"
-            android:exported="true">
+            android:windowSoftInputMode="stateHidden|adjustPan">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -58,9 +57,9 @@
         <activity
             android:name=".PushConfigActivity"
             android:alwaysRetainTaskState="true"
-            android:screenOrientation="portrait"
             android:configChanges="uiMode"
-            android:theme="@style/AVPushTheme"/>
+            android:screenOrientation="portrait"
+            android:theme="@style/AVPushTheme" />
         <activity
             android:name=".PlayerActivity"
             android:alwaysRetainTaskState="true"
@@ -69,10 +68,10 @@
         <activity
             android:name=".VideoRecordConfigActivity"
             android:alwaysRetainTaskState="true"
-            android:launchMode="singleTop"
             android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode"
+            android:launchMode="singleTop"
             android:screenOrientation="portrait"
-            android:theme="@style/AVPushTheme"/>
+            android:theme="@style/AVPushTheme" />
         <activity
             android:name=".LivePushActivity"
             android:alwaysRetainTaskState="true"
@@ -102,10 +101,24 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".rts.RtsPlayActivity"
+            android:alwaysRetainTaskState="true"
+            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/AVPushTheme"/>
+        <activity android:name=".rts.InputRtsUrlActivity"
+            android:alwaysRetainTaskState="true"
+            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/AVPushTheme"/>
+
         <service
             android:name=".ForegroundService"
             android:enabled="true"
-            android:foregroundServiceType="mediaProjection" /> <!-- 填写您从Mob开发者后台中得到的Appkey和AppSecret -->
+            android:foregroundServiceType="mediaProjection|camera" />
+
         <meta-data
             android:name="Mob-AppKey"
             android:value="1aeeb15ac7a52" />