feat:update AliVCSDK to v1.8.0

AIOApp/build.gradle

@@ -76,9 +76,6 @@ android {
         pickFirst '**/libc++_shared.so'
         pickFirst '**/libMNN.so'
         pickFirst '**/libMNN_CL.so'
-        pickFirst '**/libAETemplateEngine.so'
-        pickFirst '**/liball_in_one.so'
-        pickFirst '**/libPluginOpus.so'
     }
 
     buildFeatures {
@@ -99,8 +96,8 @@ dependencies {
     implementation project(':AUIFoundation:AVBaseUI')
     implementation project(':AUIFoundation:AVTheme')
     if (hasLive()) {
-        println("hasLive implementation project(':livepusherapp')")
-        implementation project(':livepusherapp')
+        println("hasLive implementation project(':LiveApp')")
+        implementation project(':LiveApp')
     }
     if (hasPlayer()) {
         println("hasPlayer implementation project(':liveplayerapp')")

AIOApp/proguard-rules.pro

@@ -56,3 +56,75 @@
 -keep public class com.alibaba.android.arouter.facade.**{*;}
 -keep class * implements com.alibaba.android.arouter.facade.template.ISyringe{*;}
 -keep class * implements com.alibaba.android.arouter.facade.template.IProvider
+
+-keep class com.alivc.live.** {
+   *;
+}
+
+-keep class com.alivc.component.** {
+   *;
+}
+
+-keep class org.webrtc.** {
+   *;
+}
+
+-keep class com.huawei.multimedia.alivc.** {
+    *;
+}
+
+-keep class com.alivc.rtc.** {
+    *;
+}
+
+-keep class com.alivc.component.** {
+    *;
+}
+
+
+-keep class com.cicada.player.utils.NativeUsed { *; }
+-keep,allowobfuscation interface com.cicada.player.utils.NativeUsed
+
+-keep @com.cicada.player.utils.NativeUsed class *
+-keepclassmembers class * {
+    @com.cicada.player.utils.NativeUsed *;
+}
+
+
+-keep class com.aliyun.player.nativeclass.** { *;}
+#-keep class com.aliyun.player.externalplayer.** { *;}
+-keep class com.aliyun.player.videoview.AliDisplayView { *;}
+-keep class com.aliyun.player.videoview.AliDisplayView$* { *;}
+-keep class com.aliyun.player.source.** { *;}
+-keep class com.aliyun.player.bean.** { *;}
+-keep class com.aliyun.player.* { *;}
+
+-keep class com.aliyun.downloader.** { *;}
+-keep class com.aliyun.thumbnail.** { *;}
+-keep class com.aliyun.liveshift.** { *;}
+-keep class com.aliyun.loader.** { *;}
+-keep class com.aliyun.subtitle.** { *;}
+-keep class com.aliyun.private_service.** { *;}
+
+-keep class com.aliyun.utils.DeviceInfoUtils { *;}
+-keep class com.cicada.player.utils.** { *;}
+
+######################短视频混淆配置#########################
+-keep class com.aliyun.svideosdk.** {
+    *;
+}
+-keep class com.aliyun.common.network.** {
+    *;
+}
+
+-keep class com.aliyun.common.log.struct.AliyunLogInfo {*;}
+
+
+-keep class **.CalledByNative { *; }
+-keep,allowobfuscation interface **.CalledByNative
+
+-keep @**.CalledByNative class *
+-keepclassmembers class * {
+    @**.CalledByNative *;
+}
+

AliLivePushDemo/.gitignore

@@ -16,4 +16,5 @@ log/
 AndroidThirdParty/
 AUIFoundation/
 out/
+AlivcLivePusher_Demo_Android/
 outZip/

AliLivePushDemo/alivc-livepusher-demo/build_lib.gradle → AliLivePushDemo/LiveApp/build_lib.gradle

@@ -8,6 +8,7 @@ ext.MTL_buildTimestamp = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS").format(
 ext.Interactive_AppID = getEnvValue("INTERACTIVE_APP_ID", '')
 ext.Interactive_AppKey = getEnvValue("INTERACTIVE_APP_KEY", '')
 ext.Interactive_PlayDomain = getEnvValue("INTERACTIVE_PLAY_DOMAIN", '')
+ext.isAllInOne = allInOne
 
 //@keria:cannot make method static
 String getEnvValue(key, defValue) {
@@ -48,6 +49,7 @@ android {
 
     buildTypes {
         all {
+            buildConfigField "Boolean", "MTL_BUILD_FOR_AIO", "${isAllInOne}"
             buildConfigField "String", "MTL_BUILD_ID", "\"${MTL_buildId}\""
             buildConfigField "String", "MTL_BUILD_TIMESTAMP", "\"${MTL_buildTimestamp}\""
             buildConfigField "String", "INTERACTIVE_APP_ID", "\"${Interactive_AppID}\""

AliLivePushDemo/LiveApp/dependencies.gradle

@@ -0,0 +1,17 @@
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.aar'])
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'com.google.android.material:material:1.1.0'
+    implementation externalAndroidMultiDex
+    implementation project(':AUIFoundation:AVBaseUI')
+    implementation project(':AUIFoundation:AVTheme')
+    implementation project(':AUIFoundation:AVUtils')
+    implementation project(':LiveBasic:live_push')
+    implementation project(':LiveBasic:live_pull')
+    implementation project(':LiveBasic:live_pull_rts')
+    implementation project(':LiveBasic:live_screencap')
+    implementation project(':LiveInteractive:live_pk')
+    implementation project(':LiveInteractive:live_interactive')
+    implementation externalARouter
+    annotationProcessor externalARouterCompiler
+}

AliLivePushDemo/alivc-livepusher-demo/proguard-rules.pro → AliLivePushDemo/LiveApp/proguard-rules.pro

@@ -30,30 +30,20 @@
 -keep public class com.google.vending.licensing.ILicensingService
 -keep public class com.android.vending.licensing.ILicensingService
 
--keep class com.aliyun.clientinforeport.** {*;}
--keep class com.alivc.component.encoder.** { *;}
--keep class com.alivc.component.player.** { *; }
--keep class com.alivc.live.pusher.Alivc* { *;}
--keep class com.alivc.live.pusher.**  { *;}
--keep class com.alivc.live.utils.**  { *;}
--keep class com.alivc.live.pusher.LivePusherJNI { *;}
--keep class com.alivc.live.pusher.ILivePusher { *;}
--keep class com.alivc.component.capture.** { *;}
--keep class com.alivc.component.custom.** { *;}
--keep class com.alivc.live.pusher.WaterMarkInfo { *;}
--keep class com.alivc.live.pusher.LogUtil { *;}
--keep class com.alivc.live.pusher.SurfaceStatus { *; }
--keep class com.aliyun.rts.network.** { *; }
--keep class com.example.rtsnetsdkjar.** { *; }
--keep class com.uc.crashsdk.** { *; }
--keep class com.alivc.component.voice.** { *; }
--keep class com.aliyun.animoji.** { *; }
--keep class com.aliyun.player.** { *; }
-
-
+#2023-01-03最新混淆规则（直播SDK版本>=4.4.9，一体化SDK版本>=1.7.0）
+#SDK内部已做混淆，外部全部keep即可。
+#混淆规则请见官网文档：https://help.aliyun.com/document_detail/94843.html
+-keep class org.webrtc.** { *; }
+-keep class com.alivc.** { *; }
+-keep class com.aliyun.** { *; }
+-keep class com.cicada.** { *; }
+#2023-01-03最新混淆规则（直播SDK版本>=4.4.9，一体化SDK版本>=1.7.0）
 
 -keep class android.** { *;}
 
+#仅alivctest包才会用到的混淆规则
+-keep class com.uc.crashsdk.** { *; }
+
 # For native methods, see http:#proguard.sourceforge.net/manual/examples.html#native
 #保留native方法的类名和方法名
 -keepclasseswithmembernames class * {

AliLivePushDemo/alivc-livepusher-demo/src/alivctest/java/com/alivc/live/test/LiveApplication.java → AliLivePushDemo/LiveApp/src/alivctest/java/com/alivc/live/test/LiveApplication.java

@@ -13,9 +13,9 @@
 import com.alibaba.ha.adapter.Plugin;
 import com.alibaba.sdk.android.networkmonitor.NetworkMonitorManager;
 import com.alibaba.sdk.android.networkmonitor.utils.Logger;
+import com.alivc.live.baselive_push.PushLaunchManager;
 import com.alivc.live.pusher.AlivcLiveBase;
-import com.alivc.live.pusher.demo.PushLaunchManager;
-import com.alivc.live.utils.ContextUtils;
+import com.alivc.live.commonutils.ContextUtils;
 
 public class LiveApplication extends Application {
     @Override

AliLivePushDemo/alivc-livepusher-demo/src/main/AndroidManifest.xml → AliLivePushDemo/LiveApp/src/main/AndroidManifest.xml

@@ -53,56 +53,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".PushConfigActivity"
-            android:alwaysRetainTaskState="true"
-            android:configChanges="uiMode"
-            android:screenOrientation="portrait"
-            android:theme="@style/AVPushTheme" />
-        <activity
-            android:name=".test.InformationActivity"
-            android:alwaysRetainTaskState="true"
-            android:configChanges="uiMode"
-            android:screenOrientation="portrait"
-            android:theme="@style/AVPushTheme" />
-        <activity
-            android:name=".PlayerActivity"
-            android:alwaysRetainTaskState="true"
-            android:screenOrientation="portrait"
-            android:theme="@style/AVPushTheme" />
-        <activity
-            android:name=".VideoRecordConfigActivity"
-            android:alwaysRetainTaskState="true"
-            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            android:theme="@style/AVPushTheme" />
-        <activity
-            android:name=".LivePushActivity"
-            android:alwaysRetainTaskState="true"
-            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode"
-            android:exported="false"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
-
-        <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|camera" />
 
         <!--   请在此处填写申请到的license相关信息     -->
         <!--   推流SDK License文档: https://help.aliyun.com/document_detail/431730.html     -->

AliLivePushDemo/alivc-livepusher-demo/src/main/java/com/alivc/live/pusher/demo/LiveApplication.java → AliLivePushDemo/LiveApp/src/main/java/com/alivc/live/pusher/demo/LiveApplication.java

@@ -5,6 +5,8 @@
 import android.content.IntentFilter;
 import android.net.ConnectivityManager;
 
+import com.alivc.live.baselive_push.PushLaunchManager;
+import com.alivc.live.baselive_push.ui.LivePushActivity;
 import com.alivc.live.commonutils.ContextUtils;
 
 public class LiveApplication extends Application {

AliLivePushDemo/alivc-livepusher-demo/src/main/java/com/alivc/live/pusher/demo/MainActivity.java → AliLivePushDemo/LiveApp/src/main/java/com/alivc/live/pusher/demo/MainActivity.java

@@ -8,6 +8,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.text.method.LinkMovementMethod;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
@@ -21,15 +22,18 @@
 import androidx.core.content.PermissionChecker;
 
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.alivc.live.baselive_push.ui.PushConfigActivity;
 import com.alivc.live.annotations.AlivcLiveMode;
+import com.alivc.live.commonbiz.SharedPreferenceUtils;
+import com.alivc.live.commonbiz.test.PushDemoTestConstants;
 import com.alivc.live.pusher.AlivcLiveBase;
-import com.alivc.live.pusher.demo.test.PushDemoTestConstants;
-import com.aliyun.interactive_common.InteractAppInfoActivity;
-import com.aliyun.interactive_live.InteractLiveInputActivity;
-import com.aliyun.interactive_pk.PKLiveInputActivity;
+import com.alivc.live.baselive_pull.ui.PlayerActivity;
+import com.alivc.live.baselive_recording.ui.VideoRecordConfigActivity;
+import com.alivc.live.interactive_common.InteractAppInfoActivity;
+import com.alivc.live.interactive_live.InteractLiveInputActivity;
+import com.alivc.live.interactive_pk.PKLiveInputActivity;
 import com.alivc.live.commonutils.ContextUtils;
 import com.alivc.live.commonutils.FastClickUtil;
-import com.alivc.live.commonbiz.SharedPreferenceUtils;
 
 public class MainActivity extends AppCompatActivity implements View.OnClickListener {
     private LinearLayout mLivePushLayout;
@@ -39,6 +43,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     private LinearLayout mPKLiveInteractLayout;
     private TextView mVersion;//推流sdk版本号
     private String mPushUrl;
+    private TextView mAliyunSDKPrivacy;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -86,6 +91,8 @@ private void initView() {
         mPKLiveInteractLayout.setOnClickListener(this);
         mVersion = (TextView) findViewById(R.id.push_version);
         mVersion.setText(getString(R.string.version_desc) + AlivcLiveBase.getSDKVersion());
+        mAliyunSDKPrivacy = findViewById(R.id.aliyun_sdk_privacy);
+        mAliyunSDKPrivacy.setMovementMethod(LinkMovementMethod.getInstance());
 
         mLiveInteractLayout.setVisibility(AlivcLiveBase.isSupportLiveMode(AlivcLiveMode.AlivcLiveInteractiveMode) ? View.VISIBLE : View.GONE);
         mPKLiveInteractLayout.setVisibility(AlivcLiveBase.isSupportLiveMode(AlivcLiveMode.AlivcLiveInteractiveMode) ? View.VISIBLE : View.GONE);

AliLivePushDemo/alivc-livepusher-demo/src/main/java/com/alivc/live/pusher/demo/PushMainActivity.java → AliLivePushDemo/LiveApp/src/main/java/com/alivc/live/pusher/demo/PushMainActivity.java

@@ -10,22 +10,25 @@
 import android.os.Build;
 import android.text.TextUtils;
 
+import com.alivc.live.baselive_pull.ui.PlayerActivity;
+import com.alivc.live.baselive_pull_rts.InputRtsUrlActivity;
+import com.alivc.live.baselive_push.ui.PushConfigActivity;
+import com.alivc.live.baselive_recording.ui.VideoRecordConfigActivity;
 import com.alivc.live.annotations.AlivcLiveMode;
+import com.alivc.live.commonbiz.SharedPreferenceUtils;
+import com.alivc.live.commonbiz.test.PushDemoTestConstants;
 import com.alivc.live.pusher.AlivcLiveBase;
-import com.alivc.live.pusher.demo.rts.InputRtsUrlActivity;
-import com.alivc.live.pusher.demo.test.PushDemoTestConstants;
 import com.aliyun.aio.avbaseui.AVBaseListActivity;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.aliyun.interactive_common.InteractAppInfoActivity;
-import com.aliyun.interactive_live.InteractLiveInputActivity;
-import com.aliyun.interactive_pk.PKLiveInputActivity;
+import com.alivc.live.interactive_common.InteractAppInfoActivity;
+import com.alivc.live.interactive_live.InteractLiveInputActivity;
+import com.alivc.live.interactive_pk.PKLiveInputActivity;
 import com.alivc.live.commonutils.ContextUtils;
 import com.alivc.live.commonutils.FastClickUtil;
-import com.alivc.live.commonbiz.SharedPreferenceUtils;
 import com.alivc.live.commonutils.ToastUtils;
 
 @Route(path = "/live/MainActivity")
@@ -85,17 +88,17 @@ public void onListItemClick(ListModel model) {
 
         switch (model.index) {
             case INDEX_CAMERA_PUSH:
-                startActivity(new Intent(this, com.alivc.live.pusher.demo.PushConfigActivity.class));
+                startActivity(new Intent(this, PushConfigActivity.class));
 
                 break;
             case INDEX_SCREEN_PUSH:
-                startActivity(new Intent(this, com.alivc.live.pusher.demo.VideoRecordConfigActivity.class));
+                startActivity(new Intent(this, VideoRecordConfigActivity.class));
                 break;
             case INDEX_LOCAL_VIDEO_PUSH:
                 //0615本期不做
                 break;
             case INDEX_PULL:
-                startActivity(new Intent(this, com.alivc.live.pusher.demo.PlayerActivity.class));
+                startActivity(new Intent(this, PlayerActivity.class));
                 break;
             case INDEX_INTERACT_LIVE:
                 if (checkInteractiveAPPInfoIfNeed()) {