1.优化代码

.idea/misc.xml

@@ -662,6 +662,7 @@
         <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res-minimalistui/layout/minimalist_forward_msg_holder.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res/drawable/chat_bubble_self_cavity_bg.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res/drawable/layer_live_rating_bar.xml" value="0.1415" />
+        <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res/drawable/layer_progress.xml" value="0.1415" />
         <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res/layout/chat_end_consultation.xml" value="0.536" />
         <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res/layout/chat_input_layout.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res/layout/chat_input_layout_actoin.xml" value="0.23697916666666666" />

baselib/src/main/java/com/yingyangfly/baselib/bean/def/PermissionList.kt

@@ -17,4 +17,10 @@ object PermissionList {
         Permission.RECORD_AUDIO,
         Permission.READ_EXTERNAL_STORAGE
     )
+
+    val cameraPermission = arrayOf(
+        Permission.WRITE_EXTERNAL_STORAGE,
+        Permission.READ_EXTERNAL_STORAGE,
+        Permission.CAMERA
+    )
 }

healthconsultation/src/main/java/com/yingyang/healthconsultation/consultationsheet/ConsultationSheetActivity.kt

@@ -1,8 +1,6 @@
 package com.yingyang.healthconsultation.consultationsheet
 
-import android.Manifest
 import android.annotation.SuppressLint
-import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.text.TextUtils
@@ -14,8 +12,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.alibaba.android.arouter.launcher.ARouter
-import com.hjq.permissions.OnPermissionCallback
-import com.hjq.permissions.XXPermissions
 import com.yingyang.healthconsultation.R
 import com.yingyang.healthconsultation.adapter.SickTimeAdapter
 import com.yingyang.healthconsultation.databinding.ActivityConsultationSheetBinding
@@ -23,12 +19,9 @@ import com.yingyang.healthconsultation.entity.PatientConsultationBean
 import com.yingyang.healthconsultation.entity.PurchaseConsultationBean
 import com.yingyang.healthconsultation.entity.UploadImgBean
 import com.yingyangfly.baselib.adapter.XBaseAdapter
-import com.yingyangfly.baselib.dialog.TipDialogFragment
+import com.yingyangfly.baselib.bean.def.PermissionList
 import com.yingyangfly.baselib.dialog.TipsDialog
-import com.yingyangfly.baselib.ext.getEndAnimation
-import com.yingyangfly.baselib.ext.getScaleAnimation
-import com.yingyangfly.baselib.ext.setOnSingleClickListener
-import com.yingyangfly.baselib.ext.toast
+import com.yingyangfly.baselib.ext.*
 import com.yingyangfly.baselib.image.ImagePagerActivity
 import com.yingyangfly.baselib.image.XImageSelector
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
@@ -38,7 +31,6 @@ import com.yingyangfly.baselib.utils.img.ImgUtil
 import top.zibin.luban.Luban
 import top.zibin.luban.OnCompressListener
 import java.io.File
-import java.util.*
 
 /**
  * 问诊单
@@ -48,13 +40,6 @@ class ConsultationSheetActivity :
     BaseMVVMActivity<ActivityConsultationSheetBinding, ConsultationSheetViewModel>(),
     View.OnTouchListener {
 
-    // 添加存储权限的原因是 以防启动页面没有授权存储权限 相机权限，摄像头权限
-    private val cameraPermission = Arrays.asList(
-        Manifest.permission.WRITE_EXTERNAL_STORAGE,
-        Manifest.permission.READ_EXTERNAL_STORAGE,
-        Manifest.permission.CAMERA
-    ).toTypedArray()
-
     private var isConsultation = ""
     private var id: String = ""
     private var imageList = mutableListOf<UploadImgBean>()
@@ -402,57 +387,11 @@ class ConsultationSheetActivity :
      * 申请录音权限
      */
     private fun applyCameraPermission() {
-        if (!cameraPermissionBool(mContext)) {
-            // 没有权限申请权限
-            XXPermissions.with(mContext)
-                .permission(cameraPermission)
-                .request(object : OnPermissionCallback {
-                    override fun onGranted(permissions: List<String>, all: Boolean) {
-                        if (all) { // 全部获取权限成功
-                            selectPic()
-                        } else { // 部分获取权限成功
-                            showTipDialog(permissions)
-                        }
-                    }
-
-                    override fun onDenied(permissions: List<String>, never: Boolean) {
-                        if (never) { // 被永久拒绝
-                            // 如果是被永久拒绝就跳转到应用权限系统设置页面
-                            XXPermissions.startPermissionActivity(mContext, permissions)
-                        } else {
-                            showTipDialog(permissions)
-                        }
-                    }
-                })
-        } else {
+        PermissionList.cameraPermission.check(this) {
             selectPic()
         }
     }
 
-    /**
-     * 是否有相机权限
-     * @return
-     */
-    private fun cameraPermissionBool(context: Context): Boolean {
-        return XXPermissions.isGranted(context, cameraPermission)
-    }
-
-    /**
-     * 跳转设置页面
-     */
-    private fun showTipDialog(permissions: List<String>) {
-        TipDialogFragment.TipDialogBuilder()
-            .content("当前应用缺少必要权限,请点击“设置”-“权限”-“权限管理”打开所需权限")
-            .leftBtnText("退出")
-            .rightBtnText("设置")
-            .leftClick({
-            }, dimiss = true)
-            .rightClick({
-                XXPermissions.startPermissionActivity(mContext, permissions)
-            }, dimiss = true)
-            .show(supportFragmentManager)
-    }
-
     /**
      * 服务购买成功
      */