From 51f1b9494e378fb5993f9ab11bce757e38e193a6 Mon Sep 17 00:00:00 2001
From: Yutousama <583819556@qq.com>
Date: Fri, 27 May 2022 14:23:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E6=AD=8C=E6=9B=B2=E5=88=B0=E9=98=9F=E5=88=97=E4=B8=8D?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Adapters/MusicLibsAdapter.java            | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/yutou/nas_music_player/Adapters/MusicLibsAdapter.java b/app/src/main/java/com/yutou/nas_music_player/Adapters/MusicLibsAdapter.java
index 5983894..0a63c51 100644
--- a/app/src/main/java/com/yutou/nas_music_player/Adapters/MusicLibsAdapter.java
+++ b/app/src/main/java/com/yutou/nas_music_player/Adapters/MusicLibsAdapter.java
@@ -45,14 +45,15 @@ public class MusicLibsAdapter extends RecyclerView.Adapter<MusicLibsAdapter.View
     public static final int LIBS_MODEL_PLAY_LIST = 4;
     public static final int LIBS_MODEL_PLAY_Collection = 5;
 
-    public  interface OnClickAction{
-        void onClick(Intent intent,View view);
-    }
-    protected OnClickAction clickAction;
-    public void setOnClickAction(OnClickAction onClickAction) {
-        this.clickAction=onClickAction;
+    public interface OnClickAction {
+        void onClick(Intent intent, View view);
     }
 
+    protected OnClickAction clickAction;
+
+    public void setOnClickAction(OnClickAction onClickAction) {
+        this.clickAction = onClickAction;
+    }
 
 
     List<MusicData> list = new ArrayList<>();
@@ -141,7 +142,7 @@ public class MusicLibsAdapter extends RecyclerView.Adapter<MusicLibsAdapter.View
     }
 
     public void setModel(int model) {
-        this.model=model;
+        this.model = model;
     }
 
     public class ViewHolderCollection extends ViewHolder {
@@ -298,9 +299,9 @@ public class MusicLibsAdapter extends RecyclerView.Adapter<MusicLibsAdapter.View
             Intent intent = new Intent(itemView.getContext(), AlbumsActivity.class);
             intent.putExtra("model", 2);
             intent.putExtra("fid", data.getId());
-            intent.putExtra("image",data.getImg(AppData.imageWidth, AppData.imageHigh));
-            if(clickAction!=null){
-                clickAction.onClick(intent,icon);
+            intent.putExtra("image", data.getImg(AppData.imageWidth, AppData.imageHigh));
+            if (clickAction != null) {
+                clickAction.onClick(intent, icon);
             }
         }
 
@@ -310,10 +311,10 @@ public class MusicLibsAdapter extends RecyclerView.Adapter<MusicLibsAdapter.View
             Intent intent = new Intent(itemView.getContext(), AlbumsActivity.class);
             intent.putExtra("model", 0);
             intent.putExtra("album", data.getAlbum());
-            intent.putExtra("image",data.getImg(AppData.imageWidth, AppData.imageHigh));
-            intent.putExtra("color",AppTools.getImageColor(data.getImg(AppData.minImageWidth,AppData.minImageHigh)));
-            if(clickAction!=null){
-                clickAction.onClick(intent,icon);
+            intent.putExtra("image", data.getImg(AppData.imageWidth, AppData.imageHigh));
+            intent.putExtra("color", AppTools.getImageColor(data.getImg(AppData.minImageWidth, AppData.minImageHigh)));
+            if (clickAction != null) {
+                clickAction.onClick(intent, icon);
             }
         }
 
@@ -366,8 +367,8 @@ public class MusicLibsAdapter extends RecyclerView.Adapter<MusicLibsAdapter.View
                 icon.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        if (data.getImg(AppData.minImageWidth,AppData.minImageHigh) != null) {
-                            Glide.with(MyApplication.application).load(data.getImg(AppData.minImageWidth,AppData.minImageHigh))
+                        if (data.getImg(AppData.minImageWidth, AppData.minImageHigh) != null) {
+                            Glide.with(MyApplication.application).load(data.getImg(AppData.minImageWidth, AppData.minImageHigh))
                                     .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(25, 3)))
                                     .into(icon);
                             icon.setTag("img");
@@ -411,11 +412,10 @@ public class MusicLibsAdapter extends RecyclerView.Adapter<MusicLibsAdapter.View
                     .setTitle("添加文件夹到队列")
                     .setMessage("将文件夹中所有歌曲添加到队列?")
                     .setPositiveButton("添加", new DialogInterface.OnClickListener() {
-                        KProgressHUD hud;
 
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
-                            hud = AppTools.showLoading(itemView.getContext());
+                            AppTools.showHud(itemView.getContext());
                             JSONObject json = new JSONObject();
                             json.put("path", data.getFile());
                             json.put("type", true);
@@ -425,14 +425,15 @@ public class MusicLibsAdapter extends RecyclerView.Adapter<MusicLibsAdapter.View
                                     List<MusicData> list = (List<MusicData>) data;
                                     for (MusicData musicData : list) {
                                         MusicContainer.getInstance().addTmpList(musicData);
-                                        hud.dismiss();
                                     }
+                                    AppTools.hideHud();
+                                    AppTools.toast(list.size()+"首歌已添加到队列中");
 
                                 }
 
                                 @Override
                                 public void httpError(Exception e) {
-
+                                    AppTools.toast("添加失败:" + e.getMessage());
                                 }
                             });
                         }
@@ -448,7 +449,7 @@ public class MusicLibsAdapter extends RecyclerView.Adapter<MusicLibsAdapter.View
 
 
         protected void showImage(MusicData musicData, ViewHolder holder) {
-            musicData.getImg(AppData.minImageWidth,AppData.minImageHigh, new NetworkInterface() {
+            musicData.getImg(AppData.minImageWidth, AppData.minImageHigh, new NetworkInterface() {
                 @Override
                 public void httpGetData(Object data, int state) {
                     Glide.with(MyApplication.application).load((Bitmap) data)