From 22f2d94e81e7f77df4a7a63b370a06a66dd1b93e Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 26 十月 2022 17:10:35 +0800
Subject: [PATCH] 0312 BT7sdk

---
 SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java |  108 +++++++++++++++++++++++++++++++-----------------------
 1 files changed, 62 insertions(+), 46 deletions(-)

diff --git a/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java b/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
index 127419f..5b74e1f 100644
--- a/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
+++ b/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
@@ -48,64 +48,80 @@
     int REQUEST_RECORD_PERMISSION_SETTING = 110;
 
     private boolean hasPermissions(Activity activity) {
-        return (ContextCompat.checkSelfPermission(activity,
-                Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED)
-                && (ContextCompat.checkSelfPermission(activity,
-                Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED);
+//        return (ContextCompat.checkSelfPermission(activity,
+//                Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED)
+//                && (ContextCompat.checkSelfPermission(activity,
+//                Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED);
+
+        return ContextCompat.checkSelfPermission(activity,
+                Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
     }
 
     public void requestPermissions(Activity activity) {
+//        try {
+//            // check鏉冮檺
+//            if (!hasPermissions(activity)) {
+//                // 娌℃湁鍒欑敵璇锋潈闄�
+//                ActivityCompat.requestPermissions(activity, new String[]{
+//                        Manifest.permission.WRITE_EXTERNAL_STORAGE}, RequestCode.QUICK);
+//            } else {
+//                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.WRITE_EXTERNAL_STORAGE}, RequestCode.QUICK);
+//        }
+//        ActivityCompat.requestPermissions(activity, new String[]{
+//                        Manifest.permission.WRITE_EXTERNAL_STORAGE}, RequestCode.QUICK);
         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);
-            }
-        } catch (Exception e) {
-            //QuickSdkMgr.I.init(activity);
-            ActivityCompat.requestPermissions(activity, new String[]{
-                    Manifest.permission.READ_PHONE_STATE, Manifest.permission.WRITE_EXTERNAL_STORAGE}, RequestCode.QUICK);
+            QuickSdkMgr.I.register(PlatformDiff.I.platformProductCode(), PlatformDiff.I.platformProductKey());
+            QuickSdkMgr.I.init(activity);
+        }
+        catch (Exception e) {
+            LogUtil.i("SdkManager", "requestPermissions 鍒濆鍖朣DK澶辫触");
         }
     }
 
     public void onRequestPermissionsResult(Activity activity, int requestCode, int[] grantResults) {
         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) {
-//        if (requestCode == REQUEST_RECORD_PERMISSION_SETTING)
-//            requestPermissions(activity);
+        if (requestCode == REQUEST_RECORD_PERMISSION_SETTING)
+        {
+            LogUtil.i("SdkManager", "onActivityResult");
+            requestPermissions(activity);
+        }
+
     }
 
     public void init(Activity activity) {

--
Gitblit v1.8.0