From ec8f3c7d7552d991ca843803a882020db8dba83a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 2 Jul 2021 18:00:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=81=94=E6=83=B3pad=20?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=20Android=2011=20=E5=AF=BC=E8=87=B4=E6=B5=AE?=
 =?UTF-8?q?=E7=AA=97=E6=9D=83=E9=99=90=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/AndroidManifest.xml              |  1 +
 .../com/mogo/module/main/MainActivity.java    | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/modules/mogo-module-back/src/main/AndroidManifest.xml b/modules/mogo-module-back/src/main/AndroidManifest.xml
index a0a69cfe71..13527da152 100644
--- a/modules/mogo-module-back/src/main/AndroidManifest.xml
+++ b/modules/mogo-module-back/src/main/AndroidManifest.xml
@@ -3,4 +3,5 @@
     <uses-permission android:name="android.permission.ACTION_MANAGE_OVERLAY_PERMISSION" />
     <uses-permission android:name="android.permission.TYPE_APPLICATION_OVERLAY" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <uses-permission android:name="android.permission.SYSTEM_OVERLAY_WINDOW"/>
 </manifest>
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
index ac9d56cce8..bdac502fa0 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
@@ -8,6 +8,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.widget.FrameLayout;
@@ -143,11 +144,13 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
         }
         //申请悬浮窗权限
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            if(Settings.canDrawOverlays(this)){
+            // 检查是否有悬浮窗权限
+            if (Settings.canDrawOverlays(this)) {
                 return;
             }
-            Intent intent=new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION);
-            startActivityForResult(intent, REQUEST_CODE_DIALOG);
+//            Intent intent=new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION);
+//            startActivityForResult(intent, REQUEST_CODE_DIALOG);
+            openAppDetails("显示悬浮窗");
         }
     }
 
@@ -465,7 +468,7 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
             } else {
                 // 弹出对话框告诉用户需要权限的原因, 并引导用户去应用权限管理中手动打开权限按钮
                 if (!isFirst) {
-                    openAppDetails();
+                    openAppDetails(null);
                     isFirst = true;
                 }
             }
@@ -475,9 +478,13 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
     /**
      * 打开APP的详情设置
      */
-    private void openAppDetails() {
+    private void openAppDetails(String msg) {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setMessage("请在 “应用信息 -> 权限” 中授予权限");
+        if (TextUtils.isEmpty(msg)) {
+            builder.setMessage("请在 “应用信息 -> 权限” 中授予权限");
+        } else {
+            builder.setMessage("请在 “应用信息 -> 权限” 中授予【" + msg + "】权限");
+        }
         builder.setPositiveButton("手动授权", new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {