From 3ff9f9aeb7d449380bbcaa4645b83ed1bb24b72d Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期六, 22 九月 2018 00:41:28 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/U3DRepository
---
Project/app/src/main/java/com/secondworld/univeralsdk/MainActivity.java | 72 ++++++++++++++++++++++++++++--------
1 files changed, 56 insertions(+), 16 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..aed6f2c 100644
--- a/Project/app/src/main/java/com/secondworld/univeralsdk/MainActivity.java
+++ b/Project/app/src/main/java/com/secondworld/univeralsdk/MainActivity.java
@@ -13,15 +13,20 @@
import android.support.v4.content.PermissionChecker;
import android.view.View;
import android.widget.FrameLayout;
+import android.widget.RelativeLayout;
import com.unity3d.player.UnityPlayerActivity;
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;
+
+ private RelativeLayout m_MainContainer;
+ private int mType;
+ private boolean isNotch = false;
@Override
protected void onCreate(Bundle savedInstanceState)
@@ -33,29 +38,68 @@
setContentView(R.layout.activity_main);
+ m_MainContainer = (RelativeLayout) findViewById(R.id.main_container);
+
+ String _brand = NotchPhoneUtil.getDeviceBrand();
+ if (_brand.indexOf("vivo") >= 0)
+ {
+ isNotch = NotchPhoneUtil.HasNotchVivo(MainActivity.this);
+ mType = 1;
+ }
+ else if (_brand.indexOf("HUAWEI") >= 0)
+ {
+ isNotch = NotchPhoneUtil.HasNotchVivo(MainActivity.this);
+ mType = 2;
+ }
+ else if (_brand.indexOf("OPPO") >= 0)
+ {
+ isNotch = NotchPhoneUtil.HasNotchVivo(MainActivity.this);
+ mType = 3;
+ }
+ else if (_brand.indexOf("Xiaomi") >= 0)
+ {
+ isNotch = NotchPhoneUtil.HasNotchVivo(MainActivity.this);
+ mType = 4;
+ }
+
+ NotchPhoneUtil.onConfigurationChanged(this, isNotch, mType, m_MainContainer);
+
FrameLayout _frameLayout = (FrameLayout) findViewById(R.id.unity_view);
View unityView = mUnityPlayer.getView();
_frameLayout.addView(unityView);
- H2EngineSDK.onCreate(savedInstanceState);
+ H2EngineSDK.onCreate(this, savedInstanceState);
+ }
+
+ @Override
+ public void onWindowFocusChanged(boolean b)
+ {
+ super.onWindowFocusChanged(b);
+ H2EngineSDK.onWindowFocusChanged(b);
}
@Override
protected void onNewIntent(Intent intent)
{
- H2EngineSDK.onNewIntent(intent);
-
super.onNewIntent(intent);
- LogUtil.i(TAG, "onNewIntent");
+ H2EngineSDK.onNewIntent(this, intent);
+ }
+
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, Intent data)
+ {
+ H2EngineSDK.onActivityResult(requestCode, resultCode, data, this);
+ super.onActivityResult(requestCode, resultCode, data);
}
@Override
public void onConfigurationChanged(Configuration newConfig)
{
+ NotchPhoneUtil.onConfigurationChanged(this, isNotch, mType, m_MainContainer);
+
H2EngineSDK.onConfigurationChanged(newConfig);
super.onConfigurationChanged(newConfig);
- LogUtil.i(TAG, "onConfigurationChanged");
}
@Override
@@ -64,35 +108,34 @@
H2EngineSDK.onStart(this);
super.onStart();
- LogUtil.i(TAG, "onStart");
}
@Override
protected void onStop()
{
+ isForeground = false;
H2EngineSDK.onStop(this);
super.onStop();
- LogUtil.i(TAG, "onStop");
}
@Override
protected void onResume()
{
+ isForeground = true;
H2EngineSDK.onResume(this);
super.onResume();
- LogUtil.i(TAG, "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)
+ || PermissionChecker.checkPermission(this,
+ Manifest.permission.READ_EXTERNAL_STORAGE,
+ Process.myPid(), Process.myUid(),
+ getPackageName()) != PackageManager.PERMISSION_GRANTED)
{
new AlertDialog.Builder(this)
.setMessage("搴旂敤娌℃湁瀛樺偍璇诲彇鏉冮檺,鐐瑰嚮纭畾鑷宠缃腑寮�鍚�,鍚﹀垯鏃犳硶缁х画娓告垙.")
@@ -135,7 +178,6 @@
H2EngineSDK.onPause(this);
super.onPause();
- LogUtil.i(TAG, "onPause");
}
@Override
@@ -144,7 +186,6 @@
H2EngineSDK.onDestroy(this);
super.onDestroy();
- LogUtil.i(TAG, "onDestroy");
}
@Override
@@ -153,7 +194,6 @@
H2EngineSDK.onRestart(this);
super.onRestart();
- LogUtil.i(TAG, "onRestart");
}
}
--
Gitblit v1.8.0