修改权限说明提示文案

BaseLibrary/src/main/res/values/strings.xml

@@ -23,6 +23,6 @@
 
     <string name="camera_permission_tip">申请相机权限用于拍摄照片、录制视频、证件扫描、二维码扫描等场景中完成摄像头相关功能;</string>
     <string name="write_or_read_storage_permission_tip">存储权限用于在添加,制作,上传,发布,分享,下载,搜索,识别图片和视频等场景中读取和写入相册和文件内容;</string>
-    <string name="record_audio_permission_tip">录音权限用于调音器,音视频录制,发送音频消息等场景中收集音频数据功能</string>
+    <string name="record_audio_permission_tip">录音权限用于调音器,音视频录制,发送音频消息等场景中收集音频数据功能;</string>
     <string name="call_phone_permission_tip">录拨打电话权限用于一键联系等场景中快捷拨打电话功能;</string>
 </resources>

musicMerge/src/main/java/com/cooleshow/musicmerge/ui/MusicHandleSettingFragment.java

@@ -315,15 +315,18 @@ public class MusicHandleSettingFragment extends BaseFragment<FgMusicHandleSettin
     }
 
     private void toAlbum(int aspect_ratio_x, int aspect_ratio_y, int requestCode) {
+        String[] permissions = new String[]{Manifest.permission.CAMERA,
+                Manifest.permission.READ_EXTERNAL_STORAGE,
+                Manifest.permission.WRITE_EXTERNAL_STORAGE};
+        PermissionTipHelper.getInstance().showTipDialog(this, permissions);
         new RxPermissions(this)
-                .request(Manifest.permission.CAMERA,
-                        Manifest.permission.READ_EXTERNAL_STORAGE,
-                        Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                .request(permissions)
                 .subscribe(granted -> {
+                    PermissionTipHelper.getInstance().dismissDialog();
                     if (granted) {
                         goAlbum(aspect_ratio_x, aspect_ratio_y, requestCode);
                     } else {
-                        ToastUtil.getInstance().show(getContext(), "请打开存储和相机权限！");
+                        UiUtils.showPermissionTipDialog(getChildFragmentManager(),getContext(),"","请打开存储和相机权限！");
                     }
                 });
     }