From e2285ec1c5b0054f9c0cf55208ce724f7fb9d444 Mon Sep 17 00:00:00 2001 From: Yutousama <583819556@qq.com> Date: Fri, 27 May 2022 14:18:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E6=BB=91=E4=B8=BA?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BD=93=E5=89=8D=E6=92=AD=E6=94=BE=E5=88=97?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E4=B8=8B=E6=BB=91=E4=B8=BA=E5=BA=93=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9EPOPDialog=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/libs/POPDialog-release.aar | Bin 0 -> 21930 bytes .../nas_music_player/views/MainActivity.java | 37 +++++++++++++++--- 2 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 app/libs/POPDialog-release.aar diff --git a/app/libs/POPDialog-release.aar b/app/libs/POPDialog-release.aar new file mode 100644 index 0000000000000000000000000000000000000000..8798a58937e9ffc62ee48b73f1fc4df1b3e1b901 GIT binary patch literal 21930 zcmV)5K*_&QO9KQ7000OG0000%0A&r<&!_+Z0P6t&00jU508%b=cyxV{OAdn|5Qg_X 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 SfFJJ#ep&&UGT;wnWd8%qsKqk? literal 0 HcmV?d00001 diff --git a/app/src/main/java/com/yutou/nas_music_player/views/MainActivity.java b/app/src/main/java/com/yutou/nas_music_player/views/MainActivity.java index d7c7ccd..e51d371 100644 --- a/app/src/main/java/com/yutou/nas_music_player/views/MainActivity.java +++ b/app/src/main/java/com/yutou/nas_music_player/views/MainActivity.java @@ -13,6 +13,7 @@ import android.view.GestureDetector; import android.view.KeyEvent; import android.view.MotionEvent; import android.view.View; +import android.view.ViewGroup; import android.view.WindowManager; import android.widget.ImageButton; import android.widget.ImageView; @@ -24,10 +25,13 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.core.app.ActivityOptionsCompat; import androidx.core.util.Pair; import androidx.core.view.GestureDetectorCompat; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import com.alibaba.fastjson.JSON; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; +import com.yutou.nas_music_player.Adapters.MusicLibsAdapter; import com.yutou.nas_music_player.Datas.MusicData; import com.yutou.nas_music_player.R; import com.yutou.nas_music_player.containers.MediaBrowserHelper; @@ -315,7 +319,8 @@ public class MainActivity extends AppCompatActivity { public boolean onTouchEvent(MotionEvent event) { return touch.onTouchEvent(event); } - private void toPlayList(){ + + private void toPlayList() { Pair pImage = Pair.create((View) album_image, "main_album_image"); Pair pPrevious = Pair.create((View) previous, "previous"); Pair pPlay = Pair.create((View) play, "play"); @@ -342,6 +347,29 @@ public class MainActivity extends AppCompatActivity { } } + private void showPOPDialog() { + List playList = MusicContainer.getInstance().getPlayList(); + POPDialog dialog = new POPDialog(this); + RecyclerView recyclerView = null; + dialog.enableExitButton(true); + if (playList.isEmpty()) { + dialog.setTitle("播放列表"); + dialog.setMessage("播放列表为空,正在全列表随机播放"); + } else { + dialog.setTitle("播放列表:" + playList.size()); + MusicLibsAdapter adapter = new MusicLibsAdapter(this); + ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT); + recyclerView = new RecyclerView(this); + recyclerView.setLayoutManager(new LinearLayoutManager(this)); + recyclerView.setLayoutParams(params); + recyclerView.setAdapter(adapter); + adapter.setData(playList); + adapter.setBrowserHelper(browserHelper); + dialog.setContentView(recyclerView); + } + dialog.show(); + } + private class PlayListener extends MediaControllerCompat.Callback { @SuppressLint("SetTextI18n") @Override @@ -397,17 +425,14 @@ public class MainActivity extends AppCompatActivity { public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) { float x = e1.getX() - e2.getX(); float y = e1.getY() - e2.getY(); - if (Math.abs(x) < 200 && y > 500) { - System.out.println("上"); + if (Math.abs(x) < 200 && y > 300) { + showPOPDialog(); } else if (Math.abs(x) < 200 && y < -500) { toPlayList(); - System.out.println("下"); } else if (Math.abs(y) < 200 && x > 300) { next.callOnClick(); - System.out.println("右"); } else if (Math.abs(y) < 200 && x < -300) { previous.callOnClick(); - System.out.println("左"); } return super.onFling(e1, e2, velocityX, velocityY); }