1.优化代码

healthconsultation/src/main/java/com/yingyang/healthconsultation/paid/PaidActivity.kt

@@ -1,8 +1,6 @@
 package com.yingyang.healthconsultation.paid
 
-import android.Manifest
 import android.annotation.SuppressLint
-import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.text.TextUtils
@@ -11,8 +9,6 @@ import android.view.View
 import androidx.recyclerview.widget.GridLayoutManager
 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.tencent.imsdk.v2.V2TIMConversation
 import com.tencent.qcloud.tuicore.TUIConstants
 import com.tencent.qcloud.tuicore.TUICore
@@ -23,22 +19,18 @@ import com.yingyang.healthconsultation.adapter.ConsultationDataAdapter
 import com.yingyang.healthconsultation.databinding.ActivityPaidBinding
 import com.yingyang.healthconsultation.entity.PatientConsultationBean
 import com.yingyang.healthconsultation.entity.PurchaseConsultationBean
+import com.yingyangfly.baselib.bean.def.PermissionList
 import com.yingyangfly.baselib.config.AccountConfig
 import com.yingyangfly.baselib.db.DoctorBean
 import com.yingyangfly.baselib.dialog.EvaluateDialog
-import com.yingyangfly.baselib.dialog.TipDialogFragment
 import com.yingyangfly.baselib.dialog.TipsDialog
-import com.yingyangfly.baselib.ext.getEndAnimation
-import com.yingyangfly.baselib.ext.getScaleAnimation
-import com.yingyangfly.baselib.ext.show
-import com.yingyangfly.baselib.ext.toast
+import com.yingyangfly.baselib.ext.*
 import com.yingyangfly.baselib.image.ImagePagerActivity
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
 import com.yingyangfly.baselib.utils.GsonUtil
 import com.yingyangfly.baselib.utils.JumpUtil
 import com.yingyangfly.baselib.utils.User
-import java.util.*
 
 /**
  * 已支付
@@ -59,14 +51,6 @@ class PaidActivity : BaseMVVMActivity<ActivityPaidBinding, PaidViewModel>(),
     private var isConsultation: String = ""
     private var doctor: DoctorBean? = null
 
-    // 添加存储权限的原因是 以防启动页面没有授权存储权限 相机权限，摄像头权限
-    private val cameraPermission = Arrays.asList(
-        Manifest.permission.WRITE_EXTERNAL_STORAGE,
-        Manifest.permission.READ_EXTERNAL_STORAGE,
-        Manifest.permission.CAMERA,
-        Manifest.permission.RECORD_AUDIO
-    ).toTypedArray()
-
     override fun onCreate(savedInstanceState: Bundle?) {
         id = intent.getStringExtra("id") ?: ""
         doctorId = intent.getStringExtra("doctorId") ?: ""
@@ -344,13 +328,13 @@ class PaidActivity : BaseMVVMActivity<ActivityPaidBinding, PaidViewModel>(),
      * 去评价
      */
     private fun evaluationOrder() {
-        val diaslog = EvaluateDialog()
-        diaslog.onDialogClickListener = {
+        val evaluateDialog = EvaluateDialog()
+        evaluateDialog.onDialogClickListener = {
             "评价成功".toast()
             binding.btnConnection.show(false)
         }
-        diaslog.setId(id)
-        diaslog.show(supportFragmentManager, "EvaluateDialog")
+        evaluateDialog.setId(id)
+        evaluateDialog.show(supportFragmentManager, "evaluateDialog")
     }
 
     /**
@@ -425,54 +409,8 @@ class PaidActivity : BaseMVVMActivity<ActivityPaidBinding, PaidViewModel>(),
      * 申请录音权限
      */
     private fun applyCameraPermission() {
-        if (cameraPermissionBool(mContext)) {
+        PermissionList.cameraPermission.check(this) {
             getUserSign()
-        } else {
-            // 没有权限申请权限
-            XXPermissions.with(mContext)
-                .permission(cameraPermission)
-                .request(object : OnPermissionCallback {
-                    override fun onGranted(permissions: List<String>, all: Boolean) {
-                        if (all) { // 全部获取权限成功
-                            getUserSign()
-                        } else { // 部分获取权限成功
-                            showTipDialog(permissions)
-                        }
-                    }
-
-                    override fun onDenied(permissions: List<String>, never: Boolean) {
-                        if (never) { // 被永久拒绝
-                            // 如果是被永久拒绝就跳转到应用权限系统设置页面
-                            XXPermissions.startPermissionActivity(mContext, permissions)
-                        } else {
-                            showTipDialog(permissions)
-                        }
-                    }
-                })
         }
     }
-
-    /**
-     * 是否有相机权限
-     * @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)
-    }
 }