重构图片加载代码

修复通知栏响应不及时问题

app/build.gradle

@@ -19,7 +19,7 @@ android {
         minSdkVersion 23
         targetSdkVersion 32
         versionCode 1
-        versionName "1.2"
+        versionName "1.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -71,7 +71,6 @@ dependencies {
     implementation 'com.kaopiz:kprogresshud:1.2.0'
     implementation 'com.github.promeg:tinypinyin:2.0.3'
     implementation 'com.github.myinnos:AlphabetIndex-Fast-Scroll-RecyclerView:1.0.95'
-    implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
 
 
     implementation "androidx.room:room-runtime:2.4.3"

app/src/main/java/com/yutou/nas_music_player/Adapters/AlbumsRecyclerAdapter.java

@@ -23,6 +23,7 @@ import com.yutou.nas_music_player.R;
 import com.yutou.nas_music_player.containers.MediaBrowserHelper;
 import com.yutou.nas_music_player.containers.MusicContainer;
 import com.yutou.nas_music_player.tools.AppData;
+import com.yutou.nas_music_player.tools.ImageLoader;
 
 import java.util.List;
 
@@ -70,36 +71,8 @@ public class AlbumsRecyclerAdapter extends RecyclerView.Adapter<AlbumsRecyclerAd
             holder.artist.setVisibility(View.VISIBLE);
             //   holder.icon.setImageBitmap(ThumbnailUtils.extractThumbnail(data.getImg(), 64,64));
             if (holder.icon.getTag() == null) {
-                data.getImg(AppData.minImageWidth, AppData.minImageHigh, new NetworkInterface() {
+                ImageLoader.getInstance(context).showImage(holder.icon,data.getImageUrl(),AppData.minImageWidth,AppData.minImageHigh,true);
-                    @Override
-                    public void httpGetData(Object data, int state) {
-                        Glide.with(context).load((Bitmap) data)
-                                .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(25, 3)))
-                                .into(holder.icon);
-
             }
-
-                    @Override
-                    public void httpError(Exception e) {
-
-                    }
-                });
-            }
-
-            holder.icon.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    data.getImg(AppData.minImageWidth,AppData.minImageHigh,new DefaultNetworkInterface(){
-                        @Override
-                        public void httpGetData(Object data, int state) {
-                            super.httpGetData(data, state);
-                            Glide.with(context).load(data)
-                                    .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(25, 3)))
-                                    .into(holder.icon);
-                        }
-                    });
-                }
-            });
         } else {
             holder.message.setText("");
             holder.play_mask.setVisibility(View.GONE);

app/src/main/java/com/yutou/nas_music_player/Adapters/MusicLibsAdapter.java

@@ -22,6 +22,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.yutou.nas_music_player.Datas.MusicData;
+import com.yutou.nas_music_player.Interfaces.AbsObjectInterface;
 import com.yutou.nas_music_player.Interfaces.DefaultNetworkInterface;
 import com.yutou.nas_music_player.Interfaces.NetworkInterface;
 import com.yutou.nas_music_player.MyApplication;
@@ -31,6 +32,7 @@ import com.yutou.nas_music_player.containers.MusicContainer;
 import com.yutou.nas_music_player.network.HttpManager;
 import com.yutou.nas_music_player.tools.AppData;
 import com.yutou.nas_music_player.tools.AppTools;
+import com.yutou.nas_music_player.tools.ImageLoader;
 import com.yutou.nas_music_player.tools.StringUtil;
 import com.yutou.nas_music_player.views.AlbumsActivity;
 
@@ -334,19 +336,20 @@ public class MusicLibsAdapter extends RecyclerView.Adapter<MusicLibsAdapter.View
             System.out.println("点击item");
             if (data == null)
                 return;
-            data.getImg(AppData.imageWidth, AppData.imageHigh,new DefaultNetworkInterface(){
+            ImageLoader.getInstance(context).getImageBitmap(data.getImageUrl(), AppData.imageWidth, AppData.imageHigh, new AbsObjectInterface<Bitmap>() {
                 @Override
-                public void httpGetData(Object bitmap, int state) {
+                public void onData(Bitmap bitmap) {
-                    super.httpGetData(data, state);
+                    if(bitmap!=null){
                         Intent intent = new Intent(itemView.getContext(), AlbumsActivity.class);
                         intent.putExtra("model", 0);
                         intent.putExtra("album", data.getAlbum());
-                    intent.putExtra("image",  HttpManager.NetworkAPI.HOME+data.getImageUrl());
+                        intent.putExtra("image",  data.getImageUrl());
-                    intent.putExtra("color", AppTools.getImageColor((Bitmap) bitmap));
+                        intent.putExtra("color", AppTools.getImageColor(bitmap));
                         if (clickAction != null) {
                             clickAction.onClick(intent, icon);
                         }
                     }
+                }
             });
 
         }
@@ -397,22 +400,6 @@ public class MusicLibsAdapter extends RecyclerView.Adapter<MusicLibsAdapter.View
                 //   icon.setImageBitmap(ThumbnailUtils.extractThumbnail(data.getImg(), 64,64));
                 showImage(data, this);
 
-                icon.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        data.getImg(AppData.minImageWidth, AppData.minImageHigh,new DefaultNetworkInterface(){
-                            @Override
-                            public void httpGetData(Object bitmap, int state) {
-                                super.httpGetData(data, state);
-                                Glide.with(MyApplication.application).load(bitmap)
-                                        .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(25, 3)))
-                                        .into(icon);
-                                icon.setTag("img");
-                            }
-                        });
-
-                    }
-                });
             } else {
                 message.setText("");
                 play_mask.setVisibility(View.GONE);
@@ -487,22 +474,7 @@ public class MusicLibsAdapter extends RecyclerView.Adapter<MusicLibsAdapter.View
 
 
         protected void showImage(MusicData musicData, ViewHolder holder) {
-            musicData.getImg(AppData.minImageWidth, AppData.minImageHigh, new NetworkInterface() {
+            ImageLoader.getInstance(context).showImage(holder.icon,musicData.getImageUrl(),AppData.minImageWidth, AppData.minImageHigh,true);
-                @Override
-                public void httpGetData(Object data, int state) {
-                    Glide.with(MyApplication.application).load((Bitmap) data)
-                            .placeholder(holder.icon.getDrawable())
-                            .dontAnimate()
-                            .skipMemoryCache(false)
-                            .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(25, 3)))
-                            .into(holder.icon);
-                }
-
-                @Override
-                public void httpError(Exception e) {
-                    System.out.println("图片下载失败");
-                }
-            });
         }
 
         PopupWindow popupWindow = null;

app/src/main/java/com/yutou/nas_music_player/Datas/MusicData.java

@@ -2,25 +2,8 @@ package com.yutou.nas_music_player.Datas;
 
 
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.media.ThumbnailUtils;
 import android.view.View;
 
-import com.alibaba.fastjson.JSONObject;
-import com.nostra13.universalimageloader.core.ImageLoader;
-import com.nostra13.universalimageloader.core.assist.ImageSize;
-import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
-import com.yutou.nas_music_player.Interfaces.DefaultNetworkInterface;
-import com.yutou.nas_music_player.Interfaces.DownloadInterface;
-import com.yutou.nas_music_player.Interfaces.NetworkInterface;
-import com.yutou.nas_music_player.MyApplication;
-import com.yutou.nas_music_player.R;
-import com.yutou.nas_music_player.network.HttpManager;
-import com.yutou.nas_music_player.tools.AppData;
-import com.yutou.nas_music_player.tools.AppTools;
-import com.yutou.nas_music_player.tools.NetworkTool;
-import com.yutou.nas_music_player.tools.StringUtil;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.room.ColumnInfo;
@@ -28,7 +11,11 @@ import androidx.room.Entity;
 import androidx.room.Ignore;
 import androidx.room.PrimaryKey;
 
-import java.io.File;
+import com.yutou.nas_music_player.Interfaces.NetworkInterface;
+import com.yutou.nas_music_player.MyApplication;
+import com.yutou.nas_music_player.network.HttpManager;
+import com.yutou.nas_music_player.tools.AppTools;
+import com.yutou.nas_music_player.tools.StringUtil;
 
 @Entity
 public class MusicData {
@@ -227,7 +214,7 @@ public class MusicData {
 
 
     public String getPlayUrl() {
-        String url = HttpManager.NetworkAPI.HOME + HttpManager.NetworkAPI.MUSIC_PLAY
+        String url =HttpManager.NetworkAPI.MUSIC_PLAY
                 + "?random=false&token=" + HttpManager.NetworkAPI.HTTP_KEY + "&filePath=" + getMd5();
         System.out.println("播放地址:" + url);
         return url;
@@ -239,41 +226,6 @@ public class MusicData {
     }
 
 
-    public Bitmap getImg() {
-        return bitmap;
-    }
-
-    public Bitmap getImg(int width, int height,@NonNull NetworkInterface networkInterface) {
-        if(bitmap!=null) {
-            networkInterface.httpGetData(bitmap,0);
-            return bitmap;
-        }
-        if(width==-1||height==-1){
-           AppTools.initImageLoader(MyApplication.application)
-                    .loadImage(HttpManager.NetworkAPI.HOME+getImageUrl(),new SimpleImageLoadingListener(){
-                        @Override
-                        public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
-                            super.onLoadingComplete(imageUri, view, loadedImage);
-                            networkInterface.httpGetData(loadedImage,0);
-                            bitmap=loadedImage;
-                        }
-                    });
-        }else{
-            System.out.println(HttpManager.NetworkAPI.HOME+getImageUrl());
-           AppTools.initImageLoader(MyApplication.application)
-                    .loadImage(HttpManager.NetworkAPI.HOME+getImageUrl(),new ImageSize(width,height),new SimpleImageLoadingListener(){
-                        @Override
-                        public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
-                            super.onLoadingComplete(imageUri, view, loadedImage);
-                            networkInterface.httpGetData(loadedImage,0);
-                            bitmap=loadedImage;
-                        }
-                    });
-        }
-        return bitmap;
-
-    }
-
 
     public int getBitRate() {
         return bitRate;

app/src/main/java/com/yutou/nas_music_player/Interfaces/AbsObjectInterface.java

@@ -0,0 +1,5 @@
+package com.yutou.nas_music_player.Interfaces;
+
+public abstract class AbsObjectInterface<T> {
+    public abstract void onData(T t);
+}

app/src/main/java/com/yutou/nas_music_player/MyApplication.java

@@ -9,6 +9,7 @@ import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.yutou.nas_music_player.tools.ImageLoader;
 import com.yutou.nas_music_player.views.OpenActivity;
 
 import java.lang.ref.WeakReference;
@@ -39,6 +40,7 @@ public class MyApplication extends Application {
     public void onCreate() {
         super.onCreate();
         MyApplication.application = this;
+        ImageLoader.getInstance(this);
         registerActivityLifecycleCallbacks(new ActivityLifecycleCallbacks() {
             @Override
             public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle savedInstanceState) {

app/src/main/java/com/yutou/nas_music_player/containers/MediaBrowserHelper.java

@@ -10,6 +10,7 @@ import android.support.v4.media.session.MediaSessionCompat;
 import android.support.v4.media.session.PlaybackStateCompat;
 
 import com.yutou.nas_music_player.Datas.MusicData;
+import com.yutou.nas_music_player.Interfaces.AbsObjectInterface;
 import com.yutou.nas_music_player.MyApplication;
 import com.yutou.nas_music_player.services.MusicService;
 import com.yutou.nas_music_player.tools.AppData;
@@ -70,7 +71,13 @@ public class MediaBrowserHelper {
             public void run() {
                 for (MediaControllerCompat.Callback callback : callbacks) {
                     if (callback != null) {
-                        callback.onMetadataChanged(MusicContainer.getInstance().getNowPlayMetadataCompat());
+                        MusicContainer.getInstance().getNowPlayMetadataCompat(new AbsObjectInterface<MediaMetadataCompat>() {
+                            @Override
+                            public void onData(MediaMetadataCompat mediaMetadataCompat) {
+                                callback.onMetadataChanged(mediaMetadataCompat);
+                            }
+                        });
+
                     }
 
                 }

app/src/main/java/com/yutou/nas_music_player/containers/MusicContainer.java

@@ -4,6 +4,7 @@ import static android.media.MediaPlayer.SEEK_PREVIOUS_SYNC;
 
 import android.content.Context;
 import android.content.DialogInterface;
+import android.graphics.Bitmap;
 import android.media.MediaPlayer;
 import android.net.Uri;
 import android.os.Build;
@@ -19,12 +20,14 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.yutou.nas_music_player.Datas.MusicData;
 import com.yutou.nas_music_player.Datas.PreviousPlayerList;
+import com.yutou.nas_music_player.Interfaces.AbsObjectInterface;
 import com.yutou.nas_music_player.Interfaces.NetworkInterface;
 import com.yutou.nas_music_player.MyApplication;
 import com.yutou.nas_music_player.network.HttpManager;
 import com.yutou.nas_music_player.tools.AppData;
 import com.yutou.nas_music_player.tools.AppTools;
 import com.yutou.nas_music_player.tools.ConfigTools;
+import com.yutou.nas_music_player.tools.ImageLoader;
 import com.yutou.nas_music_player.tools.StringUtil;
 
 import java.io.IOException;
@@ -288,11 +291,12 @@ public class MusicContainer {
 
     private Timer playTimer;
 
-    public MediaMetadataCompat getNowPlayMetadataCompat() {
+    public void getNowPlayMetadataCompat(AbsObjectInterface<MediaMetadataCompat> objectInterface) {
         if (nowPlayData == null) {
-            return null;
+            objectInterface.onData(null);
+        } else {
+            getMetadataCompat(nowPlayData, objectInterface);
         }
-        return getMetadataCompat(nowPlayData);
     }
 
     public Long getYear(String year) {
@@ -313,11 +317,15 @@ public class MusicContainer {
     private MediaMetadataCompat metadataCompat;
     private String metaDataFile = "";
 
-    public MediaMetadataCompat getMetadataCompat(MusicData data) {
+    public void getMetadataCompat(MusicData data, AbsObjectInterface<MediaMetadataCompat> objectInterface) {
         if (data.getMd5().equals(metaDataFile)) {
-            return metadataCompat;
+            objectInterface.onData(metadataCompat);
+            return;
         }
         metaDataFile = data.getMd5();
+        ImageLoader.getInstance().getImageBitmap(data.getImageUrl(), -1, -1, new AbsObjectInterface<Bitmap>() {
+            @Override
+            public void onData(Bitmap bitmap) {
                 MediaMetadataCompat.Builder builder = new MediaMetadataCompat.Builder();
                 builder.putString(MediaMetadataCompat.METADATA_KEY_MEDIA_ID, data.getTitle());
                 builder.putString(MediaMetadataCompat.METADATA_KEY_ARTIST, data.getArtist());
@@ -328,12 +336,14 @@ public class MusicContainer {
                 builder.putLong(MediaMetadataCompat.METADATA_KEY_TRACK_NUMBER, Long.parseLong(data.getTrack()));
                 builder.putLong(MediaMetadataCompat.METADATA_KEY_DISC_NUMBER, Long.parseLong(data.getDisc_no()));
                 builder.putLong(MediaMetadataCompat.METADATA_KEY_DURATION, ((int) (data.getDurationAsDouble() * 1000)));
-        if (data.getImg() != null) {
+                if (bitmap != null) {
-            builder.putBitmap(MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON, data.getImg());
+                    builder.putBitmap(MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON, bitmap);
                 }
                 builder.putString("md5", data.getMd5());
                 metadataCompat = builder.build();
-        return metadataCompat;
+                objectInterface.onData(metadataCompat);
+            }
+        });
     }
 
     public static MusicLibs getLibs() {
@@ -346,6 +356,7 @@ public class MusicContainer {
         isPause = true;
         mediaPlayer.pause();
     }
+
     public void play() {
         isPause = false;
         mediaPlayer.start();

app/src/main/java/com/yutou/nas_music_player/network/HttpManager.java

@@ -44,7 +44,7 @@ public class HttpManager {
 
     public static class NetworkAPI {
         public static final String HTTP_KEY = "OHreoKn2CSlDipWV6phEupAqPIX2LJFl";
-        public static String HOME = "";
+        public static String HOME = "http://nas.cnmglz.com:8000/nas";
         public static String MUSIC_LIST = HOME + "/music/list.do";
         public static String MUSIC_Album = HOME + "/music/getAlbum.do";
         public static String MUSIC_Collection_Dir_List = HOME + "/music/favorite/dir/list.do";
@@ -64,7 +64,7 @@ public class HttpManager {
 
     private HttpManager() {
         System.out.println("初始化NetWork");
-        httpGet("http://192.168.31.88:8000/public/version.do", new NetworkInterface() {
+        /*httpGet("http://192.168.31.88:8000/public/version.do", new NetworkInterface() {
             @Override
             public void httpGetData(Object data, int state) {
                 System.out.println("state = " + state);
@@ -102,7 +102,7 @@ public class HttpManager {
                     }
                 });
             }
-        });
+        });*/
     }
 
     public static HttpManager getInstance() {

app/src/main/java/com/yutou/nas_music_player/services/MusicService.java

@@ -19,6 +19,7 @@ import androidx.annotation.Nullable;
 import androidx.media.MediaBrowserServiceCompat;
 
 import com.yutou.nas_music_player.Datas.MusicData;
+import com.yutou.nas_music_player.Interfaces.AbsObjectInterface;
 import com.yutou.nas_music_player.containers.MediaBrowserHelper;
 import com.yutou.nas_music_player.containers.MediaNotificationManager;
 import com.yutou.nas_music_player.containers.MusicContainer;
@@ -94,12 +95,17 @@ public class MusicService extends MediaBrowserServiceCompat {
                 }
                 mState = state.getState();
                 MusicData data = MusicContainer.getInstance().getNowPlayData();
-                MediaMetadataCompat metadataCompat = MusicContainer.getInstance().getMetadataCompat(data);
+                MusicContainer.getInstance().getMetadataCompat(data, new AbsObjectInterface<MediaMetadataCompat>() {
-                Notification notification = notificationManager.getNotification(metadataCompat, builderState(state.getPosition()).build(), getSessionToken());
+                    @Override
+                    public void onData(MediaMetadataCompat mediaMetadataCompat) {
+                        Notification notification = notificationManager.getNotification(mediaMetadataCompat, builderState(state.getPosition()).build(), getSessionToken());
                         notificationManager.getManager()
                                 .notify(MediaNotificationManager.NOTIFICATION_ID, notification);
                     }
                 });
+
+            }
+        });
         System.out.println("注册receiver");
         registerReceiver(receiver, intentFilter);
     }
@@ -119,7 +125,9 @@ public class MusicService extends MediaBrowserServiceCompat {
     @Override
     public void onLoadChildren(@NonNull String parentId, @NonNull Result<List<MediaBrowserCompat.MediaItem>> result) {
         List<MediaBrowserCompat.MediaItem> mediaItems = new ArrayList<>();
-        MediaMetadataCompat compat = MusicContainer.getInstance().getNowPlayMetadataCompat();
+        MusicContainer.getInstance().getNowPlayMetadataCompat(new AbsObjectInterface<MediaMetadataCompat>() {
+            @Override
+            public void onData(MediaMetadataCompat compat) {
                 System.out.println(compat);
                 if (compat != null) {
                     MediaBrowserCompat.MediaItem mediaItem = new MediaBrowserCompat.MediaItem(compat.getDescription(), MediaBrowserCompat.MediaItem.FLAG_PLAYABLE);
@@ -127,18 +135,26 @@ public class MusicService extends MediaBrowserServiceCompat {
                 }
                 result.sendResult(mediaItems);
             }
+        });
+
+    }
 
     public void seekToNotification(long pos) {
         MusicData data = MusicContainer.getInstance().getNowPlayData();
         if (!playMd5.equals(data.getMd5())) {
             playMd5 = data.getMd5();
-            mediaSession.setMetadata(MusicContainer.getInstance().getNowPlayMetadataCompat());
+            MusicContainer.getInstance().getNowPlayMetadataCompat(new AbsObjectInterface<MediaMetadataCompat>() {
+                @Override
+                public void onData(MediaMetadataCompat mediaMetadataCompat) {
+                    mediaSession.setMetadata(mediaMetadataCompat);
                     updateNotification();
-        }
                     mediaSession.setPlaybackState(new PlaybackStateCompat.Builder()
                             .setActions(MEDIA_SESSION_ACTIONS)
                             .setState(mState, pos, 1.0f, SystemClock.elapsedRealtime()).build());
                 }
+            });
+        }
+    }
 
     public PlaybackStateCompat.Builder builderState(long position) {
         PlaybackStateCompat.Builder stateBuilder = new PlaybackStateCompat.Builder();
@@ -180,7 +196,9 @@ public class MusicService extends MediaBrowserServiceCompat {
 
     public void updateNotification() {
 
-        MediaMetadataCompat metadataCompat = MusicContainer.getInstance().getNowPlayMetadataCompat();
+        MusicContainer.getInstance().getNowPlayMetadataCompat(new AbsObjectInterface<MediaMetadataCompat>() {
+            @Override
+            public void onData(MediaMetadataCompat metadataCompat) {
                 System.out.println("更新通知栏:" + metadataCompat.getString(MediaMetadataCompat.METADATA_KEY_MEDIA_ID));
                 //mediaSession.setMetadata(metadataCompat);
                 mediaSession.setActive(true);
@@ -190,6 +208,9 @@ public class MusicService extends MediaBrowserServiceCompat {
                 notificationManager.getManager()
                         .notify(MediaNotificationManager.NOTIFICATION_ID, notification);
             }
+        });
+
+    }
 
     public class MediaSessionCallback extends MediaSessionCompat.Callback {
 
@@ -203,13 +224,18 @@ public class MusicService extends MediaBrowserServiceCompat {
                 isRegReceiver = true;
             }
             mState = PlaybackStateCompat.STATE_PLAYING;
-            MediaMetadataCompat metadataCompat = MusicContainer.getInstance().getNowPlayMetadataCompat();
+            MusicContainer.getInstance().getNowPlayMetadataCompat(new AbsObjectInterface<MediaMetadataCompat>() {
+                @Override
+                public void onData(MediaMetadataCompat metadataCompat) {
                     mediaSession.setMetadata(metadataCompat);
                     mediaSession.setActive(true);
                     Notification notification = notificationManager.getNotification(metadataCompat, builderState(0).build(), getSessionToken());
                     startForeground(MediaNotificationManager.NOTIFICATION_ID, notification);
                     MusicContainer.getInstance().play(MusicContainer.getInstance().getNowPlayData());
                 }
+            });
+
+        }
 
         @Override
         public void onPause() {

app/src/main/java/com/yutou/nas_music_player/tools/AppTools.java

@@ -11,10 +11,6 @@ import android.widget.Toast;
 import androidx.palette.graphics.Palette;
 
 import com.kaopiz.kprogresshud.KProgressHUD;
-import com.nostra13.universalimageloader.cache.disc.impl.UnlimitedDiskCache;
-import com.nostra13.universalimageloader.core.DisplayImageOptions;
-import com.nostra13.universalimageloader.core.ImageLoader;
-import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
 import com.yutou.nas_music_player.MyApplication;
 import com.yutou.nas_music_player.R;
 
@@ -104,32 +100,6 @@ public class AppTools {
         return stringBuilder.toString();
     }
 
-    private static DisplayImageOptions initDisplayOptions() {
-        DisplayImageOptions.Builder displayImageOptionsBuilder = new DisplayImageOptions.Builder();
-        displayImageOptionsBuilder.cacheInMemory(false);
-        displayImageOptionsBuilder.cacheOnDisk(true);
-        displayImageOptionsBuilder.showImageForEmptyUri(R.drawable.ic_launcher_background);
-        displayImageOptionsBuilder.showImageOnFail(R.mipmap.ic_launcher);
-        return displayImageOptionsBuilder.build();
-    }
-
-    public static ImageLoader initImageLoader(Context context) {
-        if(imageLoader!=null){
-            return imageLoader;
-        }
-
-        imageLoader = ImageLoader.getInstance();
-        ImageLoaderConfiguration.Builder builder = new ImageLoaderConfiguration.Builder(context);
-        File cachePath = new File(context.getFilesDir().getAbsolutePath() + "/cache/");
-        if (!cachePath.exists()) {
-            cachePath.exists();
-        }
-        builder.diskCache(new UnlimitedDiskCache(cachePath));
-        builder.defaultDisplayImageOptions(initDisplayOptions());
-
-        imageLoader.init(builder.build());
-        return imageLoader;
-    }
 
     public static String getUrlBase64(String text) {
         return new String(Base64.encode(text.getBytes(), Base64.DEFAULT)).replace("\n", "");

app/src/main/java/com/yutou/nas_music_player/tools/ImageLoader.java

@@ -0,0 +1,94 @@
+package com.yutou.nas_music_player.tools;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
+import android.util.Log;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.RequestBuilder;
+import com.bumptech.glide.request.FutureTarget;
+import com.bumptech.glide.request.RequestOptions;
+import com.bumptech.glide.request.target.CustomTarget;
+import com.bumptech.glide.request.transition.Transition;
+import com.yutou.nas_music_player.Interfaces.AbsObjectInterface;
+
+import java.util.concurrent.ExecutionException;
+
+import jp.wasabeef.glide.transformations.BlurTransformation;
+import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
+
+public class ImageLoader {
+    private static ImageLoader manager;
+    private Context context;
+
+    private ImageLoader(Context context) {
+        this.context = context;
+    }
+
+    public static ImageLoader getInstance(Context context) {
+        if (manager == null) {
+            manager = new ImageLoader(context);
+        }
+        return manager;
+    }
+
+    public static ImageLoader getInstance() {
+        return manager;
+    }
+
+    public void showImage(ImageView imageView, String url, int imageWidth, int imageHigh, boolean isRounded, boolean isBlurTransformation) {
+        Log.w("图片地址", "url: " + url);
+        RequestBuilder<Drawable> builder = Glide.with(context)
+                .load(url)
+                .placeholder(imageView.getDrawable());
+        if (imageWidth != -1 && imageHigh != -1) {
+            builder = builder.override(imageWidth, imageHigh);
+        }
+        if (isRounded) {
+            builder = builder.apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(25, 3)));
+        }
+        if (isBlurTransformation) {
+            builder = builder.apply(RequestOptions.bitmapTransform(new BlurTransformation(25, 3)));
+        }
+        builder.into(imageView);
+    }
+
+    public void showImage(ImageView imageView, String url) {
+        showImage(imageView, url, -1, -1, false, false);
+    }
+
+    public void showImage(ImageView imageView, String url, int imageWidth, int imageHigh) {
+        showImage(imageView, url, imageWidth, imageHigh, false, false);
+    }
+
+    public void showImage(ImageView imageView, String url, int imageWidth, int imageHigh, boolean isRounded) {
+        showImage(imageView, url, imageWidth, imageHigh, isRounded, false);
+    }
+
+    public void getImageBitmap(String url, int imageWidth, int imageHigh, AbsObjectInterface<Bitmap> objectInterface) {
+        RequestBuilder<Bitmap> builder = Glide.with(context)
+                .asBitmap()
+                .load(url);
+        if (imageWidth != -1 && imageHigh != -1) {
+            builder = builder.override(imageWidth, imageHigh);
+        }
+        builder.into(new CustomTarget<Bitmap>() {
+            @Override
+            public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition<? super Bitmap> transition) {
+                objectInterface.onData(resource);
+            }
+
+            @Override
+            public void onLoadCleared(@Nullable Drawable placeholder) {
+
+            }
+        });
+
+    }
+
+}

app/src/main/java/com/yutou/nas_music_player/views/AlbumsActivity.java

@@ -19,7 +19,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.google.android.material.appbar.AppBarLayout;
-import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
 import com.yutou.nas_music_player.Adapters.AlbumsRecyclerAdapter;
 import com.yutou.nas_music_player.Datas.MusicData;
 import com.yutou.nas_music_player.Interfaces.NetworkInterface;
@@ -27,7 +26,7 @@ import com.yutou.nas_music_player.R;
 import com.yutou.nas_music_player.containers.MediaBrowserHelper;
 import com.yutou.nas_music_player.containers.MusicContainer;
 import com.yutou.nas_music_player.tools.AppData;
-import com.yutou.nas_music_player.tools.AppTools;
+import com.yutou.nas_music_player.tools.ImageLoader;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -64,18 +63,8 @@ public class AlbumsActivity extends AppCompatActivity {
         }
         String imageUrl = getIntent().getStringExtra("image");
         if (imageUrl != null) {
-            AppTools.initImageLoader(this).displayImage(imageUrl, album_image);
+            ImageLoader.getInstance(this).showImage(album_image, imageUrl, -1, -1, true);
-            AppTools.initImageLoader(this)
+            ImageLoader.getInstance(this).showImage(image_background, imageUrl, -1, -1, false,true);
-                    .loadImage(imageUrl, new SimpleImageLoadingListener() {
-                        @Override
-                        public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
-                            super.onLoadingComplete(imageUri, view, loadedImage);
-                            Glide.with(AlbumsActivity.this).load(loadedImage)
-                                    .apply(RequestOptions.bitmapTransform(new BlurTransformation(25, 3)))
-                                    .into(image_background);
-                        }
-                    });
-
         } else {
             album_image.setImageResource(R.mipmap.ic_launcher);
             Glide.with(AlbumsActivity.this).load(BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher))
@@ -105,20 +94,7 @@ public class AlbumsActivity extends AppCompatActivity {
                 adapter.notifyDataSetChanged();
                 if (list.isEmpty())
                     return;
-                list.get(0).getImg(AppData.imageWidth, AppData.imageHigh, new NetworkInterface() {
+                ImageLoader.getInstance(AlbumsActivity.this).showImage(image_background, list.get(0).getImageUrl(), AppData.imageWidth, AppData.imageHigh, true);
-                    @Override
-                    public void httpGetData(Object data, int state) {
-                        album_image.setImageBitmap((Bitmap) data);
-                        Glide.with(AlbumsActivity.this).load(data)
-                                .apply(RequestOptions.bitmapTransform(new BlurTransformation(25, 3)))
-                                .into(image_background);
-                    }
-
-                    @Override
-                    public void httpError(Exception e) {
-
-                    }
-                });
             }
 
             @Override

app/src/main/java/com/yutou/nas_music_player/views/MainActivity.java

@@ -42,6 +42,7 @@ import com.yutou.nas_music_player.containers.MusicContainer;
 import com.yutou.nas_music_player.tools.AppData;
 import com.yutou.nas_music_player.tools.AppTools;
 import com.yutou.nas_music_player.tools.ConfigTools;
+import com.yutou.nas_music_player.tools.ImageLoader;
 import com.yutou.popdialog.POPDialog;
 
 import java.util.List;
@@ -197,28 +198,8 @@ public class MainActivity extends AppCompatActivity {
 
     private void setImage(MusicData data) {
         // setBarColor(data.getImageColor());
-        data.getImg(AppData.imageWidth, AppData.imageHigh,new DefaultNetworkInterface(){
+        ImageLoader.getInstance(this).showImage(album_image, data.getImageUrl(), AppData.imageWidth, AppData.imageHigh, true);
-            @Override
+        ImageLoader.getInstance(this).showImage(background_image, data.getImageUrl(),AppData.imageWidth, AppData.imageHigh, false, true);
-            public void httpGetData(Object bitmap, int state) {
-                super.httpGetData(data, state);
-                Glide.with(MainActivity.this).load(bitmap)
-                        .placeholder(album_image.getDrawable())
-                        .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(25, 3)))
-                        .into(album_image);
-                Glide.with(MainActivity.this).load(bitmap)
-                        .placeholder(background_image.getDrawable())
-                        .apply(RequestOptions.bitmapTransform(new BlurTransformation(25, 3)))
-                        .into(background_image);
-            }
-        });
-      /*  data.getImg(AppData.minImageWidth, AppData.minImageHigh,new DefaultNetworkInterface(){
-            @Override
-            public void httpGetData(Object bitmap, int state) {
-                super.httpGetData(data, state);
-
-            }
-        });*/
-
     }
 
     private void initView() {

app/src/main/java/com/yutou/nas_music_player/views/PlayLibsActivity.java

@@ -31,6 +31,7 @@ import com.yutou.nas_music_player.R;
 import com.yutou.nas_music_player.containers.MediaBrowserHelper;
 import com.yutou.nas_music_player.containers.MusicContainer;
 import com.yutou.nas_music_player.tools.AppData;
+import com.yutou.nas_music_player.tools.ImageLoader;
 import com.yutou.nas_music_player.views.Fragments.MusicLibsFragment;
 
 import java.util.ArrayList;
@@ -177,12 +178,6 @@ public class PlayLibsActivity extends AppCompatActivity {
 
     }
 
-    private void setImage(Bitmap data) {
-        Glide.with(this).load(data)
-                .placeholder(album_image.getDrawable())
-                .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(25, 3)))
-                .into(album_image);
-    }
 
     @SuppressLint("SetTextI18n")
     private void setPlayData(final MusicData data) {
@@ -192,17 +187,7 @@ public class PlayLibsActivity extends AppCompatActivity {
         artist.setText(data.getArtist());
         progressBar.setMax((int) (data.getDurationAsDouble() * 1000));
         progressBar.setProgress(bar_pos);
-        data.getImg(AppData.minImageWidth, AppData.minImageHigh, new NetworkInterface() {
+        ImageLoader.getInstance(this).showImage(album_image, data.getImageUrl(), AppData.minImageWidth, AppData.minImageHigh, true);
-            @Override
-            public void httpGetData(Object data, int state) {
-                setImage((Bitmap) data);
-            }
-
-            @Override
-            public void httpError(Exception e) {
-
-            }
-        });
     }
 
     @Override
@@ -254,9 +239,5 @@ public class PlayLibsActivity extends AppCompatActivity {
             super.onQueueChanged(queue);
             System.out.println("不知道是啥变换了");
         }
-
-        public void setImage() {
-
-        }
     }
 }