Skip to content

Commit 1e28a5e

Browse files
garyxgwanggaryxgwang
committed
Fix bug, update sdk.
1 parent fc77a00 commit 1e28a5e

38 files changed

+266
-73
lines changed

‎Demo/app/build.gradle‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
applicationId "com.tencent.liteav.demo"
99
minSdkVersion rootProject.ext.minSdkVersion
1010
targetSdkVersion rootProject.ext.targetSdkVersion
11-
versionCode 20
12-
versionName "9.0.857"
11+
versionCode 22
12+
versionName "9.1.1084"
1313

1414
multiDexEnabled true
1515
ndk {
@@ -51,13 +51,13 @@ dependencies {
5151
compile project(':common')
5252
compile project(':superplayerdemo')
5353

54-
compile 'com.android.support:appcompat-v7:25.+'
55-
compile 'com.android.support:recyclerview-v7:25.+'
54+
compile 'androidx.appcompat:appcompat:1.0.0'
55+
compile 'androidx.recyclerview:recyclerview:1.0.0'
5656
compile 'com.squareup.okhttp3:logging-interceptor:3.8.1'
57-
compile 'com.android.support:multidex:1.0.0'
58-
compile 'com.android.support:appcompat-v7:25.+'
59-
compile 'com.android.support.constraint:constraint-layout:1.1.3'
60-
compile "com.android.support:design:$rootProject.ext.supportSdkVersion"
57+
compile 'androidx.multidex:multidex:2.0.0'
58+
compile 'androidx.appcompat:appcompat:1.0.0'
59+
compile 'androidx.constraintlayout:constraintlayout:1.1.3'
60+
compile 'com.google.android.material:material:1.0.0'
6161
compile 'com.squareup.picasso:picasso:2.71828'
6262
compile('com.blankj:utilcode:1.25.9', {
6363
exclude group: 'com.google.code.gson', module: 'gson'

‎Demo/app/src/main/java/com/tencent/liteav/demo/DemoApplication.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import android.os.Build;
44
import android.os.StrictMode;
5-
import android.support.multidex.MultiDexApplication;
5+
import androidx.multidex.MultiDexApplication;
66
import android.util.Log;
77

88
import com.tencent.bugly.Bugly;

‎Demo/app/src/main/java/com/tencent/liteav/demo/MainActivity.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import android.net.Uri;
88
import android.os.AsyncTask;
99
import android.os.Bundle;
10-
import android.support.v7.widget.LinearLayoutManager;
11-
import android.support.v7.widget.RecyclerView;
10+
import androidx.recyclerview.widget.LinearLayoutManager;
11+
import androidx.recyclerview.widget.RecyclerView;
1212
import android.util.Log;
1313
import android.view.LayoutInflater;
1414
import android.view.View;
@@ -52,7 +52,7 @@ protected void onCreate(Bundle savedInstanceState) {
5252
setContentView(R.layout.activity_main);
5353

5454
mTvVersion = (TextView) findViewById(R.id.main_tv_version);
55-
mTvVersion.setText(getString(R.string.app_tv_super_player_version, TXLiveBase.getSDKVersionStr()+"(9.0.857)"));
55+
mTvVersion.setText(getString(R.string.app_tv_super_player_version, TXLiveBase.getSDKVersionStr()+"(9.1.1084)"));
5656

5757
mMainTitle = (TextView) findViewById(R.id.main_title);
5858
mMainTitle.setOnLongClickListener(new View.OnLongClickListener() {

‎Demo/app/src/main/java/com/tencent/liteav/demo/SplashActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import android.net.Uri;
77
import android.os.Build;
88
import android.os.Bundle;
9-
import android.support.annotation.Nullable;
9+
import androidx.annotation.Nullable;
1010
import android.text.TextUtils;
1111
import android.util.Log;
1212

‎Demo/app/src/main/java/com/tencent/liteav/demo/WebViewActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import android.graphics.Color;
55
import android.os.Build;
66
import android.os.Bundle;
7-
import android.support.annotation.Nullable;
7+
import androidx.annotation.Nullable;
88
import android.text.TextUtils;
99
import android.view.View;
1010
import android.view.Window;

‎Demo/app/src/main/java/com/tencent/liteav/demo/common/widget/expandableadapter/BaseExpandableRecyclerViewAdapter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
package com.tencent.liteav.demo.common.widget.expandableadapter;
1515

16-
import android.support.annotation.NonNull;
17-
import android.support.v7.widget.RecyclerView;
16+
import androidx.annotation.NonNull;
17+
import androidx.recyclerview.widget.RecyclerView;
1818
import android.util.Log;
1919
import android.view.View;
2020
import android.view.ViewGroup;

‎Demo/app/src/main/java/com/tencent/liteav/demo/common/widget/expandableadapter/ViewProducer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
package com.tencent.liteav.demo.common.widget.expandableadapter;
1515

16-
import android.support.v7.widget.RecyclerView;
16+
import androidx.recyclerview.widget.RecyclerView;
1717
import android.view.View;
1818
import android.view.ViewGroup;
1919

‎Demo/app/src/main/res/layout/activity_main.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
android:src="@drawable/ic_head" />
3232
</RelativeLayout>
3333

34-
<android.support.v7.widget.RecyclerView
34+
<androidx.recyclerview.widget.RecyclerView
3535
android:id="@+id/main_recycler_view"
3636
android:layout_width="match_parent"
3737
android:layout_height="0dp"

‎Demo/app/src/main/res/layout/activity_trtc_main.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</RelativeLayout>
4040

4141

42-
<android.support.v7.widget.RecyclerView
42+
<androidx.recyclerview.widget.RecyclerView
4343
android:layout_marginTop="120dp"
4444
android:id="@+id/main_recycler_view"
4545
android:layout_width="match_parent"

‎Demo/app/src/main/res/layout/activity_webrtc.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
66
android:layout_height="match_parent">
77

8-
<android.support.constraint.ConstraintLayout
8+
<androidx.constraintlayout.widget.ConstraintLayout
99
android:layout_width="0dp"
1010
android:layout_height="0dp"
1111
android:layout_marginTop="41dp"
@@ -14,28 +14,28 @@
1414
app:layout_constraintRight_toRightOf="parent"
1515
app:layout_constraintTop_toTopOf="parent">
1616

17-
<android.support.constraint.Guideline
17+
<androidx.constraintlayout.widget.Guideline
1818
android:id="@+id/guideline_v"
1919
android:layout_width="wrap_content"
2020
android:layout_height="match_parent"
2121
android:orientation="vertical"
2222
app:layout_constraintGuide_percent="0.5" />
2323

24-
<android.support.constraint.Guideline
24+
<androidx.constraintlayout.widget.Guideline
2525
android:id="@+id/guideline_h"
2626
android:layout_width="wrap_content"
2727
android:layout_height="match_parent"
2828
android:orientation="horizontal"
2929
app:layout_constraintGuide_percent="0.5" />
3030

31-
<android.support.constraint.Guideline
31+
<androidx.constraintlayout.widget.Guideline
3232
android:id="@+id/guideline_t"
3333
android:layout_width="wrap_content"
3434
android:layout_height="match_parent"
3535
android:orientation="horizontal"
3636
app:layout_constraintGuide_percent="0.1" />
3737

38-
<android.support.constraint.Guideline
38+
<androidx.constraintlayout.widget.Guideline
3939
android:id="@+id/guideline_b"
4040
android:layout_width="wrap_content"
4141
android:layout_height="match_parent"
@@ -324,7 +324,7 @@
324324

325325
</LinearLayout>
326326

327-
</android.support.constraint.ConstraintLayout>
327+
</androidx.constraintlayout.widget.ConstraintLayout>
328328

329329

330330
<FrameLayout
@@ -379,4 +379,4 @@
379379

380380
</FrameLayout>
381381

382-
</android.support.constraint.ConstraintLayout>
382+
</androidx.constraintlayout.widget.ConstraintLayout>

0 commit comments

Comments
 (0)