hch
2022-10-26 22f2d94e81e7f77df4a7a63b370a06a66dd1b93e
0312 BT7sdk
8个文件已修改
119 ■■■■■ 已修改文件
Channel/Android/qkbt7game/debug/libs/library-debug-qkbt7game.aar 补丁 | 查看 | 原始文档 | blame | 历史
Channel/Android/qkbt7game/release/libs/library-release-qkbt7game.aar 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/channel/qkbt7game/AndroidManifest.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/channel/qkbt7game/java/com/secondworld/sdk/BtGameMain.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/channel/qkbt7game/java/com/secondworld/sdk/BtGamePlatform.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/gradle.properties 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/library/src/main/java/com/secondworld/sdk/command/CmdRequestPermissionStart.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java 108 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Channel/Android/qkbt7game/debug/libs/library-debug-qkbt7game.aar
Binary files differ
Channel/Android/qkbt7game/release/libs/library-release-qkbt7game.aar
Binary files differ
SdkProject/channel/qkbt7game/AndroidManifest.xml
@@ -8,7 +8,6 @@
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
SdkProject/channel/qkbt7game/java/com/secondworld/sdk/BtGameMain.java
@@ -9,12 +9,14 @@
import com.quicksdk.QuickSDK;
import com.quicksdk.Sdk;
import com.secondworld.sdk.utils.LogUtil;
public class BtGameMain extends GameActivityProxy {
    @Override
    public void onCreate(Activity activity) {
        super.onCreate(activity);
        LogUtil.i("SdkManager", "BtGameMain onCreate");
        QuickSdkMgr.I.requestPermissions(activity);
        //QuickSdkMgr.I.init(activity);
        com.quicksdk.Sdk.getInstance().onCreate(activity);
SdkProject/channel/qkbt7game/java/com/secondworld/sdk/BtGamePlatform.java
@@ -9,11 +9,11 @@
    @Override
    public  String platformProductCode()  {
        return "41515786846775763118330293702907";
        return "24741279556405026978672001418111";
    }
    @Override
    public  String platformProductKey() {
        return "16873632";
        return "68571376";
    }
}
SdkProject/gradle.properties
@@ -18,4 +18,4 @@
## Automatically convert third-party libraries to use AndroidX
android.enableJetifier=false
#当前构建的渠道名称
CHANNEL_NAME=x7bt5
CHANNEL_NAME=qkbt7game
SdkProject/library/src/main/java/com/secondworld/sdk/command/CmdRequestPermissionStart.java
@@ -4,6 +4,7 @@
import com.secondworld.sdk.PermissionManager;
import com.secondworld.sdk.QuickSdkMgr;
import com.secondworld.sdk.utils.CodeU2A;
import com.secondworld.sdk.utils.LogUtil;
import org.json.JSONException;
import org.json.JSONObject;
@@ -24,6 +25,7 @@
            @Override
            public void run()
            {
                LogUtil.i("SdkManager", "CmdRequestPermissionStart process");
                QuickSdkMgr.I.requestPermissions(GameActivityProxy.I.activity);
            }
        });
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 初始化SDK失败");
        }
    }
    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) {