#### 2021-02-18 V7.0.3

- *.[改进]项目改成基于AndroidX。

CHANGELOG.md

@@ -1,3 +1,7 @@
+####  2021-02-18 V7.0.3
+
+- *.[改进]项目改成基于AndroidX。
+
 ####  2020-12-17 V7.0.2
 
 - *.[改进]改进歌词界面时间显示,贴合屏幕左上角。

app/build.gradle

@@ -2,18 +2,18 @@ apply plugin: 'com.android.application'
 apply plugin: 'org.greenrobot.greendao'
 
 android {
-    buildToolsVersion '28.0.3'
+    buildToolsVersion '29.0.2'
     compileSdkVersion 29
     defaultConfig {
         applicationId "com.zlm.hp"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 9
-        versionName "V7.0.2"
+        versionCode 10
+        versionName "V7.0.3"
         /**添加多 dex分包支持*/
         multiDexEnabled true
         useLibrary 'org.apache.http.legacy'
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         ndk {
             // 设置支持的SO库架构
             abiFilters 'armeabi', 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a'
@@ -47,15 +47,15 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'com.android.support:appcompat-v7:28+'
-    implementation 'com.android.support:support-v4:28.0.0'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
     testImplementation 'junit:junit:4.12'
-    implementation 'com.android.support:multidex:1.0.1'
+    implementation 'androidx.multidex:multidex:2.0.0'
     //第三方bugly
     implementation 'com.tencent.bugly:crashreport:latest.release'
     //其中latest.release指代最新Bugly SDK版本号，也可以指定明确的版本号，例如2.1.9

app/src/androidTest/java/com/zlm/hp/DownloadTaskTest.java

@@ -5,6 +5,8 @@ import android.support.test.InstrumentationRegistry;
 import android.support.test.runner.AndroidJUnit4;
 import android.util.Log;
 
+import androidx.test.runner.AndroidJUnit4;
+
 import com.zlm.down.entity.DownloadTask;
 import com.zlm.down.interfaces.IDownloadTaskEvent;
 import com.zlm.down.manager.DownloadTaskManager;

app/src/main/java/com/zlm/hp/PageTransformer/ZoomOutPageTransformer.java

@@ -1,10 +1,11 @@
 package com.zlm.hp.PageTransformer;
 
 import android.annotation.SuppressLint;
-import android.support.v4.view.ViewPager;
 import android.util.Log;
 import android.view.View;
 
+import androidx.viewpager.widget.ViewPager;
+
 /**
  * viewpage动画
  */

app/src/main/java/com/zlm/hp/adapter/AudioAdapter.java

@@ -1,7 +1,6 @@
 package com.zlm.hp.adapter;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -15,6 +14,8 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.zlm.hp.constants.ConfigInfo;
 import com.zlm.hp.db.util.AudioInfoDB;
 import com.zlm.hp.db.util.DownloadThreadInfoDB;

app/src/main/java/com/zlm/hp/adapter/DownloadMusicAdapter.java

@@ -1,7 +1,6 @@
 package com.zlm.hp.adapter;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -11,6 +10,8 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.zlm.down.entity.DownloadTask;
 import com.zlm.hp.constants.ConfigInfo;
 import com.zlm.hp.db.util.AudioInfoDB;

app/src/main/java/com/zlm/hp/adapter/FileManagerAdapter.java

@@ -1,13 +1,14 @@
 package com.zlm.hp.adapter;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.RadioButton;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.zlm.hp.entity.FileInfo;
 import com.zlm.hp.ui.R;
 import com.zlm.hp.widget.ListItemRelativeLayout;

app/src/main/java/com/zlm/hp/adapter/LrcPopSingerAdapter.java

@@ -1,13 +1,14 @@
 package com.zlm.hp.adapter;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.zlm.hp.async.AsyncHandlerTask;
 import com.zlm.hp.constants.ConfigInfo;
 import com.zlm.hp.handler.WeakRefHandler;

app/src/main/java/com/zlm/hp/adapter/MVAdapter.java

@@ -1,13 +1,14 @@
 package com.zlm.hp.adapter;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.zlm.hp.async.AsyncHandlerTask;
 import com.zlm.hp.constants.ConfigInfo;
 import com.zlm.hp.constants.ResourceConstants;

app/src/main/java/com/zlm/hp/adapter/PopPlayListAdapter.java

@@ -2,8 +2,6 @@ package com.zlm.hp.adapter;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -12,6 +10,9 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.zlm.hp.async.AsyncHandlerTask;
 import com.zlm.hp.constants.ConfigInfo;
 import com.zlm.hp.db.util.AudioInfoDB;

app/src/main/java/com/zlm/hp/adapter/RecommendAdapter.java

@@ -1,13 +1,14 @@
 package com.zlm.hp.adapter;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.zlm.hp.async.AsyncHandlerTask;
 import com.zlm.hp.constants.ConfigInfo;
 import com.zlm.hp.constants.ResourceConstants;

app/src/main/java/com/zlm/hp/adapter/SearchLrcFragmentAdapter.java

@@ -1,12 +1,13 @@
 package com.zlm.hp.adapter;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+
 import com.zlm.hp.entity.AudioInfo;
 import com.zlm.hp.entity.LrcInfo;
 import com.zlm.hp.fragment.LrcFragment;

app/src/main/java/com/zlm/hp/adapter/SearchSingerAdapter.java

@@ -1,13 +1,14 @@
 package com.zlm.hp.adapter;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.zlm.hp.async.AsyncHandlerTask;
 import com.zlm.hp.constants.ResourceConstants;
 import com.zlm.hp.entity.SingerInfo;

app/src/main/java/com/zlm/hp/adapter/SpecialAdapter.java

@@ -1,13 +1,14 @@
 package com.zlm.hp.adapter;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.zlm.hp.async.AsyncHandlerTask;
 import com.zlm.hp.constants.ConfigInfo;
 import com.zlm.hp.constants.ResourceConstants;

app/src/main/java/com/zlm/hp/adapter/TabFragmentAdapter.java

@@ -1,8 +1,7 @@
 package com.zlm.hp.adapter;
-
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/zlm/hp/adapter/ToolAdapter.java

@@ -1,14 +1,15 @@
 package com.zlm.hp.adapter;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.zlm.hp.entity.ToolInfo;
 import com.zlm.hp.ui.R;
 

app/src/main/java/com/zlm/hp/adapter/ViewPageFragmentAdapter.java

@@ -1,8 +1,8 @@
 package com.zlm.hp.adapter;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/zlm/hp/adapter/tool/MakeExtraLrcAdapter.java

@@ -2,12 +2,13 @@ package com.zlm.hp.adapter.tool;
 
 import android.content.Context;
 import android.graphics.Color;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.zlm.hp.lyrics.model.make.MakeExtraLrcLineInfo;
 import com.zlm.hp.lyrics.utils.StringUtils;
 import com.zlm.hp.ui.R;

app/src/main/java/com/zlm/hp/application/HPApplication.java

@@ -6,9 +6,10 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.multidex.MultiDexApplication;
 import android.text.TextUtils;
 
+import androidx.multidex.MultiDexApplication;
+
 import com.dou361.dialogui.DialogUIUtils;
 import com.squareup.leakcanary.LeakCanary;
 import com.squareup.leakcanary.RefWatcher;
@@ -87,10 +88,10 @@ public class HPApplication extends MultiDexApplication {
         initLog(ResourceConstants.PATH_LOGCAT);
 
         //初始化bugly
-        initBugly();
+        //initBugly();
 
         //初始化LeakCanary
-        initLeakCanary();
+        //initLeakCanary();
 
         // 获取当前进程名
         String processName = getProcessName(android.os.Process.myPid());

app/src/main/java/com/zlm/hp/fragment/BaseFragment.java

@@ -7,9 +7,11 @@ import android.os.HandlerThread;
 import android.os.Looper;
 import android.os.Message;
 import android.os.Process;
-import android.support.constraint.ConstraintLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
+
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/zlm/hp/fragment/DownloadMusicFragment.java

@@ -5,14 +5,15 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Message;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.zlm.down.entity.DownloadTask;
 import com.zlm.hp.adapter.DownloadMusicAdapter;
 import com.zlm.hp.db.util.AudioInfoDB;

app/src/main/java/com/zlm/hp/fragment/LastSongFragment.java

@@ -4,10 +4,11 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Message;
-import android.support.v7.widget.LinearLayoutManager;
 import android.text.TextUtils;
 import android.view.View;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
+
 import com.github.jdsjlzx.interfaces.OnRefreshListener;
 import com.github.jdsjlzx.recyclerview.LRecyclerView;
 import com.github.jdsjlzx.recyclerview.LRecyclerViewAdapter;

app/src/main/java/com/zlm/hp/fragment/RecommendFragment.java

@@ -2,9 +2,10 @@ package com.zlm.hp.fragment;
 
 import android.os.Bundle;
 import android.os.Message;
-import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
+
 import com.github.jdsjlzx.interfaces.OnRefreshListener;
 import com.github.jdsjlzx.recyclerview.LRecyclerView;
 import com.github.jdsjlzx.recyclerview.LRecyclerViewAdapter;

app/src/main/java/com/zlm/hp/fragment/SearchFragment.java

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Message;
-import android.support.v7.widget.LinearLayoutManager;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -16,6 +15,8 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
+
 import com.github.jdsjlzx.interfaces.OnLoadMoreListener;
 import com.github.jdsjlzx.interfaces.OnNetWorkErrorListener;
 import com.github.jdsjlzx.interfaces.OnRefreshListener;

app/src/main/java/com/zlm/hp/fragment/SongFragment.java

@@ -4,13 +4,14 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Message;
-import android.support.v7.widget.LinearLayoutManager;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
+
 import com.github.jdsjlzx.interfaces.OnLoadMoreListener;
 import com.github.jdsjlzx.interfaces.OnNetWorkErrorListener;
 import com.github.jdsjlzx.interfaces.OnRefreshListener;

app/src/main/java/com/zlm/hp/fragment/SpecialFragment.java

@@ -2,9 +2,10 @@ package com.zlm.hp.fragment;
 
 import android.os.Bundle;
 import android.os.Message;
-import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
+
 import com.github.jdsjlzx.interfaces.OnLoadMoreListener;
 import com.github.jdsjlzx.interfaces.OnNetWorkErrorListener;
 import com.github.jdsjlzx.interfaces.OnRefreshListener;

app/src/main/java/com/zlm/hp/fragment/tool/MakeExtraLrcFragment.java

@@ -4,9 +4,6 @@ import android.graphics.Color;
 import android.media.AudioManager;
 import android.os.Bundle;
 import android.os.Message;
-import android.support.v7.widget.DividerItemDecoration;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
@@ -15,6 +12,10 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.dou361.dialogui.DialogUIUtils;
 import com.dou361.dialogui.listener.DialogUIListener;
 import com.zlm.hp.adapter.tool.MakeExtraLrcAdapter;

app/src/main/java/com/zlm/hp/ui/BaseActivity.java

@@ -7,10 +7,11 @@ import android.os.HandlerThread;
 import android.os.Looper;
 import android.os.Message;
 import android.os.Process;
-import android.support.annotation.Nullable;
-import android.support.constraint.ConstraintLayout;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/zlm/hp/ui/LrcActivity.java

@@ -6,8 +6,6 @@ import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.View;
@@ -21,6 +19,9 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.zlm.down.entity.DownloadTask;
 import com.zlm.hp.adapter.LrcPopSingerAdapter;
 import com.zlm.hp.adapter.PopPlayListAdapter;

app/src/main/java/com/zlm/hp/ui/MainActivity.java

@@ -9,11 +9,12 @@ import android.graphics.drawable.BitmapDrawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Message;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewPager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewpager.widget.ViewPager;
+
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.view.Display;

app/src/main/java/com/zlm/hp/ui/SearchLrcActivity.java

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Message;
-import android.support.v4.view.ViewPager;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.KeyEvent;
@@ -18,6 +17,8 @@ import android.widget.EditText;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.viewpager.widget.ViewPager;
+
 import com.zlm.hp.PageTransformer.ZoomOutPageTransformer;
 import com.zlm.hp.adapter.SearchLrcFragmentAdapter;
 import com.zlm.hp.constants.ConfigInfo;

app/src/main/java/com/zlm/hp/ui/SearchMVActivity.java

@@ -3,11 +3,12 @@ package com.zlm.hp.ui;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Message;
-import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
+
 import com.github.jdsjlzx.interfaces.OnLoadMoreListener;
 import com.github.jdsjlzx.interfaces.OnNetWorkErrorListener;
 import com.github.jdsjlzx.interfaces.OnRefreshListener;

app/src/main/java/com/zlm/hp/ui/SearchSingerActivity.java

@@ -2,8 +2,6 @@ package com.zlm.hp.ui;
 
 import android.os.Bundle;
 import android.os.Message;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.animation.Animation;
@@ -13,6 +11,9 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.zlm.hp.adapter.SearchSingerAdapter;
 import com.zlm.hp.constants.ConfigInfo;
 import com.zlm.hp.db.util.SingerInfoDB;

app/src/main/java/com/zlm/hp/ui/SplashActivity.java

@@ -9,8 +9,8 @@ import android.graphics.Color;
 import android.media.MediaPlayer;
 import android.os.Bundle;
 import android.os.Message;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.PermissionChecker;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.PermissionChecker;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 

app/src/main/java/com/zlm/hp/ui/ToolActivity.java

@@ -3,12 +3,13 @@ package com.zlm.hp.ui;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Message;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.zlm.hp.adapter.ToolAdapter;
 import com.zlm.hp.entity.ToolInfo;
 import com.zlm.libs.widget.SwipeBackLayout;

app/src/main/java/com/zlm/hp/ui/tool/FileManagerActivity.java

@@ -4,8 +4,6 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Message;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
@@ -14,6 +12,9 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.zlm.hp.adapter.FileManagerAdapter;
 import com.zlm.hp.entity.FileInfo;
 import com.zlm.hp.entity.StorageInfo;

app/src/main/java/com/zlm/hp/ui/tool/MakeLrcActivity.java

@@ -2,9 +2,10 @@ package com.zlm.hp.ui.tool;
 
 import android.os.Bundle;
 import android.os.Message;
-import android.support.v4.app.Fragment;
 import android.text.TextUtils;
 
+import androidx.fragment.app.Fragment;
+
 import com.zlm.hp.adapter.ViewPageFragmentAdapter;
 import com.zlm.hp.entity.AudioInfo;
 import com.zlm.hp.entity.tool.MakeInfo;

app/src/main/java/com/zlm/hp/ui/tool/MakeTranslateLrcActivity.java

@@ -4,7 +4,6 @@ import android.graphics.Color;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Message;
-import android.support.v4.app.Fragment;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
@@ -12,6 +11,8 @@ import android.widget.EditText;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.fragment.app.Fragment;
+
 import com.zlm.hp.adapter.ViewPageFragmentAdapter;
 import com.zlm.hp.entity.AudioInfo;
 import com.zlm.hp.entity.tool.MakeInfo;

app/src/main/java/com/zlm/hp/ui/tool/MakeTransliterationLrcActivity.java

@@ -4,7 +4,6 @@ import android.graphics.Color;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Message;
-import android.support.v4.app.Fragment;
 import android.text.Editable;
 import android.text.InputFilter;
 import android.text.Spanned;
@@ -16,6 +15,8 @@ import android.widget.EditText;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.fragment.app.Fragment;
+
 import com.zlm.hp.adapter.ViewPageFragmentAdapter;
 import com.zlm.hp.constants.ConfigInfo;
 import com.zlm.hp.entity.AudioInfo;

app/src/main/java/com/zlm/hp/util/AppBarUtil.java

@@ -5,12 +5,13 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Color;
 import android.os.Build;
-import android.support.annotation.NonNull;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 
+import androidx.annotation.NonNull;
+
 
 /**
  * app状态栏和底部导航菜单

app/src/main/java/com/zlm/hp/widget/CustomViewPager.java

@@ -1,10 +1,11 @@
 package com.zlm.hp.widget;
 
 import android.content.Context;
-import android.support.v4.view.ViewPager;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
+import androidx.viewpager.widget.ViewPager;
+
 /**
  *
  */

app/src/main/java/com/zlm/hp/widget/IconfontImageButtonTextView.java

@@ -2,11 +2,12 @@ package com.zlm.hp.widget;
 
 import android.content.Context;
 import android.graphics.Typeface;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatTextView;
 import android.text.TextPaint;
 import android.util.AttributeSet;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatTextView;
+
 import com.zlm.hp.util.ColorUtil;
 import com.zlm.hp.util.FontUtil;
 

app/src/main/java/com/zlm/hp/widget/IconfontIndicatorTextView.java

@@ -2,11 +2,12 @@ package com.zlm.hp.widget;
 
 import android.content.Context;
 import android.graphics.Typeface;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatTextView;
 import android.text.TextPaint;
 import android.util.AttributeSet;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatTextView;
+
 import com.zlm.hp.util.ColorUtil;
 import com.zlm.hp.util.FontUtil;
 

app/src/main/java/com/zlm/hp/widget/IconfontTextView.java

@@ -2,10 +2,11 @@ package com.zlm.hp.widget;
 
 import android.content.Context;
 import android.graphics.Typeface;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatTextView;
 import android.util.AttributeSet;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatTextView;
+
 import com.zlm.hp.util.FontUtil;
 
 

app/src/main/java/com/zlm/hp/widget/SearchEditText.java

@@ -3,9 +3,10 @@ package com.zlm.hp.widget;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.GradientDrawable;
-import android.support.v7.widget.AppCompatEditText;
 import android.util.AttributeSet;
 
+import androidx.appcompat.widget.AppCompatEditText;
+
 import com.zlm.hp.util.ColorUtil;
 
 

app/src/main/java/com/zlm/hp/widget/TransitionImageView.java

@@ -8,11 +8,12 @@ import android.graphics.drawable.TransitionDrawable;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import android.support.v7.widget.AppCompatImageView;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
 
+import androidx.appcompat.widget.AppCompatImageView;
+
 import com.zlm.hp.entity.SingerInfo;
 import com.zlm.hp.handler.WeakRefHandler;
 import com.zlm.hp.util.ImageUtil;

app/src/main/java/com/zlm/hp/widget/des/FloatLinearLayout.java

@@ -1,12 +1,13 @@
 package com.zlm.hp.widget.des;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.ViewConfiguration;
 import android.widget.LinearLayout;
 
+import androidx.annotation.Nullable;
+
 /**
  * @Description: 悬浮布局
  * @author: zhangliangming

app/src/main/res/layout/activity_file_manager.xml

@@ -64,12 +64,12 @@
 
             </RelativeLayout>
 
-            <android.support.v7.widget.RecyclerView
+            <RecyclerView
                 android:id="@+id/file_recyclerView"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_above="@+id/selectFile"
-                android:layout_below="@+id/op_heaad"></android.support.v7.widget.RecyclerView>
+                android:layout_below="@+id/op_heaad"></RecyclerView>
 
 
             <Button

app/src/main/res/layout/activity_search_lrc.xml

@@ -203,11 +203,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <android.support.v4.view.ViewPager
+                <androidx.viewpager.widget.ViewPager
                     android:id="@+id/viewpage"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_margin="20dp"></android.support.v4.view.ViewPager>
+                    android:layout_margin="20dp"></androidx.viewpager.widget.ViewPager>
 
             </RelativeLayout>
         </RelativeLayout>

app/src/main/res/layout/activity_splash.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"
@@ -19,4 +19,4 @@
         app:layout_constraintRight_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="parent" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_download.xml

@@ -4,10 +4,10 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.v7.widget.RecyclerView
+    <RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="#fff"
-        android:paddingBottom="@dimen/bar_height"></android.support.v7.widget.RecyclerView>
+        android:paddingBottom="@dimen/bar_height"></RecyclerView>
 </LinearLayout>

app/src/main/res/layout/fragment_last_song.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">
 
@@ -11,4 +11,4 @@
         android:paddingBottom="@dimen/bar_height"></com.github.jdsjlzx.recyclerview.LRecyclerView>
 
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_loading.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"
@@ -18,4 +18,4 @@
         app:layout_constraintTop_toBottomOf="parent" />
 
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_make_extra_lrc.xml

@@ -62,7 +62,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <android.support.v7.widget.RecyclerView
+        <RecyclerView
             android:id="@+id/listview"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

app/src/main/res/layout/fragment_me.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">
 
@@ -274,4 +274,4 @@
                 android:background="#f3f3f3"></View>
         </LinearLayout>
     </ScrollView>
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_nonet.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:id="@+id/net_layout"
     android:layout_width="match_parent"
@@ -30,4 +30,4 @@
         app:layout_constraintBottom_toBottomOf="@+id/nonet_img" />
 
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_recommend.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">
 
@@ -10,4 +10,4 @@
         android:paddingBottom="@dimen/bar_height"></com.github.jdsjlzx.recyclerview.LRecyclerView>
 
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_special.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">
 
@@ -10,4 +10,4 @@
         android:paddingBottom="@dimen/bar_height"></com.github.jdsjlzx.recyclerview.LRecyclerView>
 
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/layout_fragment_make_extra_lrc.xml

@@ -63,7 +63,7 @@
         android:layout_height="match_parent">
 
 
-        <com.zlm.hp.widget.LinearLayoutRecyclerView
+        <LinearLayoutRecyclerView
             android:id="@+id/listview"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

app/src/main/res/layout/layout_lrc_singerlist.xml

@@ -51,10 +51,10 @@
             android:layout_below="@+id/splline"
             android:orientation="vertical">
 
-            <android.support.v7.widget.RecyclerView
+            <RecyclerView
                 android:id="@+id/singerlist_recyclerView"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"></android.support.v7.widget.RecyclerView>
+                android:layout_height="match_parent"></RecyclerView>
 
 
         </LinearLayout>

app/src/main/res/layout/layout_main.xml

@@ -18,10 +18,10 @@
         android:layout_height="@dimen/title_height"></include>
 
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/viewpage"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"></android.support.v4.view.ViewPager>
+        android:layout_height="match_parent"></androidx.viewpager.widget.ViewPager>
 
 
 </LinearLayout>

app/src/main/res/layout/layout_pop_playlist.xml

@@ -101,12 +101,12 @@
             android:layout_height="match_parent"
             android:layout_below="@+id/line">
 
-            <android.support.v7.widget.RecyclerView
+            <RecyclerView
                 android:id="@+id/curplaylist_recyclerView"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_above="@+id/poplistcancel"
-                android:overScrollMode="never"></android.support.v7.widget.RecyclerView>
+                android:overScrollMode="never"></RecyclerView>
 
 
             <com.zlm.hp.widget.ListItemRelativeLayout

gradle.properties

@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.

readme.md

@@ -53,7 +53,12 @@ android5.0及以上
 
 # 更新日志 #
 
+## 2020-11-28 ##
+
+- 基于6.0全新开发,更新日志请看更新日志文件。
+
 ## 2019-01-15 ##
+
 - 引入Subtitle库
 
 ## 2018-01-06 ##