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 @@
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 @@
+
+
+
+
+
\ 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 @@
+
+
+
\ 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