From ee029bcf854e623304c040a254685640a5d180c7 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 19:54:23 +0800 Subject: [PATCH] =?UTF-8?q?####=20=202021-02-18=20V7.0.4=20-=20*.[?= =?UTF-8?q?=E6=94=B9=E8=BF=9B]=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=B8=83=E5=B1=80=E6=8E=A7=E4=BB=B6=E6=9C=AA=E6=94=B9=E6=88=90?= =?UTF-8?q?=E6=94=AF=E6=8C=81AndroidX=E7=9A=84=E6=8E=A7=E4=BB=B6=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E7=9A=84=E9=97=AA=E9=80=80=E9=97=AE=E9=A2=98=E3=80=82?= =?UTF-8?q?=20-=20*.[=E6=94=B9=E8=BF=9B]=E6=9B=B4=E6=96=B0=E6=AD=8C?= =?UTF-8?q?=E6=9B=B2=E6=97=B6,=E6=96=B0=E5=A2=9E=E5=A6=82=E6=9E=9CMV?= =?UTF-8?q?=E5=B7=B2=E5=88=A0=E9=99=A4,=E4=BD=86=E6=AD=8C=E6=9B=B2?= =?UTF-8?q?=E8=BF=98=E5=AD=98=E5=9C=A8=E6=97=B6=E7=9A=84=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E6=96=B9=E6=A1=88=E3=80=82=20-=20*.[=E6=94=B9=E8=BF=9B]?= =?UTF-8?q?=E5=86=99=E7=9C=9F=E5=9B=BE=E7=89=87=E9=9A=8F=E6=9C=BA=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F=E5=B1=95=E7=8E=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 6 ++++ app/build.gradle | 7 ++-- app/proguard-rules.pro | 2 +- app/src/main/AndroidManifest.xml | 1 - .../main/java/com/zlm/hp/ui/CardActivity.java | 28 +++++++++++++++ .../main/java/com/zlm/hp/ui/MainActivity.java | 11 ++++++ .../java/com/zlm/hp/ui/SettingActivity.java | 11 +++--- .../java/com/zlm/hp/ui/SplashActivity.java | 6 +++- .../main/java/com/zlm/hp/util/ImageUtil.java | 3 +- .../main/java/com/zlm/hp/util/RandomUtil.java | 5 ++- .../java/com/zlm/hp/util/StorageUtil.java | 3 +- app/src/main/res/drawable/icon_ios_thumb.png | Bin 0 -> 2505 bytes .../res/drawable/icon_ios_thumb_disable.png | Bin 0 -> 1661 bytes .../main/res/drawable/ios_back_drawable.xml | 33 ++++++++++++++++++ .../main/res/drawable/ios_thumb_selector.xml | 5 +++ .../main/res/layout/activity_file_manager.xml | 4 +-- .../res/layout/activity_search_singer.xml | 4 +-- app/src/main/res/layout/activity_setting.xml | 7 ++-- app/src/main/res/layout/fragment_download.xml | 4 +-- app/src/main/res/values/styles.xml | 29 ++++++++++++++- 20 files changed, 147 insertions(+), 22 deletions(-) create mode 100644 app/src/main/java/com/zlm/hp/ui/CardActivity.java create mode 100644 app/src/main/res/drawable/icon_ios_thumb.png create mode 100644 app/src/main/res/drawable/icon_ios_thumb_disable.png create mode 100644 app/src/main/res/drawable/ios_back_drawable.xml create mode 100644 app/src/main/res/drawable/ios_thumb_selector.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index d53177b..f060697 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +#### 2021-02-18 V7.0.4 + +- *.[改进]修复部分布局控件未改成支持AndroidX的控件导致的闪退问题。 +- *.[改进]更新歌曲时,新增如果MV已删除,但歌曲还存在时的解决方案。 +- *.[改进]写真图片随机顺序展现。 + #### 2021-02-18 V7.0.3 - *.[改进]项目改成基于AndroidX。 diff --git a/app/build.gradle b/app/build.gradle index 3439e7d..fef9ee8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -51,9 +51,12 @@ dependencies { androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude group: 'com.android.support', module: 'support-annotations' }) - implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'com.github.xuexiangjys:XUI:1.1.6' + implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'androidx.recyclerview:recyclerview:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.1.0' + implementation 'com.google.android.material:material:1.1.0' + implementation 'com.github.bumptech.glide:glide:4.11.0' testImplementation 'junit:junit:4.12' implementation 'androidx.multidex:multidex:2.0.0' //第三方bugly diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index fd67dbd..79eca52 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -172,7 +172,7 @@ public static java.lang.String TABLENAME; #implementation 'com.github.zhangliangming:Subtitle:v1.0' -keep class com.zlm.subtitlelibrary.** { *; } - +-keep class com.xuexiang.xui.widget.edittext.materialedittext.** { *; } #6混淆项目代码 -keep class com.zlm.** -keepclassmembers class com.zlm.** { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d65a6c4..9b306be 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -8,7 +8,6 @@ - diff --git a/app/src/main/java/com/zlm/hp/ui/CardActivity.java b/app/src/main/java/com/zlm/hp/ui/CardActivity.java new file mode 100644 index 0000000..7a5390c --- /dev/null +++ b/app/src/main/java/com/zlm/hp/ui/CardActivity.java @@ -0,0 +1,28 @@ +package com.zlm.hp.ui; + +import android.os.Bundle; +import android.os.Message; + +import com.dou361.dialogui.DialogUIUtils; +import com.zlm.hp.constants.ConfigInfo; +import com.zlm.hp.constants.ResourceConstants; +import com.zlm.hp.util.FileUtil; +import com.zlm.hp.util.ResourceUtil; + +import java.io.File; + +public class CardActivity extends BaseActivity { + @Override + protected int setContentLayoutResID() { + return R.layout.activity_setting; + } + @Override + protected void initViews(Bundle savedInstanceState) { + } + @Override + protected void handleUIMessage(Message msg) { + } + @Override + protected void handleWorkerMessage(Message msg) { + } +} 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 730e03c..23563ac 100644 --- a/app/src/main/java/com/zlm/hp/ui/MainActivity.java +++ b/app/src/main/java/com/zlm/hp/ui/MainActivity.java @@ -1019,6 +1019,17 @@ public class MainActivity extends BaseActivity { if (!file.exists()) { AudioInfoDB.deleteAudio(mContext, temp.getHash(), false); } + else + { + if(temp.getMvPath().length()>0) { + File file_mv = new File(temp.getMvPath()); + if (!file_mv.exists()) { //如果歌曲存在，但MV不存在 + temp.setMvHash(""); + temp.setMvPath(""); + AudioInfoDB.updateVideo(mContext, temp); + } + } + } } }catch (Exception e) { e.printStackTrace(); diff --git a/app/src/main/java/com/zlm/hp/ui/SettingActivity.java b/app/src/main/java/com/zlm/hp/ui/SettingActivity.java index 0324cb9..1aebac7 100644 --- a/app/src/main/java/com/zlm/hp/ui/SettingActivity.java +++ b/app/src/main/java/com/zlm/hp/ui/SettingActivity.java @@ -8,6 +8,7 @@ import android.view.MotionEvent; import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; +import android.widget.CompoundButton; import android.widget.ImageView; import android.widget.Spinner; import android.widget.TextView; @@ -15,6 +16,7 @@ import android.widget.TextView; import com.dou361.dialogui.DialogUIUtils; import com.dou361.dialogui.listener.DialogUIListener; import com.suke.widget.SwitchButton; +import com.xuexiang.xui.utils.WidgetUtils; import com.zlm.hp.constants.ConfigInfo; import com.zlm.hp.constants.ResourceConstants; import com.zlm.hp.db.util.DownloadThreadInfoDB; @@ -56,7 +58,7 @@ public class SettingActivity extends BaseActivity { /** * 歌手歌曲名居中显示开关 */ - private SwitchButton mCenterSingerSongSwitchButton; + private com.xuexiang.xui.widget.button.switchbutton.SwitchButton mCenterSingerSongSwitchButton; /** * MV播放模式 */ @@ -194,9 +196,9 @@ public class SettingActivity extends BaseActivity { } }); mCenterSingerSongSwitchButton = findViewById(R.id.center_singersongname_switch); - mCenterSingerSongSwitchButton.setOnCheckedChangeListener(new SwitchButton.OnCheckedChangeListener() { + mCenterSingerSongSwitchButton.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override - public void onCheckedChanged(SwitchButton view, boolean isChecked) { + public void onCheckedChanged(CompoundButton view, boolean isChecked) { if (mConfigInfo.isCenterSingerSongName() != isChecked) mConfigInfo.setIsCenterSingerSongName(isChecked).save(); } @@ -206,13 +208,14 @@ public class SettingActivity extends BaseActivity { list.add("只播放MV"); list.add("随机选择播放MV和歌曲"); mMVPlayMode=findViewById(R.id.mvplaymode_spinner); + WidgetUtils.initSpinnerStyle(mMVPlayMode); //第二步：为下拉列表定义一个适配器 adapter = new ArrayAdapter(this, android.R.layout.simple_list_item_1, list); //第三步：设置下拉列表下拉时的菜单样式 adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - adapter.notifyDataSetChanged(); //第四步：将适配器添加到下拉列表上 mMVPlayMode.setAdapter(adapter); + adapter.notifyDataSetChanged(); //第五步：添加监听器，为下拉列表设置事件的响应 mMVPlayMode.setOnItemSelectedListener(new Spinner.OnItemSelectedListener() { @Override 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 8ba41e9..3787e6b 100644 --- a/app/src/main/java/com/zlm/hp/ui/SplashActivity.java +++ b/app/src/main/java/com/zlm/hp/ui/SplashActivity.java @@ -203,7 +203,6 @@ public class SplashActivity extends BaseActivity { boolean isFrist = PreferencesUtil.getBoolean(getApplicationContext(), Constants.IS_FRIST_KEY, true); if (isFrist) { - //1.扫描本地歌曲列表 List audioInfos = MediaUtil.scanLocalMusic(getApplicationContext(), null); if (audioInfos != null && audioInfos.size() > 0) { @@ -236,6 +235,11 @@ public class SplashActivity extends BaseActivity { mUIHandler.sendEmptyMessageDelayed(GOHOME, 5000); } } + if (isFrist) { + configInfo.setWire(true);//支持线控 + configInfo.setStatusBarShow(false);//不显示状态栏 + configInfo.save(); + } } /** diff --git a/app/src/main/java/com/zlm/hp/util/ImageUtil.java b/app/src/main/java/com/zlm/hp/util/ImageUtil.java index 920a4a8..7490867 100644 --- a/app/src/main/java/com/zlm/hp/util/ImageUtil.java +++ b/app/src/main/java/com/zlm/hp/util/ImageUtil.java @@ -37,6 +37,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.Random; /** * @Description: @@ -279,7 +280,7 @@ public class ImageUtil { SingerInfo singerInfo = new SingerInfo(); singerInfo.setImageUrl(temp.getAbsolutePath()); singerInfo.setSingerName(singerName); - listResult.add(singerInfo); + listResult.add(RandomUtil.RandomInt(0,listResult.size()), singerInfo); break; } } diff --git a/app/src/main/java/com/zlm/hp/util/RandomUtil.java b/app/src/main/java/com/zlm/hp/util/RandomUtil.java index f8facf0..7992339 100644 --- a/app/src/main/java/com/zlm/hp/util/RandomUtil.java +++ b/app/src/main/java/com/zlm/hp/util/RandomUtil.java @@ -34,7 +34,10 @@ public class RandomUtil { } mLastNum = mSize - 1; } - + public static int RandomInt(int min,int max) + { + return (new Random()).nextInt((max - min) + 1) + min; + } /** * 生成随机数 * @return diff --git a/app/src/main/java/com/zlm/hp/util/StorageUtil.java b/app/src/main/java/com/zlm/hp/util/StorageUtil.java index 0ab014e..9f2596a 100644 --- a/app/src/main/java/com/zlm/hp/util/StorageUtil.java +++ b/app/src/main/java/com/zlm/hp/util/StorageUtil.java @@ -82,8 +82,9 @@ public class StorageUtil { String path = (String) getPath.invoke(obj); info = new StorageInfo(path); File file = new File(info.getPath()); + Boolean result= file.canWrite(); if ((file.exists()) && (file.isDirectory()) - && (file.canWrite())) { + ) { Method isRemovable = obj.getClass().getMethod( "isRemovable"); String state = null; diff --git a/app/src/main/res/drawable/icon_ios_thumb.png b/app/src/main/res/drawable/icon_ios_thumb.png new file mode 100644 index 0000000000000000000000000000000000000000..a4194e8020f4257991495e9af61ed3d1dd4890b3 GIT binary patch literal 2505 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 YApNTJ(qG<$@xJ}niS{G{!_GJPUpWFy3;+NC literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/ios_back_drawable.xml b/app/src/main/res/drawable/ios_back_drawable.xml new file mode 100644 index 0000000..1b3859b --- /dev/null +++ b/app/src/main/res/drawable/ios_back_drawable.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ios_thumb_selector.xml b/app/src/main/res/drawable/ios_thumb_selector.xml new file mode 100644 index 0000000..6c2ac74 --- /dev/null +++ b/app/src/main/res/drawable/ios_thumb_selector.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_file_manager.xml b/app/src/main/res/layout/activity_file_manager.xml index cdb86b5..921fab8 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">