From 0f720197c208158d13ba2bb7da49fdde4dceb1a7 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 25 七月 2022 11:45:28 +0800
Subject: [PATCH] 0312 权限申请

---
 Channel/Android/x7bt5/debug/libs/library-debug-x7bt5.aar          |    0 
 Channel/Android/x7bt5/release/libs/library-release-x7bt5.aar      |    0 
 SdkProject/plugins/x7sm/java/com/secondworld/sdk/QuickSdkMgr.java |   77 ++++++++++++++++++++------------------
 3 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/Channel/Android/x7bt5/debug/libs/library-debug-x7bt5.aar b/Channel/Android/x7bt5/debug/libs/library-debug-x7bt5.aar
index 5b0f7c3..7a42d74 100644
--- a/Channel/Android/x7bt5/debug/libs/library-debug-x7bt5.aar
+++ b/Channel/Android/x7bt5/debug/libs/library-debug-x7bt5.aar
Binary files differ
diff --git a/Channel/Android/x7bt5/release/libs/library-release-x7bt5.aar b/Channel/Android/x7bt5/release/libs/library-release-x7bt5.aar
index c9eb607..9458a27 100644
--- a/Channel/Android/x7bt5/release/libs/library-release-x7bt5.aar
+++ b/Channel/Android/x7bt5/release/libs/library-release-x7bt5.aar
Binary files differ
diff --git a/SdkProject/plugins/x7sm/java/com/secondworld/sdk/QuickSdkMgr.java b/SdkProject/plugins/x7sm/java/com/secondworld/sdk/QuickSdkMgr.java
index 42b11c5..d54f6cf 100644
--- a/SdkProject/plugins/x7sm/java/com/secondworld/sdk/QuickSdkMgr.java
+++ b/SdkProject/plugins/x7sm/java/com/secondworld/sdk/QuickSdkMgr.java
@@ -47,50 +47,53 @@
     public void requestPermissions(Activity activity) {
         try {
             // check鏉冮檺
-            if (!hasPermissions(activity)) {
-                // 娌℃湁鍒欑敵璇锋潈闄�
-                ActivityCompat.requestPermissions(activity, new String[]{
-                        Manifest.permission.READ_PHONE_STATE, Manifest.permission.WRITE_EXTERNAL_STORAGE}, RequestCode.QUICK);
-            } else {
-                QuickSdkMgr.I.register(PlatformDiff.I.platformProductCode(), PlatformDiff.I.platformProductKey());
-                QuickSdkMgr.I.init(activity);
-            }
+//            if (!hasPermissions(activity)) {
+//                // 娌℃湁鍒欑敵璇锋潈闄�
+//                ActivityCompat.requestPermissions(activity, new String[]{
+//                        Manifest.permission.READ_PHONE_STATE, Manifest.permission.WRITE_EXTERNAL_STORAGE}, RequestCode.QUICK);
+//            } else {
+//                QuickSdkMgr.I.register(PlatformDiff.I.platformProductCode(), PlatformDiff.I.platformProductKey());
+//                QuickSdkMgr.I.init(activity);
+//            }
+            QuickSdkMgr.I.register(PlatformDiff.I.platformProductCode(), PlatformDiff.I.platformProductKey());
+            QuickSdkMgr.I.init(activity);
         } catch (Exception e) {
             //QuickSdkMgr.I.init(activity);
-            ActivityCompat.requestPermissions(activity, new String[]{
-                    Manifest.permission.READ_PHONE_STATE, Manifest.permission.WRITE_EXTERNAL_STORAGE}, RequestCode.QUICK);
+//            ActivityCompat.requestPermissions(activity, new String[]{
+//                    Manifest.permission.READ_PHONE_STATE, Manifest.permission.WRITE_EXTERNAL_STORAGE}, RequestCode.QUICK);
         }
     }
 
     public void onRequestPermissionsResult(Activity activity, int requestCode, int[] grantResults) {
+        LogUtil.e("onRequestPermissionsResult",String.format("%d-%d", requestCode, grantResults[0]));
         if (requestCode != RequestCode.QUICK) return;
-        if (hasPermissions(activity)) {
-            //鐢宠鎴愬姛
-            QuickSdkMgr.I.register(PlatformDiff.I.platformProductCode(), PlatformDiff.I.platformProductKey());
-            QuickSdkMgr.I.init(activity);
-            return;
-        }
-        final AlertDialog.Builder normalDialog = new AlertDialog.Builder(activity);
-        normalDialog.setTitle("鏉冮檺璁剧疆");
-        normalDialog.setMessage("娓告垙闇�瑕侀儴鍒嗘潈闄愭墠鑳芥甯歌繍琛岋紝璇峰墠寰�璁剧疆涓墦寮�鐢佃瘽鏉冮檺涓庡瓨鍌ㄦ潈闄�");
-        normalDialog.setPositiveButton("鍓嶅線璁剧疆", new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-                Uri uri = Uri.fromParts("package", activity.getPackageName(), null);
-                intent.setData(uri);
-                activity.startActivityForResult(intent, REQUEST_RECORD_PERMISSION_SETTING);
-                dialog.dismiss();
-            }
-        });
-        normalDialog.setNegativeButton("閫�鍑�", new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                GameAppProxy.appExit();
-            }
-        });
-        // 鏄剧ず
-        normalDialog.show();
+//        if (hasPermissions(activity)) {
+//            //鐢宠鎴愬姛
+//            QuickSdkMgr.I.register(PlatformDiff.I.platformProductCode(), PlatformDiff.I.platformProductKey());
+//            QuickSdkMgr.I.init(activity);
+//            return;
+//        }
+//        final AlertDialog.Builder normalDialog = new AlertDialog.Builder(activity);
+//        normalDialog.setTitle("鏉冮檺璁剧疆");
+//        normalDialog.setMessage("娓告垙闇�瑕侀儴鍒嗘潈闄愭墠鑳芥甯歌繍琛岋紝璇峰墠寰�璁剧疆涓墦寮�鐢佃瘽鏉冮檺涓庡瓨鍌ㄦ潈闄�");
+//        normalDialog.setPositiveButton("鍓嶅線璁剧疆", new DialogInterface.OnClickListener() {
+//            @Override
+//            public void onClick(DialogInterface dialog, int which) {
+//                Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+//                Uri uri = Uri.fromParts("package", activity.getPackageName(), null);
+//                intent.setData(uri);
+//                activity.startActivityForResult(intent, REQUEST_RECORD_PERMISSION_SETTING);
+//                dialog.dismiss();
+//            }
+//        });
+//        normalDialog.setNegativeButton("閫�鍑�", new DialogInterface.OnClickListener() {
+//            @Override
+//            public void onClick(DialogInterface dialog, int which) {
+//                GameAppProxy.appExit();
+//            }
+//        });
+//        // 鏄剧ず
+//        normalDialog.show();
     }
 
     public void onActivityResult(Activity activity, int requestCode) {

--
Gitblit v1.8.0