From bd37d661cd4b1b1d70cf088416dfcb4a80a27018 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=BD=93=E6=97=B6?= <1017848709@qq.com>
Date: Thu, 18 Feb 2021 10:36:16 +0800
Subject: [PATCH] =?UTF-8?q?####=20=202021-02-18=20V7.0.3=20-=20*.[?=
=?UTF-8?q?=E6=94=B9=E8=BF=9B]=E9=A1=B9=E7=9B=AE=E6=94=B9=E6=88=90?=
=?UTF-8?q?=E5=9F=BA=E4=BA=8EAndroidX=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CHANGELOG.md | 4 +
app/build.gradle | 20 +-
.../java/com/zlm/hp/DownloadTaskTest.java | 2 +
.../ZoomOutPageTransformer.java | 3 +-
.../java/com/zlm/hp/adapter/AudioAdapter.java | 3 +-
.../zlm/hp/adapter/DownloadMusicAdapter.java | 3 +-
.../zlm/hp/adapter/FileManagerAdapter.java | 3 +-
.../zlm/hp/adapter/LrcPopSingerAdapter.java | 3 +-
.../java/com/zlm/hp/adapter/MVAdapter.java | 3 +-
.../zlm/hp/adapter/PopPlayListAdapter.java | 5 +-
.../com/zlm/hp/adapter/RecommendAdapter.java | 3 +-
.../hp/adapter/SearchLrcFragmentAdapter.java | 9 +-
.../zlm/hp/adapter/SearchSingerAdapter.java | 3 +-
.../com/zlm/hp/adapter/SpecialAdapter.java | 3 +-
.../zlm/hp/adapter/TabFragmentAdapter.java | 7 +-
.../java/com/zlm/hp/adapter/ToolAdapter.java | 5 +-
.../hp/adapter/ViewPageFragmentAdapter.java | 6 +-
.../hp/adapter/tool/MakeExtraLrcAdapter.java | 3 +-
.../com/zlm/hp/application/HPApplication.java | 7 +-
.../com/zlm/hp/fragment/BaseFragment.java | 8 +-
.../hp/fragment/DownloadMusicFragment.java | 5 +-
.../com/zlm/hp/fragment/LastSongFragment.java | 3 +-
.../zlm/hp/fragment/RecommendFragment.java | 3 +-
.../com/zlm/hp/fragment/SearchFragment.java | 3 +-
.../com/zlm/hp/fragment/SongFragment.java | 3 +-
.../com/zlm/hp/fragment/SpecialFragment.java | 3 +-
.../fragment/tool/MakeExtraLrcFragment.java | 7 +-
.../main/java/com/zlm/hp/ui/BaseActivity.java | 9 +-
.../main/java/com/zlm/hp/ui/LrcActivity.java | 5 +-
.../main/java/com/zlm/hp/ui/MainActivity.java | 11 +-
.../java/com/zlm/hp/ui/SearchLrcActivity.java | 3 +-
.../java/com/zlm/hp/ui/SearchMVActivity.java | 3 +-
.../com/zlm/hp/ui/SearchSingerActivity.java | 5 +-
.../java/com/zlm/hp/ui/SplashActivity.java | 4 +-
.../main/java/com/zlm/hp/ui/ToolActivity.java | 5 +-
.../zlm/hp/ui/tool/FileManagerActivity.java | 5 +-
.../com/zlm/hp/ui/tool/MakeLrcActivity.java | 3 +-
.../hp/ui/tool/MakeTranslateLrcActivity.java | 3 +-
.../tool/MakeTransliterationLrcActivity.java | 3 +-
.../main/java/com/zlm/hp/util/AppBarUtil.java | 3 +-
.../com/zlm/hp/widget/CustomViewPager.java | 3 +-
.../widget/IconfontImageButtonTextView.java | 5 +-
.../hp/widget/IconfontIndicatorTextView.java | 5 +-
.../com/zlm/hp/widget/IconfontTextView.java | 5 +-
.../com/zlm/hp/widget/SearchEditText.java | 3 +-
.../zlm/hp/widget/TransitionImageView.java | 3 +-
.../zlm/hp/widget/des/FloatLinearLayout.java | 3 +-
.../main/res/layout/activity_file_manager.xml | 4 +-
.../main/res/layout/activity_search_lrc.xml | 4 +-
app/src/main/res/layout/activity_splash.xml | 4 +-
app/src/main/res/layout/fragment_download.xml | 4 +-
.../main/res/layout/fragment_last_song.xml | 4 +-
app/src/main/res/layout/fragment_loading.xml | 4 +-
.../res/layout/fragment_make_extra_lrc.xml | 2 +-
app/src/main/res/layout/fragment_me.xml | 4 +-
app/src/main/res/layout/fragment_nonet.xml | 4 +-
.../main/res/layout/fragment_recommend.xml | 4 +-
app/src/main/res/layout/fragment_special.xml | 4 +-
.../layout/layout_fragment_make_extra_lrc.xml | 2 +-
.../main/res/layout/layout_lrc_singerlist.xml | 4 +-
app/src/main/res/layout/layout_main.xml | 4 +-
.../main/res/layout/layout_pop_playlist.xml | 4 +-
app/src/main/res/values/xui_attrs.xml | 1709 +++++++++++++++++
gradle.properties | 2 +
readme.md | 5 +
65 files changed, 1877 insertions(+), 114 deletions(-)
create mode 100644 app/src/main/res/values/xui_attrs.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85d6041..d53177b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+#### 2021-02-18 V7.0.3
+
+- *.[改进]项目改成基于AndroidX。
+
#### 2020-12-17 V7.0.2
- *.[改进]改进歌词界面时间显示,贴合屏幕左上角。
diff --git a/app/build.gradle b/app/build.gradle
index fc26c57..3439e7d 100644
--- a/app/build.gradle
+++ b/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
diff --git a/app/src/androidTest/java/com/zlm/hp/DownloadTaskTest.java b/app/src/androidTest/java/com/zlm/hp/DownloadTaskTest.java
index e58859a..8fcafcd 100644
--- a/app/src/androidTest/java/com/zlm/hp/DownloadTaskTest.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/PageTransformer/ZoomOutPageTransformer.java b/app/src/main/java/com/zlm/hp/PageTransformer/ZoomOutPageTransformer.java
index 0cddd81..566af63 100644
--- a/app/src/main/java/com/zlm/hp/PageTransformer/ZoomOutPageTransformer.java
+++ b/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动画
*/
diff --git a/app/src/main/java/com/zlm/hp/adapter/AudioAdapter.java b/app/src/main/java/com/zlm/hp/adapter/AudioAdapter.java
index 06bf28d..71450ff 100644
--- a/app/src/main/java/com/zlm/hp/adapter/AudioAdapter.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/adapter/DownloadMusicAdapter.java b/app/src/main/java/com/zlm/hp/adapter/DownloadMusicAdapter.java
index e0efb15..e911e52 100644
--- a/app/src/main/java/com/zlm/hp/adapter/DownloadMusicAdapter.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/adapter/FileManagerAdapter.java b/app/src/main/java/com/zlm/hp/adapter/FileManagerAdapter.java
index b5d6765..eb73d87 100644
--- a/app/src/main/java/com/zlm/hp/adapter/FileManagerAdapter.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/adapter/LrcPopSingerAdapter.java b/app/src/main/java/com/zlm/hp/adapter/LrcPopSingerAdapter.java
index 37e8b26..4b00740 100644
--- a/app/src/main/java/com/zlm/hp/adapter/LrcPopSingerAdapter.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/adapter/MVAdapter.java b/app/src/main/java/com/zlm/hp/adapter/MVAdapter.java
index 07d949a..a9d3a93 100644
--- a/app/src/main/java/com/zlm/hp/adapter/MVAdapter.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/adapter/PopPlayListAdapter.java b/app/src/main/java/com/zlm/hp/adapter/PopPlayListAdapter.java
index 54340b8..c60fcbd 100644
--- a/app/src/main/java/com/zlm/hp/adapter/PopPlayListAdapter.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/adapter/RecommendAdapter.java b/app/src/main/java/com/zlm/hp/adapter/RecommendAdapter.java
index 93bd9d4..7e1805d 100644
--- a/app/src/main/java/com/zlm/hp/adapter/RecommendAdapter.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/adapter/SearchLrcFragmentAdapter.java b/app/src/main/java/com/zlm/hp/adapter/SearchLrcFragmentAdapter.java
index c920da4..a60fdee 100644
--- a/app/src/main/java/com/zlm/hp/adapter/SearchLrcFragmentAdapter.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/adapter/SearchSingerAdapter.java b/app/src/main/java/com/zlm/hp/adapter/SearchSingerAdapter.java
index 63f0808..8d69749 100644
--- a/app/src/main/java/com/zlm/hp/adapter/SearchSingerAdapter.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/adapter/SpecialAdapter.java b/app/src/main/java/com/zlm/hp/adapter/SpecialAdapter.java
index 04ae7f3..5dc53c1 100644
--- a/app/src/main/java/com/zlm/hp/adapter/SpecialAdapter.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/adapter/TabFragmentAdapter.java b/app/src/main/java/com/zlm/hp/adapter/TabFragmentAdapter.java
index e1f285e..d28bd0c 100644
--- a/app/src/main/java/com/zlm/hp/adapter/TabFragmentAdapter.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/adapter/ToolAdapter.java b/app/src/main/java/com/zlm/hp/adapter/ToolAdapter.java
index 8d06446..530f4b9 100644
--- a/app/src/main/java/com/zlm/hp/adapter/ToolAdapter.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/adapter/ViewPageFragmentAdapter.java b/app/src/main/java/com/zlm/hp/adapter/ViewPageFragmentAdapter.java
index 3bbc4a3..6b51d01 100644
--- a/app/src/main/java/com/zlm/hp/adapter/ViewPageFragmentAdapter.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/adapter/tool/MakeExtraLrcAdapter.java b/app/src/main/java/com/zlm/hp/adapter/tool/MakeExtraLrcAdapter.java
index e28f2cd..2ce8d7d 100644
--- a/app/src/main/java/com/zlm/hp/adapter/tool/MakeExtraLrcAdapter.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/application/HPApplication.java b/app/src/main/java/com/zlm/hp/application/HPApplication.java
index b00ef29..808ac9d 100644
--- a/app/src/main/java/com/zlm/hp/application/HPApplication.java
+++ b/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());
diff --git a/app/src/main/java/com/zlm/hp/fragment/BaseFragment.java b/app/src/main/java/com/zlm/hp/fragment/BaseFragment.java
index ac446e0..3208335 100644
--- a/app/src/main/java/com/zlm/hp/fragment/BaseFragment.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/fragment/DownloadMusicFragment.java b/app/src/main/java/com/zlm/hp/fragment/DownloadMusicFragment.java
index 2dc7660..b185383 100644
--- a/app/src/main/java/com/zlm/hp/fragment/DownloadMusicFragment.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/fragment/LastSongFragment.java b/app/src/main/java/com/zlm/hp/fragment/LastSongFragment.java
index 4734a83..eb5c5df 100644
--- a/app/src/main/java/com/zlm/hp/fragment/LastSongFragment.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/fragment/RecommendFragment.java b/app/src/main/java/com/zlm/hp/fragment/RecommendFragment.java
index 42bc8ee..5bf9d31 100644
--- a/app/src/main/java/com/zlm/hp/fragment/RecommendFragment.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/fragment/SearchFragment.java b/app/src/main/java/com/zlm/hp/fragment/SearchFragment.java
index be46648..977c923 100644
--- a/app/src/main/java/com/zlm/hp/fragment/SearchFragment.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/fragment/SongFragment.java b/app/src/main/java/com/zlm/hp/fragment/SongFragment.java
index 1d81c48..4798e40 100644
--- a/app/src/main/java/com/zlm/hp/fragment/SongFragment.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/fragment/SpecialFragment.java b/app/src/main/java/com/zlm/hp/fragment/SpecialFragment.java
index 0d59eaf..dd105d0 100644
--- a/app/src/main/java/com/zlm/hp/fragment/SpecialFragment.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/fragment/tool/MakeExtraLrcFragment.java b/app/src/main/java/com/zlm/hp/fragment/tool/MakeExtraLrcFragment.java
index 870601e..5129823 100644
--- a/app/src/main/java/com/zlm/hp/fragment/tool/MakeExtraLrcFragment.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/ui/BaseActivity.java b/app/src/main/java/com/zlm/hp/ui/BaseActivity.java
index 9e1ccc0..2c2e79e 100644
--- a/app/src/main/java/com/zlm/hp/ui/BaseActivity.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/ui/LrcActivity.java b/app/src/main/java/com/zlm/hp/ui/LrcActivity.java
index 128e443..c1d81d8 100644
--- a/app/src/main/java/com/zlm/hp/ui/LrcActivity.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/ui/MainActivity.java b/app/src/main/java/com/zlm/hp/ui/MainActivity.java
index c62e4db..730e03c 100644
--- a/app/src/main/java/com/zlm/hp/ui/MainActivity.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/ui/SearchLrcActivity.java b/app/src/main/java/com/zlm/hp/ui/SearchLrcActivity.java
index 1441bf2..a305cb3 100644
--- a/app/src/main/java/com/zlm/hp/ui/SearchLrcActivity.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/ui/SearchMVActivity.java b/app/src/main/java/com/zlm/hp/ui/SearchMVActivity.java
index d025532..671371b 100644
--- a/app/src/main/java/com/zlm/hp/ui/SearchMVActivity.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/ui/SearchSingerActivity.java b/app/src/main/java/com/zlm/hp/ui/SearchSingerActivity.java
index ea44f2f..3df39ec 100644
--- a/app/src/main/java/com/zlm/hp/ui/SearchSingerActivity.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/ui/SplashActivity.java b/app/src/main/java/com/zlm/hp/ui/SplashActivity.java
index a464d77..8ba41e9 100644
--- a/app/src/main/java/com/zlm/hp/ui/SplashActivity.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/ui/ToolActivity.java b/app/src/main/java/com/zlm/hp/ui/ToolActivity.java
index ecafd52..6f46466 100644
--- a/app/src/main/java/com/zlm/hp/ui/ToolActivity.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/ui/tool/FileManagerActivity.java b/app/src/main/java/com/zlm/hp/ui/tool/FileManagerActivity.java
index fe72dd8..0106d86 100644
--- a/app/src/main/java/com/zlm/hp/ui/tool/FileManagerActivity.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/ui/tool/MakeLrcActivity.java b/app/src/main/java/com/zlm/hp/ui/tool/MakeLrcActivity.java
index 2754c4f..058c3aa 100644
--- a/app/src/main/java/com/zlm/hp/ui/tool/MakeLrcActivity.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/ui/tool/MakeTranslateLrcActivity.java b/app/src/main/java/com/zlm/hp/ui/tool/MakeTranslateLrcActivity.java
index 26055c9..b1705ab 100644
--- a/app/src/main/java/com/zlm/hp/ui/tool/MakeTranslateLrcActivity.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/ui/tool/MakeTransliterationLrcActivity.java b/app/src/main/java/com/zlm/hp/ui/tool/MakeTransliterationLrcActivity.java
index 370f04c..e6c779b 100644
--- a/app/src/main/java/com/zlm/hp/ui/tool/MakeTransliterationLrcActivity.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/util/AppBarUtil.java b/app/src/main/java/com/zlm/hp/util/AppBarUtil.java
index 441b646..f35c6fa 100644
--- a/app/src/main/java/com/zlm/hp/util/AppBarUtil.java
+++ b/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状态栏和底部导航菜单
diff --git a/app/src/main/java/com/zlm/hp/widget/CustomViewPager.java b/app/src/main/java/com/zlm/hp/widget/CustomViewPager.java
index 0bd54f9..02f9a32 100644
--- a/app/src/main/java/com/zlm/hp/widget/CustomViewPager.java
+++ b/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;
+
/**
*
*/
diff --git a/app/src/main/java/com/zlm/hp/widget/IconfontImageButtonTextView.java b/app/src/main/java/com/zlm/hp/widget/IconfontImageButtonTextView.java
index 9473988..4080902 100644
--- a/app/src/main/java/com/zlm/hp/widget/IconfontImageButtonTextView.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/widget/IconfontIndicatorTextView.java b/app/src/main/java/com/zlm/hp/widget/IconfontIndicatorTextView.java
index b2e9902..39ff8b5 100644
--- a/app/src/main/java/com/zlm/hp/widget/IconfontIndicatorTextView.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/widget/IconfontTextView.java b/app/src/main/java/com/zlm/hp/widget/IconfontTextView.java
index f2a5db3..ea850dd 100644
--- a/app/src/main/java/com/zlm/hp/widget/IconfontTextView.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/widget/SearchEditText.java b/app/src/main/java/com/zlm/hp/widget/SearchEditText.java
index 78fed0d..cf80e2b 100644
--- a/app/src/main/java/com/zlm/hp/widget/SearchEditText.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/widget/TransitionImageView.java b/app/src/main/java/com/zlm/hp/widget/TransitionImageView.java
index 5e6871b..452493d 100644
--- a/app/src/main/java/com/zlm/hp/widget/TransitionImageView.java
+++ b/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;
diff --git a/app/src/main/java/com/zlm/hp/widget/des/FloatLinearLayout.java b/app/src/main/java/com/zlm/hp/widget/des/FloatLinearLayout.java
index 3cbf260..07fa412 100644
--- a/app/src/main/java/com/zlm/hp/widget/des/FloatLinearLayout.java
+++ b/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
diff --git a/app/src/main/res/layout/activity_file_manager.xml b/app/src/main/res/layout/activity_file_manager.xml
index e201396..cdb86b5 100644
--- a/app/src/main/res/layout/activity_file_manager.xml
+++ b/app/src/main/res/layout/activity_file_manager.xml
@@ -64,12 +64,12 @@
-
+ android:layout_below="@+id/op_heaad">