From 549a875cf8bd21a144e36391257aaf1bf7bb5d1f Mon Sep 17 00:00:00 2001 From: xufulong <839789740@qq.com> Date: Sat, 16 Nov 2019 13:10:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8D=A2=E6=88=90androidx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 换成androidx --- Live/build.gradle | 2 +- Live/src/main/java/com/frank/live/LiveActivity.java | 4 ++-- Live/src/main/java/com/frank/live/PushActivity.java | 2 +- OnLive/build.gradle | 8 ++++---- .../com/frank/living/activity/MultiScreenActivity.java | 2 +- .../java/com/frank/living/activity/RtspLiveActivity.java | 2 +- .../com/frank/living/widget/AndroidMediaController.java | 6 +++--- .../main/java/com/frank/living/widget/IRenderView.java | 4 ++-- .../main/java/com/frank/living/widget/IjkVideoView.java | 4 ++-- .../main/java/com/frank/living/widget/MeasureHelper.java | 2 +- .../java/com/frank/living/widget/SurfaceRenderView.java | 4 ++-- .../java/com/frank/living/widget/TableLayoutBinder.java | 2 +- .../java/com/frank/living/widget/TextureRenderView.java | 4 ++-- app/build.gradle | 6 +++--- .../main/java/com/frank/ffmpeg/activity/BaseActivity.java | 4 ++-- .../java/com/frank/ffmpeg/activity/FilterActivity.java | 4 ++-- .../java/com/frank/ffmpeg/adapter/HorizontalAdapter.java | 2 +- app/src/main/res/layout/activity_filter.xml | 2 +- gradle.properties | 5 ++++- 19 files changed, 36 insertions(+), 33 deletions(-) diff --git a/Live/build.gradle b/Live/build.gradle index c307b07..09cbd28 100644 --- a/Live/build.gradle +++ b/Live/build.gradle @@ -33,5 +33,5 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'androidx.appcompat:appcompat:1.1.0' } diff --git a/Live/src/main/java/com/frank/live/LiveActivity.java b/Live/src/main/java/com/frank/live/LiveActivity.java index 53be202..5216055 100644 --- a/Live/src/main/java/com/frank/live/LiveActivity.java +++ b/Live/src/main/java/com/frank/live/LiveActivity.java @@ -8,8 +8,8 @@ import android.media.AudioFormat; import android.os.Build; import android.os.Handler; import android.os.Message; -import android.support.annotation.NonNull; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.text.TextUtils; import android.util.Log; diff --git a/Live/src/main/java/com/frank/live/PushActivity.java b/Live/src/main/java/com/frank/live/PushActivity.java index 6baf7bd..3e69d11 100644 --- a/Live/src/main/java/com/frank/live/PushActivity.java +++ b/Live/src/main/java/com/frank/live/PushActivity.java @@ -9,7 +9,7 @@ import android.graphics.Bitmap; import android.hardware.Camera; import android.os.Bundle; import android.os.Environment; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import android.view.SurfaceHolder; import android.view.SurfaceHolder.Callback; diff --git a/OnLive/build.gradle b/OnLive/build.gradle index 2426d77..be8a324 100644 --- a/OnLive/build.gradle +++ b/OnLive/build.gradle @@ -39,10 +39,10 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support:preference-v7:28.0.0' - implementation 'com.android.support:support-annotations:28.0.0' - implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.preference:preference:1.1.0' + implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.recyclerview:recyclerview:1.1.0-rc01' implementation 'com.squareup:otto:1.3.8' diff --git a/OnLive/src/main/java/com/frank/living/activity/MultiScreenActivity.java b/OnLive/src/main/java/com/frank/living/activity/MultiScreenActivity.java index 1ceeec4..6b9d332 100644 --- a/OnLive/src/main/java/com/frank/living/activity/MultiScreenActivity.java +++ b/OnLive/src/main/java/com/frank/living/activity/MultiScreenActivity.java @@ -6,7 +6,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.PowerManager; import android.os.Process; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.text.TextUtils; import android.util.Log; diff --git a/OnLive/src/main/java/com/frank/living/activity/RtspLiveActivity.java b/OnLive/src/main/java/com/frank/living/activity/RtspLiveActivity.java index 74e7524..e9a6981 100644 --- a/OnLive/src/main/java/com/frank/living/activity/RtspLiveActivity.java +++ b/OnLive/src/main/java/com/frank/living/activity/RtspLiveActivity.java @@ -1,7 +1,7 @@ package com.frank.living.activity; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import android.view.View; import android.widget.ImageButton; diff --git a/OnLive/src/main/java/com/frank/living/widget/AndroidMediaController.java b/OnLive/src/main/java/com/frank/living/widget/AndroidMediaController.java index f16eb43..0971510 100644 --- a/OnLive/src/main/java/com/frank/living/widget/AndroidMediaController.java +++ b/OnLive/src/main/java/com/frank/living/widget/AndroidMediaController.java @@ -18,9 +18,9 @@ package com.frank.living.widget; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.app.ActionBar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; import android.util.AttributeSet; import android.view.View; import android.widget.MediaController; diff --git a/OnLive/src/main/java/com/frank/living/widget/IRenderView.java b/OnLive/src/main/java/com/frank/living/widget/IRenderView.java index 9130fda..694dcfb 100644 --- a/OnLive/src/main/java/com/frank/living/widget/IRenderView.java +++ b/OnLive/src/main/java/com/frank/living/widget/IRenderView.java @@ -18,8 +18,8 @@ package com.frank.living.widget; import android.graphics.SurfaceTexture; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.Surface; import android.view.SurfaceHolder; import android.view.View; diff --git a/OnLive/src/main/java/com/frank/living/widget/IjkVideoView.java b/OnLive/src/main/java/com/frank/living/widget/IjkVideoView.java index 2294308..7c29597 100644 --- a/OnLive/src/main/java/com/frank/living/widget/IjkVideoView.java +++ b/OnLive/src/main/java/com/frank/living/widget/IjkVideoView.java @@ -25,8 +25,8 @@ import android.media.AudioManager; import android.media.MediaPlayer; import android.net.Uri; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; diff --git a/OnLive/src/main/java/com/frank/living/widget/MeasureHelper.java b/OnLive/src/main/java/com/frank/living/widget/MeasureHelper.java index 8637aa8..bc0fc97 100644 --- a/OnLive/src/main/java/com/frank/living/widget/MeasureHelper.java +++ b/OnLive/src/main/java/com/frank/living/widget/MeasureHelper.java @@ -18,7 +18,7 @@ package com.frank.living.widget; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import com.frank.living.R; diff --git a/OnLive/src/main/java/com/frank/living/widget/SurfaceRenderView.java b/OnLive/src/main/java/com/frank/living/widget/SurfaceRenderView.java index fb98c28..c394216 100644 --- a/OnLive/src/main/java/com/frank/living/widget/SurfaceRenderView.java +++ b/OnLive/src/main/java/com/frank/living/widget/SurfaceRenderView.java @@ -21,8 +21,8 @@ import android.annotation.TargetApi; import android.content.Context; import android.graphics.SurfaceTexture; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.util.Log; import android.view.Surface; diff --git a/OnLive/src/main/java/com/frank/living/widget/TableLayoutBinder.java b/OnLive/src/main/java/com/frank/living/widget/TableLayoutBinder.java index 4c8d463..ae77045 100644 --- a/OnLive/src/main/java/com/frank/living/widget/TableLayoutBinder.java +++ b/OnLive/src/main/java/com/frank/living/widget/TableLayoutBinder.java @@ -18,7 +18,7 @@ package com.frank.living.widget; import android.content.Context; -import android.support.v7.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/OnLive/src/main/java/com/frank/living/widget/TextureRenderView.java b/OnLive/src/main/java/com/frank/living/widget/TextureRenderView.java index 8024de6..472feb3 100644 --- a/OnLive/src/main/java/com/frank/living/widget/TextureRenderView.java +++ b/OnLive/src/main/java/com/frank/living/widget/TextureRenderView.java @@ -21,8 +21,8 @@ import android.annotation.TargetApi; import android.content.Context; import android.graphics.SurfaceTexture; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.util.Log; import android.view.Surface; diff --git a/app/build.gradle b/app/build.gradle index 50e6b0c..599de3c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,7 +9,7 @@ android { targetSdkVersion rootProject.ext.targetSdkVersion versionCode rootProject.ext.versionCode versionName rootProject.ext.versionName - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" externalNativeBuild { cmake { @@ -42,8 +42,8 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support:recyclerview-v7:28.0.0' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.recyclerview:recyclerview:1.1.0-rc01' testImplementation 'junit:junit:4.12' implementation project(':Live') } diff --git a/app/src/main/java/com/frank/ffmpeg/activity/BaseActivity.java b/app/src/main/java/com/frank/ffmpeg/activity/BaseActivity.java index 11166a5..da90c9a 100644 --- a/app/src/main/java/com/frank/ffmpeg/activity/BaseActivity.java +++ b/app/src/main/java/com/frank/ffmpeg/activity/BaseActivity.java @@ -4,8 +4,8 @@ import android.Manifest; import android.content.Intent; import android.os.Build; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import android.text.TextUtils; import android.util.Log; import android.view.Menu; diff --git a/app/src/main/java/com/frank/ffmpeg/activity/FilterActivity.java b/app/src/main/java/com/frank/ffmpeg/activity/FilterActivity.java index 04c6c44..d84068c 100644 --- a/app/src/main/java/com/frank/ffmpeg/activity/FilterActivity.java +++ b/app/src/main/java/com/frank/ffmpeg/activity/FilterActivity.java @@ -4,8 +4,8 @@ import android.annotation.SuppressLint; import android.os.Handler; import android.os.Message; 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.view.SurfaceHolder; import android.view.SurfaceView; import android.view.View; diff --git a/app/src/main/java/com/frank/ffmpeg/adapter/HorizontalAdapter.java b/app/src/main/java/com/frank/ffmpeg/adapter/HorizontalAdapter.java index 452927b..c0ed3fe 100644 --- a/app/src/main/java/com/frank/ffmpeg/adapter/HorizontalAdapter.java +++ b/app/src/main/java/com/frank/ffmpeg/adapter/HorizontalAdapter.java @@ -1,7 +1,7 @@ package com.frank.ffmpeg.adapter; import android.graphics.Color; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/res/layout/activity_filter.xml b/app/src/main/res/layout/activity_filter.xml index d7ff05b..8e46f79 100644 --- a/app/src/main/res/layout/activity_filter.xml +++ b/app/src/main/res/layout/activity_filter.xml @@ -8,7 +8,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> -