Merge branch 'feat/qj/confide_optimize' into 'd/v_confide_optimized'

倾诉权限

See merge request app_android_lib/YDL-Component!209

build.gradle

@@ -33,7 +33,6 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.ydl.plugins:modular:1.0.3'
         classpath 'com.ydl:notracepoint-gradle-plugin:0.0.3'
-        classpath 'com.ydl.plugins:restools:1.0.1'
     }
 }
 

config.gradle

@@ -208,7 +208,7 @@ ext {
             "blankUtil"                    : "com.blankj:utilcode:1.25.9",
             "ydl-hnet"                     : "com.ydl:h-net:0.0.8",
             "ydl-user-router"              : "com.ydl:router:1.0.0-SNAPSHOT@aar",
-            "ydl-device"                   : "com.ydl:device-id:0.0.30@aar",
+            "ydl-device"                   : "com.ydl:device-id:0.0.31",
             "ydl-net"                      : "com.ydl:ydl-net:${ydl2PublishVersion}",
             "ydl-utils"                    : "com.ydl:ydl-utils:${ydl2PublishVersion}",
 

m-confide/src/main/java/com/ydl/confide/home/ConfidePermissionDialog.kt

@@ -7,13 +7,13 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.app.ActivityCompat
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.DialogFragment
 import com.blankj.utilcode.constant.PermissionConstants
 import com.blankj.utilcode.util.PermissionUtils
 import com.ydl.confide.R
 import com.ydl.confide.databinding.DialogConfidePermissionBinding
+import com.ydl.ydlcommon.view.dialog.CommonDialog
 
 class ConfidePermissionDialog : DialogFragment() {
 
@@ -37,8 +37,7 @@ class ConfidePermissionDialog : DialogFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         binding.ivClose.setOnClickListener {
-            callback?.invoke(false)
-            dismiss()
+            reject()
         }
 
         binding.tvBtn.setOnClickListener {
@@ -51,19 +50,21 @@ class ConfidePermissionDialog : DialogFragment() {
                     }
 
                     override fun onDenied(permissionsDeniedForever: MutableList<String>?, permissionsDenied: MutableList<String>?) {
-                        callback?.invoke(false)
-                        dismissAllowingStateLoss()
+                        reject()
                     }
                 }).request()
         }
     }
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        if (!ActivityCompat.shouldShowRequestPermissionRationale(requireActivity(), Manifest.permission.RECORD_AUDIO)) {
-            callback?.invoke(false)
-            dismissAllowingStateLoss()
-        }
+    private fun reject() {
+        dismissAllowingStateLoss()
+        CommonDialog(context)
+            .setMessage("由于您尚未同意获取麦克风权限，本次通话将使用传统电话方式拨打")
+            .setRightClick("确定") {
+                callback?.invoke(false)
+            }
+            .setCancelAble(false)
+            .show()
     }
 
     override fun onStart() {

m-home/build.gradle

@@ -2,13 +2,6 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
-apply plugin: 'resTools' // 资源重命名插件
-
-// 配置资源重命名插件
-resConfig {
-    new_prefix = 'home_'  // 资源前缀
-    old_prefix = ''         // 老前缀，可为''空字符串
-}
 
 kapt {
     arguments {

ydl-platform/src/main/java/com/ydl/ydlcommon/utils/DeviceTool.java

@@ -49,7 +49,6 @@ public class DeviceTool {
         } else {
             activity.startActivity(getAppDetailSettingIntent());
         }
-        gotoMiuiPermission(activity);
     }
 
     /**
@@ -57,7 +56,7 @@ public class DeviceTool {
      */
     private static void gotoMiuiPermission(Activity activity) {
         Intent i = new Intent("miui.intent.action.APP_PERM_EDITOR");
-        ComponentName componentName = new ComponentName("com.miui.securitycenter", "com.miui.permcenter.permissions.AppPermissionsEditorActivity");
+        ComponentName componentName = new ComponentName("com.miui.securitycenter", "com.miui.permcenter.permissions.PermissionsEditorActivity");
         i.setComponent(componentName);
         i.putExtra("extra_pkgname", getPackageName());
         try {

ydl-platform/src/main/res/values/styles.xml

@@ -38,8 +38,8 @@
         <item name="android:windowIsFloating">true</item>
         <item name="android:windowIsTranslucent">false</item>
         <item name="android:windowNoTitle">true</item>
-        <item name="android:layout_marginRight">30dp</item>
-        <item name="android:layout_marginLeft">30dp</item>
+        <item name="android:layout_marginRight">0dp</item>
+        <item name="android:layout_marginLeft">0dp</item>
         <item name="android:windowBackground">@drawable/platform_normaldialog_bg</item>
         <item name="android:backgroundDimEnabled">true</item>
     </style>