Merge remote-tracking branch 'origin/4.1.60' into 4.1.60

config.gradle

@@ -37,7 +37,6 @@ ext {
 
             //第二步 若干
             "ydl-webview"     : "0.0.38.33",
-            "ydl-webview"     : "0.0.38.33",
             "ydl-media"       : "0.0.21.6",
             "ydl-pay"         : "0.0.18.13",
             "m-audioim"       : "0.0.49.29.18",

m-audioim/src/main/java/com/ydl/audioim/AudioHomeActivity.kt

@@ -608,12 +608,15 @@ class AudioHomeActivity :
     private fun requestPermission() {
         val rxPermissions = RxPermissions(this)
         rxPermissions.requestEach(Manifest.permission.RECORD_AUDIO).subscribe { permission ->
-            if (permission.granted) {
+            when {
+                permission.granted -> {
                     writeAgoraLog("请求音频权限通过")
                     init()
-            } else if (permission.shouldShowRequestPermissionRationale) {
+                }
+                permission.shouldShowRequestPermissionRationale -> {
                     requestPermission()
-            } else {
+                }
+                else -> {
                     writeAgoraLog("拒绝请求音频权限")
                     uploadLog()
                     ToastHelper.show(getString(R.string.audioim_need_storage_permission_hint))
@@ -626,6 +629,7 @@ class AudioHomeActivity :
                 }
             }
         }
+    }
 
     @SuppressLint("CheckResult", "SetTextI18n")
     private fun init() {