From 176348f8379b89d689716f8dbba68079b537c553 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 29 四月 2021 21:23:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/U3DRepository
---
Project/qk_sdk/src/main/java/com/secondworld/universalsdk/MainActivity.java | 118 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 71 insertions(+), 47 deletions(-)
diff --git a/Project/qk_sdk/src/main/java/com/secondworld/universalsdk/MainActivity.java b/Project/qk_sdk/src/main/java/com/secondworld/universalsdk/MainActivity.java
index 587427c..c5e9d26 100644
--- a/Project/qk_sdk/src/main/java/com/secondworld/universalsdk/MainActivity.java
+++ b/Project/qk_sdk/src/main/java/com/secondworld/universalsdk/MainActivity.java
@@ -12,6 +12,7 @@
import android.provider.Settings;
import android.support.annotation.NonNull;
import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
import android.support.v4.content.PermissionChecker;
import android.util.Log;
import android.view.KeyEvent;
@@ -82,7 +83,27 @@
View unityView = mUnityPlayer.getView();
_frameLayout.addView(unityView);
- H2EngineSDK.onCreate(this, savedInstanceState);
+ //H2EngineSDK.onCreate(this, savedInstanceState);
+
+ Sdk.getInstance().onCreate(this);
+ try {
+ // check鏉冮檺
+ if ((ContextCompat.checkSelfPermission(this,
+ Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED)
+ || (ContextCompat.checkSelfPermission(this,
+ Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED)) {
+ // 娌℃湁 锛� 鐢宠鏉冮檺 鏉冮檺鏁扮粍
+ ActivityCompat.requestPermissions(this, new String[] {
+ Manifest.permission.READ_PHONE_STATE, Manifest.permission.WRITE_EXTERNAL_STORAGE }, 1);
+ } else {
+ QuickPlatformUtil.getInstance().onCreate();
+ Sdk.getInstance().init(this,"96065423134516611008224414549989", "69623854");
+ }
+ } catch (Exception e) {
+ QuickPlatformUtil.getInstance().onCreate();
+ Sdk.getInstance().init(this, "96065423134516611008224414549989", "69623854");
+ }
+ QuickSDK.getInstance().setIsLandScape(true);
}
@Override
@@ -117,7 +138,7 @@
// 鐢宠鎴愬姛
QuickPlatformUtil.getInstance().onCreate();
if (!QuickPlatformUtil.getInstance().isInited) {
- Sdk.getInstance().init(this, "88049844578484520615487574815873", "82414864");
+ Sdk.getInstance().init(this, "96065423134516611008224414549989", "69623854");
}
} else {
// 澶辫触 杩欓噷閫昏緫浠ユ父鎴忎负鍑� 杩欓噷鍙槸妯℃嫙鐢宠澶辫触 閫�鍑烘父鎴� cp鏂瑰彲鏀逛负缁х画鐢宠 鎴栬�呭叾浠栭�昏緫
@@ -140,7 +161,7 @@
intent.setData(uri);
startActivityForResult(intent, REQUEST_RECORD_PERMISSION_SETTING);
QuickPlatformUtil.getInstance().onCreate();
- Sdk.getInstance().init(UnityPlayer.currentActivity, "88049844578484520615487574815873", "82414864");
+ Sdk.getInstance().init(UnityPlayer.currentActivity, "96065423134516611008224414549989", "69623854");
}
});
normalDialog.setNegativeButton("鍏抽棴", new DialogInterface.OnClickListener() {
@@ -148,7 +169,7 @@
public void onClick(DialogInterface dialog, int which) {
Toast.makeText(UnityPlayer.currentActivity, "鏉冮檺琚嫆缁�", Toast.LENGTH_SHORT).show();
QuickPlatformUtil.getInstance().onCreate();
- Sdk.getInstance().init(UnityPlayer.currentActivity, "88049844578484520615487574815873", "82414864");
+ Sdk.getInstance().init(UnityPlayer.currentActivity, "96065423134516611008224414549989", "69623854");
}
});
// 鏄剧ず
@@ -197,48 +218,48 @@
super.onResume();
// 妫�娴嬫湰鍦板瓨鍌ㄦ潈闄愭槸鍚︽湁, 娌℃湁鐨勮瘽瑕佹彁绀虹敤鎴�
- if (PermissionChecker.checkPermission(this,
- Manifest.permission.WRITE_EXTERNAL_STORAGE,
- Process.myPid(), Process.myUid(),
- getPackageName()) != PackageManager.PERMISSION_GRANTED
- || PermissionChecker.checkPermission(this,
- Manifest.permission.READ_EXTERNAL_STORAGE,
- Process.myPid(), Process.myUid(),
- getPackageName()) != PackageManager.PERMISSION_GRANTED)
- {
- new AlertDialog.Builder(this)
- .setMessage("搴旂敤娌℃湁瀛樺偍璇诲彇鏉冮檺,鐐瑰嚮纭畾鑷宠缃腑寮�鍚�,鍚﹀垯鏃犳硶缁х画娓告垙.")
- .setCancelable(false)
- .setPositiveButton("纭畾",
- new DialogInterface.OnClickListener()
- {
- @Override
- public void onClick(DialogInterface dialogInterface,
- int i)
- {
- UniversalUtil.hasGoToSetting = true;
- Intent intent = new Intent(
- Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
- intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- Uri uri = Uri.fromParts("package",
- getPackageName(),
- null);
- intent.setData(uri);
- startActivity(intent);
- }
- })
- .setNegativeButton("鎷掔粷",
- new DialogInterface.OnClickListener()
- {
- @Override
- public void onClick(DialogInterface dialogInterface,
- int i)
- {
- finish();
- }
- })
- .show();
- }
+// if (PermissionChecker.checkPermission(this,
+// Manifest.permission.WRITE_EXTERNAL_STORAGE,
+// Process.myPid(), Process.myUid(),
+// getPackageName()) != PackageManager.PERMISSION_GRANTED
+// || PermissionChecker.checkPermission(this,
+// Manifest.permission.READ_EXTERNAL_STORAGE,
+// Process.myPid(), Process.myUid(),
+// getPackageName()) != PackageManager.PERMISSION_GRANTED)
+// {
+// new AlertDialog.Builder(this)
+// .setMessage("搴旂敤娌℃湁瀛樺偍璇诲彇鏉冮檺,鐐瑰嚮纭畾鑷宠缃腑寮�鍚�,鍚﹀垯鏃犳硶缁х画娓告垙.")
+// .setCancelable(false)
+// .setPositiveButton("纭畾",
+// new DialogInterface.OnClickListener()
+// {
+// @Override
+// public void onClick(DialogInterface dialogInterface,
+// int i)
+// {
+// UniversalUtil.hasGoToSetting = true;
+// Intent intent = new Intent(
+// Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+// intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+// Uri uri = Uri.fromParts("package",
+// getPackageName(),
+// null);
+// intent.setData(uri);
+// startActivity(intent);
+// }
+// })
+// .setNegativeButton("鎷掔粷",
+// new DialogInterface.OnClickListener()
+// {
+// @Override
+// public void onClick(DialogInterface dialogInterface,
+// int i)
+// {
+// finish();
+// }
+// })
+// .show();
+// }
}
@Override
@@ -275,7 +296,8 @@
{
if(QuickSDK.getInstance().isShowExitDialog()){
Sdk.getInstance().exit(this);
- }else{
+ }
+ else{
// 娓告垙璋冪敤鑷韩鐨勯��鍑哄璇濇锛岀偣鍑荤‘瀹氬悗锛岃皟鐢╭uick鐨別xit鎺ュ彛
new AlertDialog.Builder(MainActivity.this).setTitle("閫�鍑�").setMessage("鏄惁閫�鍑烘父鎴�?").setPositiveButton("纭畾", new DialogInterface.OnClickListener() {
@Override
@@ -287,4 +309,6 @@
}
return super.onKeyDown(i, keyEvent);
}
+
+
}
--
Gitblit v1.8.0