From 230bcba860d86a85855096ecc7ecbc778b046ab8 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:28:53 +0800
Subject: [PATCH] =?UTF-8?q?####=20=202022-12-15=20V7.0.6=20-=20*.[?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E]=E6=96=B0=E5=A2=9E=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=AD=8C=E6=89=8B=E5=A4=B4=E5=83=8F=E4=BB=8E=E6=AD=8C=E6=9B=B2?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=AD=E8=8E=B7=E5=8F=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                              |  4 +--
 .idea/jarRepositories.xml                     |  5 +++
 .idea/modules.xml                             |  3 ++
 CHANGELOG.md                                  |  4 +++
 app/build.gradle                              |  4 +--
 .../main/java/com/zlm/hp/ui/MainActivity.java | 31 ++++++++++++-------
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 7 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 526b4c2..a5bace0 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,15 +5,15 @@
     <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$" />
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index d2f29f5..4d9dffd 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -46,5 +46,10 @@
       <option name="name" value="maven" />
       <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/jcenter" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenLocal" />
+      <option name="name" value="MavenLocal" />
+      <option name="url" value="file:/$USER_HOME$/.m2/repository/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index b018651..dbc938d 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,6 +4,9 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/HappyPlayer5-happy_player6.iml" filepath="$PROJECT_DIR$/HappyPlayer5-happy_player6.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/HappyPlayer5-happy_player6.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/HappyPlayer5-happy_player6.app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/HappyPlayer5-happy_player6.app.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/HappyPlayer5-happy_player6.app.androidTest.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/HappyPlayer5-happy_player6.app.main.iml" filepath="$PROJECT_DIR$/.idea/modules/app/HappyPlayer5-happy_player6.app.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/HappyPlayer5-happy_player6.app.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/HappyPlayer5-happy_player6.app.unitTest.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f14a806..2515c15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+####  2022-12-15 V7.0.6
+
+- *.[新增]新增支持歌手头像从歌曲文件中获取。
+
 ####  2022-02-13 V7.0.5
 
 - *.[改进]启动软件时自动播放歌曲。
diff --git a/app/build.gradle b/app/build.gradle
index 24be591..c832182 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 918bfe1..20186d5 100644
--- a/app/src/main/java/com/zlm/hp/ui/MainActivity.java
+++ b/app/src/main/java/com/zlm/hp/ui/MainActivity.java
@@ -6,6 +6,7 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
+import android.media.MediaMetadataRetriever;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Message;
@@ -439,17 +440,25 @@ public class MainActivity extends BaseActivity {
                             mMusicSeekBar.setMax((int) initAudioInfo.getDuration());
                             mMusicSeekBar.setProgress((int) initAudioInfo.getPlayProgress());
                             mMusicSeekBar.setSecondaryProgress(0);
-
-                            //加载歌手头像
-                            ImageUtil.loadSingerImage(mContext, mArtistImageView, initAudioInfo.getSingerName(), mConfigInfo.isWifi(), 400, 400, new AsyncHandlerTask(mUIHandler, mWorkerHandler), new ImageUtil.ImageLoadCallBack() {
-                                @Override
-                                public void callback(Bitmap bitmap) {
-                                    //if (bitmap != null) {
-                                    AudioBroadcastReceiver.sendNotifiyImgLoadedReceiver(mContext, initAudioInfo);
-                                    // }
-                                }
-                            });
-
+                            MediaMetadataRetriever mediaMetadataRetriever = new MediaMetadataRetriever();
+                            mediaMetadataRetriever.setDataSource(initAudioInfo.getFilePath());
+                            byte[] cover = mediaMetadataRetriever.getEmbeddedPicture();
+                            if(cover!=null) {
+                                Bitmap singer_bitmap = BitmapFactory.decodeByteArray(cover, 0, cover.length);
+                                mArtistImageView.setImageDrawable(new BitmapDrawable(singer_bitmap));
+                                mArtistImageView.setTag(initAudioInfo.getFilePath().hashCode()+"");
+                            }
+                            else {
+                                //加载歌手头像
+                                ImageUtil.loadSingerImage(mContext, mArtistImageView, initAudioInfo.getSingerName(), mConfigInfo.isWifi(), 400, 400, new AsyncHandlerTask(mUIHandler, mWorkerHandler), new ImageUtil.ImageLoadCallBack() {
+                                    @Override
+                                    public void callback(Bitmap bitmap) {
+                                        //if (bitmap != null) {
+                                        AudioBroadcastReceiver.sendNotifiyImgLoadedReceiver(mContext, initAudioInfo);
+                                        // }
+                                    }
+                                });
+                            }
                             //加载歌词
                             String keyWords = initAudioInfo.getTitle();
                             LyricsManager.newInstance(mContext).loadLyrics(initAudioInfo.getFilePath(),keyWords, keyWords, initAudioInfo.getDuration() + "", initAudioInfo.getHash(), mConfigInfo.isWifi(), new AsyncHandlerTask(mUIHandler, mWorkerHandler), null);
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1245df2..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=file:///E:/\u6211\u7684\u4EE3\u7801/android/gradle\u5305/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME