Fix bug, update sdk.

LiteAVSDK · Sep 3, 2021 · 1e28a5e · 1e28a5e
1 parent fc77a00
commit 1e28a5e
Show file tree

Hide file tree

Showing 38 changed files with 266 additions and 73 deletions.
diff --git a/Demo/app/build.gradle b/Demo/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.tencent.liteav.demo"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 20
-        versionName "9.0.857"
+        versionCode 22
+        versionName "9.1.1084"
 
         multiDexEnabled true
         ndk {
@@ -51,13 +51,13 @@ dependencies {
     compile project(':common')
     compile project(':superplayerdemo')
 
-    compile 'com.android.support:appcompat-v7:25.+'
-    compile 'com.android.support:recyclerview-v7:25.+'
+    compile 'androidx.appcompat:appcompat:1.0.0'
+    compile 'androidx.recyclerview:recyclerview:1.0.0'
     compile 'com.squareup.okhttp3:logging-interceptor:3.8.1'
-    compile 'com.android.support:multidex:1.0.0'
-    compile 'com.android.support:appcompat-v7:25.+'
-    compile 'com.android.support.constraint:constraint-layout:1.1.3'
-    compile "com.android.support:design:$rootProject.ext.supportSdkVersion"
+    compile 'androidx.multidex:multidex:2.0.0'
+    compile 'androidx.appcompat:appcompat:1.0.0'
+    compile 'androidx.constraintlayout:constraintlayout:1.1.3'
+    compile 'com.google.android.material:material:1.0.0'
     compile 'com.squareup.picasso:picasso:2.71828'
     compile('com.blankj:utilcode:1.25.9', {
         exclude group: 'com.google.code.gson', module: 'gson'

diff --git a/Demo/app/src/main/java/com/tencent/liteav/demo/DemoApplication.java b/Demo/app/src/main/java/com/tencent/liteav/demo/DemoApplication.java
@@ -2,7 +2,7 @@
 
 import android.os.Build;
 import android.os.StrictMode;
-import android.support.multidex.MultiDexApplication;
+import androidx.multidex.MultiDexApplication;
 import android.util.Log;
 
 import com.tencent.bugly.Bugly;

diff --git a/Demo/app/src/main/java/com/tencent/liteav/demo/MainActivity.java b/Demo/app/src/main/java/com/tencent/liteav/demo/MainActivity.java
@@ -7,8 +7,8 @@
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -52,7 +52,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
 
         mTvVersion = (TextView) findViewById(R.id.main_tv_version);
-        mTvVersion.setText(getString(R.string.app_tv_super_player_version, TXLiveBase.getSDKVersionStr()+"(9.0.857)"));
+        mTvVersion.setText(getString(R.string.app_tv_super_player_version, TXLiveBase.getSDKVersionStr()+"(9.1.1084)"));
 
         mMainTitle = (TextView) findViewById(R.id.main_title);
         mMainTitle.setOnLongClickListener(new View.OnLongClickListener() {

diff --git a/Demo/app/src/main/java/com/tencent/liteav/demo/SplashActivity.java b/Demo/app/src/main/java/com/tencent/liteav/demo/SplashActivity.java
@@ -6,7 +6,7 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
 

diff --git a/Demo/app/src/main/java/com/tencent/liteav/demo/WebViewActivity.java b/Demo/app/src/main/java/com/tencent/liteav/demo/WebViewActivity.java
@@ -4,7 +4,7 @@
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.Window;

diff --git a/...encent/liteav/demo/common/widget/expandableadapter/BaseExpandableRecyclerViewAdapter.java b/...encent/liteav/demo/common/widget/expandableadapter/BaseExpandableRecyclerViewAdapter.java
@@ -13,8 +13,8 @@
 
 package com.tencent.liteav.demo.common.widget.expandableadapter;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/...p/src/main/java/com/tencent/liteav/demo/common/widget/expandableadapter/ViewProducer.java b/...p/src/main/java/com/tencent/liteav/demo/common/widget/expandableadapter/ViewProducer.java
@@ -13,7 +13,7 @@
 
 package com.tencent.liteav.demo.common.widget.expandableadapter;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 

diff --git a/Demo/app/src/main/res/layout/activity_main.xml b/Demo/app/src/main/res/layout/activity_main.xml
@@ -31,7 +31,7 @@
             android:src="@drawable/ic_head" />
     </RelativeLayout>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/main_recycler_view"
         android:layout_width="match_parent"
         android:layout_height="0dp"

diff --git a/Demo/app/src/main/res/layout/activity_trtc_main.xml b/Demo/app/src/main/res/layout/activity_trtc_main.xml
@@ -39,7 +39,7 @@
         </RelativeLayout>
 
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:layout_marginTop="120dp"
             android:id="@+id/main_recycler_view"
             android:layout_width="match_parent"

diff --git a/Demo/app/src/main/res/layout/activity_webrtc.xml b/Demo/app/src/main/res/layout/activity_webrtc.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginTop="41dp"
@@ -14,28 +14,28 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <android.support.constraint.Guideline
+        <androidx.constraintlayout.widget.Guideline
             android:id="@+id/guideline_v"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:orientation="vertical"
             app:layout_constraintGuide_percent="0.5" />
 
-        <android.support.constraint.Guideline
+        <androidx.constraintlayout.widget.Guideline
             android:id="@+id/guideline_h"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:orientation="horizontal"
             app:layout_constraintGuide_percent="0.5" />
 
-        <android.support.constraint.Guideline
+        <androidx.constraintlayout.widget.Guideline
             android:id="@+id/guideline_t"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:orientation="horizontal"
             app:layout_constraintGuide_percent="0.1" />
 
-        <android.support.constraint.Guideline
+        <androidx.constraintlayout.widget.Guideline
             android:id="@+id/guideline_b"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
@@ -324,7 +324,7 @@
 
         </LinearLayout>
 
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 
     <FrameLayout
@@ -379,4 +379,4 @@
 
     </FrameLayout>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Demo/app/src/main/res/layout/app_activity_about.xml b/Demo/app/src/main/res/layout/app_activity_about.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -135,4 +135,4 @@
         android:layout_width="match_parent"
         android:layout_height="1dp" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Demo/app/src/main/res/layout/app_activity_log_off.xml b/Demo/app/src/main/res/layout/app_activity_log_off.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -83,4 +83,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_account" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Demo/app/src/main/res/layout/app_activity_my_info.xml b/Demo/app/src/main/res/layout/app_activity_my_info.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/app_content_bg"
     android:orientation="vertical">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/rl_title"
         android:layout_width="match_parent"
         android:layout_height="42dp"
         android:layout_marginTop="28dp"
-        android:layout_marginRight="10dp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -28,7 +27,7 @@
             android:textColor="@color/app_color_white"
             android:textSize="18sp"
             android:textStyle="bold" />
-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>
 
     <de.hdodenhof.circleimageview.CircleImageView
         android:id="@+id/iv_avatar"
@@ -53,7 +52,6 @@
         app:layout_constraintTop_toBottomOf="@id/iv_avatar"
         tools:text="nickname" />
 
-
     <ImageView
         android:id="@+id/img_show_name"
         android:layout_width="16dp"
@@ -72,8 +70,8 @@
         android:layout_marginTop="6dp"
         android:textColor="#999999"
         android:textSize="16sp"
-        app:layout_constraintLeft_toLeftOf="@id/tv_show_name"
-        app:layout_constraintRight_toRightOf="@id/img_show_name"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tv_show_name"
         tools:text="ID:264738" />
 
@@ -251,4 +249,4 @@
         android:textSize="12sp"
         app:layout_constraintBottom_toTopOf="@id/tv_tips" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Demo/app/src/main/res/layout/app_show_tip_dialog_confirm.xml b/Demo/app/src/main/res/layout/app_show_tip_dialog_confirm.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="270dp"
     android:layout_height="wrap_content"
@@ -30,7 +30,7 @@
         app:layout_constraintTop_toBottomOf="@id/tv_message" />
 
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cl_button_panel"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -49,7 +49,7 @@
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent" />
 
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Demo/app/src/main/res/layout/app_view_modify_nickname_dialog.xml b/Demo/app/src/main/res/layout/app_view_modify_nickname_dialog.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -68,4 +68,4 @@
         android:layout_marginLeft="20dp"
         android:textSize="14sp" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Demo/app/src/main/res/layout/app_view_modify_user_avatar_dialog.xml b/Demo/app/src/main/res/layout/app_view_modify_user_avatar_dialog.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -33,12 +33,12 @@
         android:layout_marginRight="20dp"
         android:textSize="16sp" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_avatar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         app:layout_constraintTop_toBottomOf="@id/title" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Demo/app/src/main/res/layout/module_trtc_entry_item.xml b/Demo/app/src/main/res/layout/module_trtc_entry_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/item_cl"
@@ -48,4 +48,4 @@
         app:layout_constraintTop_toBottomOf="@+id/img_item"
         tools:text="@string/item_video_conferencing" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Demo/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/Demo/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/Demo/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/Demo/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/Demo/app/src/main/res/values-en/strings.xml b/Demo/app/src/main/res/values-en/strings.xml
@@ -97,4 +97,11 @@
     <string name="app_item_scene">Scene</string>
     <string name="app_debug_switch_open">Open Debug</string>
     <string name="app_debug_switch_close">Close Debug</string>
+
+    <string name="app_item_other_tools">Other tools</string>
+    <string name="item_live_pusher_v1">Push (Camera) V1</string>
+    <string name="item_live_pusher_video_v1">Video Share V1</string>
+    <string name="item_live_pusher_screen_v1">Screen Share V1</string>
+    <string name="item_live_player_v1">Pull V1</string>
+    <string name="item_link_mic_v1">Co-anchoring (Old)</string>
 </resources>
diff --git a/Demo/app/src/main/res/values-zh/strings.xml b/Demo/app/src/main/res/values-zh/strings.xml
@@ -79,4 +79,11 @@
     <string name="app_item_scene">场景应用</string>
     <string name="app_debug_switch_open">DEBUG开关已打开</string>
     <string name="app_debug_switch_close">DEBUG开关已关闭</string>
+
+    <string name="app_item_other_tools">其他工具</string>
+    <string name="item_live_pusher_v1">直播推流 V1</string>
+    <string name="item_live_pusher_video_v1">视频分享 V1</string>
+    <string name="item_live_pusher_screen_v1">屏幕分享 V1</string>
+    <string name="item_live_player_v1">直播拉流 V1</string>
+    <string name="item_link_mic_v1">连麦演示 V1</string>
 </resources>
diff --git a/Demo/app/src/main/res/values/strings.xml b/Demo/app/src/main/res/values/strings.xml
@@ -111,4 +111,11 @@
     <string name="app_debug_switch_close">DEBUG开关已关闭</string>
     <string name="app_vod_player">点播播放器</string>
     <string name="app_rtc_player">超低延时播放</string>
+
+    <string name="app_item_other_tools">其他工具</string>
+    <string name="item_live_pusher_v1">直播推流 V1</string>
+    <string name="item_live_pusher_video_v1">视频分享 V1</string>
+    <string name="item_live_pusher_screen_v1">屏幕分享 V1</string>
+    <string name="item_live_player_v1">直播拉流 V1</string>
+    <string name="item_link_mic_v1">连麦演示 V1</string>
 </resources>
diff --git a/Demo/build.gradle b/Demo/build.gradle
@@ -48,7 +48,7 @@ if (!videoEngineSourcePath.isEmpty()) {
 }
 
 ext {
-    compileSdkVersion = 26
+    compileSdkVersion = 28
     buildToolsVersion = "26.0.2"
     supportSdkVersion = "26.1.0"
     minSdkVersion = 19