From fff1f19a381e6ad295cb3e7bd41cce48e74fbeea Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 04 九月 2018 11:45:30 +0800
Subject: [PATCH] update 猫耳SDK加入; 渠道差异逻辑细化
---
Project/app/src/main/java/com/secondworld/univeralsdk/MainActivity.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/Project/app/src/main/java/com/secondworld/univeralsdk/MainActivity.java b/Project/app/src/main/java/com/secondworld/univeralsdk/MainActivity.java
index 6a82c9b..786d5ef 100644
--- a/Project/app/src/main/java/com/secondworld/univeralsdk/MainActivity.java
+++ b/Project/app/src/main/java/com/secondworld/univeralsdk/MainActivity.java
@@ -19,7 +19,7 @@
public class MainActivity extends UnityPlayerActivity
{
private static final String TAG = "MainActivity";
-
+ public static boolean isForeground = false;
// 鍚敤6.0浠ヤ笂鏉冮檺鍥炶皟code
// private static final int CODE_REQUEST_PERMISSION = 1000;
@@ -37,16 +37,22 @@
View unityView = mUnityPlayer.getView();
_frameLayout.addView(unityView);
- H2EngineSDK.onCreate(savedInstanceState);
+ H2EngineSDK.onCreate(this, savedInstanceState);
}
@Override
protected void onNewIntent(Intent intent)
{
- H2EngineSDK.onNewIntent(intent);
-
super.onNewIntent(intent);
+ H2EngineSDK.onNewIntent(this, intent);
LogUtil.i(TAG, "onNewIntent");
+ }
+
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, Intent data)
+ {
+ H2EngineSDK.onActivityResult(requestCode, resultCode, data, this);
+ super.onActivityResult(requestCode, resultCode, data);
}
@Override
@@ -70,6 +76,7 @@
@Override
protected void onStop()
{
+ isForeground = false;
H2EngineSDK.onStop(this);
super.onStop();
@@ -79,6 +86,7 @@
@Override
protected void onResume()
{
+ isForeground = true;
H2EngineSDK.onResume(this);
super.onResume();
@@ -89,10 +97,10 @@
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)
+ || PermissionChecker.checkPermission(this,
+ Manifest.permission.READ_EXTERNAL_STORAGE,
+ Process.myPid(), Process.myUid(),
+ getPackageName()) != PackageManager.PERMISSION_GRANTED)
{
new AlertDialog.Builder(this)
.setMessage("搴旂敤娌℃湁瀛樺偍璇诲彇鏉冮檺,鐐瑰嚮纭畾鑷宠缃腑寮�鍚�,鍚﹀垯鏃犳硶缁х画娓告垙.")
--
Gitblit v1.8.0