From 32a7b0e667d3e3b68ab84d2d9002239f9eb61803 Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Wed, 11 Aug 2021 14:44:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=85=A5MusicListActivity=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=9D=83=E9=99=90=E6=A3=80=E6=9F=A5,=E6=8B=92?=
 =?UTF-8?q?=E7=BB=9D=E5=A2=9E=E5=8A=A0toast=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tutu/music/activity/MusicListActivity.java   | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/src/module_music/java/com/yizhuan/tutu/music/activity/MusicListActivity.java b/app/src/module_music/java/com/yizhuan/tutu/music/activity/MusicListActivity.java
index 26bca5f0c..9e9bf43e2 100644
--- a/app/src/module_music/java/com/yizhuan/tutu/music/activity/MusicListActivity.java
+++ b/app/src/module_music/java/com/yizhuan/tutu/music/activity/MusicListActivity.java
@@ -1,11 +1,14 @@
 package com.yizhuan.tutu.music.activity;
 
 import android.Manifest;
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+
 import androidx.fragment.app.Fragment;
 import androidx.viewpager.widget.ViewPager;
+
 import android.view.View;
 import android.widget.ImageView;
 
@@ -24,6 +27,7 @@ import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
 import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
 import com.yizhuan.xchat_android_core.music.event.JumpToShareMusicListFragmentEvent;
 import com.yizhuan.xchat_android_core.music.view.IMusicListView;
+import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -34,6 +38,7 @@ import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import io.reactivex.functions.Consumer;
 
 @CreatePresenter(MusicListPresenter.class)
 public class MusicListActivity extends BaseMvpActivity<IMusicListView, MusicListPresenter>
@@ -75,13 +80,14 @@ public class MusicListActivity extends BaseMvpActivity<IMusicListView, MusicList
         context.startActivity(intent);
     }
 
+    @SuppressLint("CheckResult")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_music_list);
         ButterKnife.bind(this);
         fragments.add(LocalMusicListFragment.newInstance());
-       // fragments.add(ShareMusicListFragment.newInstance());
+        // fragments.add(ShareMusicListFragment.newInstance());
         adapter.setData(fragments);
         viewPager.setAdapter(adapter);
         slidingTabLayout.setViewPager(viewPager, titles);
@@ -91,7 +97,13 @@ public class MusicListActivity extends BaseMvpActivity<IMusicListView, MusicList
         page = getIntent().getIntExtra(KEY_PAGE, page);
         viewPager.setCurrentItem(page);
         StatisticManager.Instance().onEvent(StatisticsProtocol.Event.ROOM_SHARING_MUSIC, "共享音乐");
-        checkPermission(Manifest.permission.READ_EXTERNAL_STORAGE);
+        checkPermission(Manifest.permission.READ_EXTERNAL_STORAGE)
+                .compose(bindToLifecycle())
+                .subscribe(aBoolean -> {
+                    if (!aBoolean) {
+                        toast("请给予应用存储权限，以正常播放音乐。");
+                    }
+                });
     }
 
     @Override