From 5fe2d1fdfea270885d6f412ef5c335525805306c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=BD=93=E6=97=B6?= <zilinsoft@qq.com>
Date: Thu, 15 Dec 2022 22:49:52 +0800
Subject: [PATCH] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 230bcba860d86a85855096ecc7ecbc778b046ab8
Author: 如果当时 <zilinsoft@qq.com>
Date:   Thu Dec 15 22:28:53 2022 +0800

    ####  2022-12-15 V7.0.6
    - *.[新增]新增支持歌手头像从歌曲文件中获取。

# Conflicts:
#	CHANGELOG.md
#	app/src/main/java/com/zlm/hp/ui/MainActivity.java
#	gradle/wrapper/gradle-wrapper.properties
---
 .idea/gradle.xml                              |  3 ++-
 CHANGELOG.md                                  | 26 +++++++++++++++++++
 app/build.gradle                              |  4 +--
 .../main/java/com/zlm/hp/ui/MainActivity.java |  4 +++
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 5 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a2d7c21..a5bace0 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,8 +5,9 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9937b41..4b0713d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,29 @@
+####  2022-12-15 V7.0.6
+
+- *.[新增]新增支持歌手头像从歌曲文件中获取。
+
+####  2022-02-13 V7.0.5
+
+- *.[改进]启动软件时自动播放歌曲。
+- *.[改进]当播放视频时,自动退出歌词界面。
+- *.[改进]当播放歌曲时,自动进入歌词或视频界面。
+- *.[修复]修复写真图片无法实现随机展现的BUG。
+
+####  2021-02-18 V7.0.4
+
+- *.[改进]修复部分布局控件未改成支持AndroidX的控件导致的闪退问题。
+- *.[改进]更新歌曲时,新增如果MV已删除,但歌曲还存在时的解决方案。
+- *.[改进]写真图片随机顺序展现。
+
+####  2021-02-18 V7.0.3
+
+- *.[改进]项目改成基于AndroidX。
+
+####  2020-12-17 V7.0.2
+
+- *.[改进]改进歌词界面时间显示,贴合屏幕左上角。
+- *.[改进]本地音乐排序为按创建时间倒序。
+
 ####  2020-12-17 V7.0.1
 - *.[改进]暂停播放视频时,左上角的时间依旧在更新。
 - *.[新增]音频歌曲歌词界面新增左上角时间显示。
diff --git a/app/build.gradle b/app/build.gradle
index eabec2a..f362652 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.zlm.hp"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 11
-        versionName "V7.0.5"
+        versionCode 12
+        versionName "V7.0.6"
         /**添加多 dex分包支持*/
         multiDexEnabled true
         useLibrary 'org.apache.http.legacy'
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 e6fb655..af7a8e7 100644
--- a/app/src/main/java/com/zlm/hp/ui/MainActivity.java
+++ b/app/src/main/java/com/zlm/hp/ui/MainActivity.java
@@ -429,6 +429,10 @@ public class MainActivity extends BaseActivity {
                             {
                                 mArtistImageView.setImageDrawable(new BitmapDrawable(singer_bitmap));
                                 mArtistImageView.setTag(initAudioInfo.getFilePath().hashCode() + "");
+                            if(cover!=null) {
+                                Bitmap singer_bitmap = BitmapFactory.decodeByteArray(cover, 0, cover.length);
+                                mArtistImageView.setImageDrawable(new BitmapDrawable(singer_bitmap));
+                                mArtistImageView.setTag(initAudioInfo.getFilePath().hashCode()+"");
                             }
                             else {
                                 //加载歌手头像
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6b03fa1..598837c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sat Sep 26 12:04:29 CST 2020
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME