From c1317cc4eb6f3fbabae40253aae92af93c669b1a Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期日, 30 九月 2018 16:49:25 +0800
Subject: [PATCH] Fixed AndroidSDK针对刘海屏适配修改
---
Project/mr_sdk/src/main/AndroidManifest.xml | 8 +-
ChannelDiff/Android/813015059/libs/app-game_813015059-release.aar | 0
ChannelDiff/Android/822055139/libs/app-game_822055139-release.aar | 0
ChannelDiff/Android/815035853/libs/app-game_815035853-release.aar | 0
Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/NotchPhoneUtil.java | 4 -
ChannelDiff/Android/226114725/AndroidManifest.xml | 9 +-
ChannelDiff/Android/226114725/libs/app-game_226114725-release.aar | 0
Project/js_sdk/src/main/java/com/secondworld/univeralsdk/MainActivity.java | 18 ++--
ChannelDiff/Android/spxjgame/AndroidManifest.xml | 9 +-
ChannelDiff/Android/813015059/AndroidManifest.xml | 9 +-
Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/UniversalUtil.java | 26 ++++++
ChannelDiff/Android/815035853/AndroidManifest.xml | 9 +-
ChannelDiff/Android/spxjgame/libs/sp_sdk-game_spxjgame-release.aar | 0
Project/sp_sdk/src/main/java/com/secondworld/univeralsdk/MainActivity.java | 18 ++--
ChannelDiff/Android/mrgame/AndroidManifest.xml | 9 +-
ChannelDiff/Android/mrgame/libs/mr_sdk-game_mrgame-release.aar | 0
Project/sp_sdk/src/main/AndroidManifest.xml | 8 +-
Project/app/src/main/java/com/secondworld/univeralsdk/MainActivity.java | 18 ++--
Project/js_sdk/src/main/AndroidManifest.xml | 8 +-
ChannelDiff/Android/822055139/AndroidManifest.xml | 9 +-
Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/MainActivity.java | 14 ++-
Project/app/src/main/AndroidManifest.xml | 8 +-
22 files changed, 103 insertions(+), 81 deletions(-)
diff --git a/ChannelDiff/Android/226114725/AndroidManifest.xml b/ChannelDiff/Android/226114725/AndroidManifest.xml
index 5b267ad..ce80d04 100644
--- a/ChannelDiff/Android/226114725/AndroidManifest.xml
+++ b/ChannelDiff/Android/226114725/AndroidManifest.xml
@@ -243,13 +243,12 @@
android:value="1075838976.000000" />
<meta-data
android:name="com.samsung.android.keepalive.density"
- android:value="true" />
- <meta-data
- android:name="android.notch_support"
- android:value="true" />
+ android:value="true" /> <!-- <meta-data -->
+ <!-- android:name="android.notch_support" -->
+ <!-- android:value="true" /> -->
<meta-data
android:name="notch.config"
- android:value="portrait|landscape" />
+ android:value="none" />
<meta-data
android:name="android.vendor.full_screen"
android:value="true" />
diff --git a/ChannelDiff/Android/226114725/libs/app-game_226114725-release.aar b/ChannelDiff/Android/226114725/libs/app-game_226114725-release.aar
index 4a87fc6..2ba046f 100644
--- a/ChannelDiff/Android/226114725/libs/app-game_226114725-release.aar
+++ b/ChannelDiff/Android/226114725/libs/app-game_226114725-release.aar
Binary files differ
diff --git a/ChannelDiff/Android/813015059/AndroidManifest.xml b/ChannelDiff/Android/813015059/AndroidManifest.xml
index 3227bbb..aebf1e7 100644
--- a/ChannelDiff/Android/813015059/AndroidManifest.xml
+++ b/ChannelDiff/Android/813015059/AndroidManifest.xml
@@ -243,13 +243,12 @@
android:value="1075838976.000000" />
<meta-data
android:name="com.samsung.android.keepalive.density"
- android:value="true" />
- <meta-data
- android:name="android.notch_support"
- android:value="true" />
+ android:value="true" /> <!-- <meta-data -->
+ <!-- android:name="android.notch_support" -->
+ <!-- android:value="true" /> -->
<meta-data
android:name="notch.config"
- android:value="portrait|landscape" />
+ android:value="none" />
<meta-data
android:name="android.vendor.full_screen"
android:value="true" />
diff --git a/ChannelDiff/Android/813015059/libs/app-game_813015059-release.aar b/ChannelDiff/Android/813015059/libs/app-game_813015059-release.aar
index 947ec9f..c6b4e2d 100644
--- a/ChannelDiff/Android/813015059/libs/app-game_813015059-release.aar
+++ b/ChannelDiff/Android/813015059/libs/app-game_813015059-release.aar
Binary files differ
diff --git a/ChannelDiff/Android/815035853/AndroidManifest.xml b/ChannelDiff/Android/815035853/AndroidManifest.xml
index 3984372..af9abef 100644
--- a/ChannelDiff/Android/815035853/AndroidManifest.xml
+++ b/ChannelDiff/Android/815035853/AndroidManifest.xml
@@ -243,13 +243,12 @@
android:value="1075838976.000000" />
<meta-data
android:name="com.samsung.android.keepalive.density"
- android:value="true" />
- <meta-data
- android:name="android.notch_support"
- android:value="true" />
+ android:value="true" /> <!-- <meta-data -->
+ <!-- android:name="android.notch_support" -->
+ <!-- android:value="true" /> -->
<meta-data
android:name="notch.config"
- android:value="portrait|landscape" />
+ android:value="none" />
<meta-data
android:name="android.vendor.full_screen"
android:value="true" />
diff --git a/ChannelDiff/Android/815035853/libs/app-game_815035853-release.aar b/ChannelDiff/Android/815035853/libs/app-game_815035853-release.aar
index 36c29be..fe1715c 100644
--- a/ChannelDiff/Android/815035853/libs/app-game_815035853-release.aar
+++ b/ChannelDiff/Android/815035853/libs/app-game_815035853-release.aar
Binary files differ
diff --git a/ChannelDiff/Android/822055139/AndroidManifest.xml b/ChannelDiff/Android/822055139/AndroidManifest.xml
index 6dd5fc1..e1081a3 100644
--- a/ChannelDiff/Android/822055139/AndroidManifest.xml
+++ b/ChannelDiff/Android/822055139/AndroidManifest.xml
@@ -254,13 +254,12 @@
android:value="1075838976.000000" />
<meta-data
android:name="com.samsung.android.keepalive.density"
- android:value="true" />
- <meta-data
- android:name="android.notch_support"
- android:value="true" />
+ android:value="true" /> <!-- <meta-data -->
+ <!-- android:name="android.notch_support" -->
+ <!-- android:value="true" /> -->
<meta-data
android:name="notch.config"
- android:value="portrait|landscape" />
+ android:value="none" />
<meta-data
android:name="android.vendor.full_screen"
android:value="true" />
diff --git a/ChannelDiff/Android/822055139/libs/app-game_822055139-release.aar b/ChannelDiff/Android/822055139/libs/app-game_822055139-release.aar
index 6f02189..4f6c128 100644
--- a/ChannelDiff/Android/822055139/libs/app-game_822055139-release.aar
+++ b/ChannelDiff/Android/822055139/libs/app-game_822055139-release.aar
Binary files differ
diff --git a/ChannelDiff/Android/mrgame/AndroidManifest.xml b/ChannelDiff/Android/mrgame/AndroidManifest.xml
index e8e7b98..4d7d4a2 100644
--- a/ChannelDiff/Android/mrgame/AndroidManifest.xml
+++ b/ChannelDiff/Android/mrgame/AndroidManifest.xml
@@ -238,13 +238,12 @@
android:value="1075838976.000000" />
<meta-data
android:name="com.samsung.android.keepalive.density"
- android:value="true" />
- <meta-data
- android:name="android.notch_support"
- android:value="true" />
+ android:value="true" /> <!-- <meta-data -->
+ <!-- android:name="android.notch_support" -->
+ <!-- android:value="true" /> -->
<meta-data
android:name="notch.config"
- android:value="portrait|landscape" />
+ android:value="none" />
<meta-data
android:name="android.vendor.full_screen"
android:value="true" />
diff --git a/ChannelDiff/Android/mrgame/libs/mr_sdk-game_mrgame-release.aar b/ChannelDiff/Android/mrgame/libs/mr_sdk-game_mrgame-release.aar
index ffd0d84..055c0ef 100644
--- a/ChannelDiff/Android/mrgame/libs/mr_sdk-game_mrgame-release.aar
+++ b/ChannelDiff/Android/mrgame/libs/mr_sdk-game_mrgame-release.aar
Binary files differ
diff --git a/ChannelDiff/Android/spxjgame/AndroidManifest.xml b/ChannelDiff/Android/spxjgame/AndroidManifest.xml
index eb01790..c74bed9 100644
--- a/ChannelDiff/Android/spxjgame/AndroidManifest.xml
+++ b/ChannelDiff/Android/spxjgame/AndroidManifest.xml
@@ -254,13 +254,12 @@
android:value="1075838976.000000" />
<meta-data
android:name="com.samsung.android.keepalive.density"
- android:value="true" />
- <meta-data
- android:name="android.notch_support"
- android:value="true" />
+ android:value="true" /> <!-- <meta-data -->
+ <!-- android:name="android.notch_support" -->
+ <!-- android:value="true" /> -->
<meta-data
android:name="notch.config"
- android:value="portrait|landscape" />
+ android:value="none" />
<meta-data
android:name="android.vendor.full_screen"
android:value="true" />
diff --git a/ChannelDiff/Android/spxjgame/libs/sp_sdk-game_spxjgame-release.aar b/ChannelDiff/Android/spxjgame/libs/sp_sdk-game_spxjgame-release.aar
index b6c21fa..9fd1568 100644
--- a/ChannelDiff/Android/spxjgame/libs/sp_sdk-game_spxjgame-release.aar
+++ b/ChannelDiff/Android/spxjgame/libs/sp_sdk-game_spxjgame-release.aar
Binary files differ
diff --git a/Project/app/src/main/AndroidManifest.xml b/Project/app/src/main/AndroidManifest.xml
index cb4fdd3..b5941f5 100644
--- a/Project/app/src/main/AndroidManifest.xml
+++ b/Project/app/src/main/AndroidManifest.xml
@@ -43,13 +43,13 @@
android:name="com.samsung.android.keepalive.density"
android:value="true" />
- <meta-data
- android:name="android.notch_support"
- android:value="true" />
+ <!--<meta-data-->
+ <!--android:name="android.notch_support"-->
+ <!--android:value="true" />-->
<meta-data
android:name="notch.config"
- android:value="portrait|landscape" />
+ android:value="none" />
<meta-data
android:name="android.vendor.full_screen"
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 aed6f2c..5552449 100644
--- a/Project/app/src/main/java/com/secondworld/univeralsdk/MainActivity.java
+++ b/Project/app/src/main/java/com/secondworld/univeralsdk/MainActivity.java
@@ -7,6 +7,7 @@
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.net.Uri;
+import android.os.Build;
import android.os.Bundle;
import android.os.Process;
import android.provider.Settings;
@@ -41,24 +42,25 @@
m_MainContainer = (RelativeLayout) findViewById(R.id.main_container);
String _brand = NotchPhoneUtil.getDeviceBrand();
- if (_brand.indexOf("vivo") >= 0)
+ if (_brand.toUpperCase().contains("VIVO"))
{
isNotch = NotchPhoneUtil.HasNotchVivo(MainActivity.this);
mType = 1;
}
- else if (_brand.indexOf("HUAWEI") >= 0)
+ else if (_brand.toUpperCase().contains("HUAWEI")
+ || _brand.toUpperCase().contains("HONOR"))
{
- isNotch = NotchPhoneUtil.HasNotchVivo(MainActivity.this);
- mType = 2;
+// isNotch = NotchPhoneUtil.hasNotchAtHuawei(this);;
+// mType = 2;
}
- else if (_brand.indexOf("OPPO") >= 0)
+ else if (_brand.toUpperCase().contains("OPPO"))
{
- isNotch = NotchPhoneUtil.HasNotchVivo(MainActivity.this);
+ isNotch = NotchPhoneUtil.HasNotchOPPO(MainActivity.this);
mType = 3;
}
- else if (_brand.indexOf("Xiaomi") >= 0)
+ else if (_brand.toUpperCase().contains("XIAOMI"))
{
- isNotch = NotchPhoneUtil.HasNotchVivo(MainActivity.this);
+ isNotch = NotchPhoneUtil.HasNotchXiaoMi();
mType = 4;
}
diff --git a/Project/js_sdk/src/main/AndroidManifest.xml b/Project/js_sdk/src/main/AndroidManifest.xml
index e7c1caa..8a457e6 100644
--- a/Project/js_sdk/src/main/AndroidManifest.xml
+++ b/Project/js_sdk/src/main/AndroidManifest.xml
@@ -43,13 +43,13 @@
android:name="com.samsung.android.keepalive.density"
android:value="true" />
- <meta-data
- android:name="android.notch_support"
- android:value="true" />
+ <!--<meta-data-->
+ <!--android:name="android.notch_support"-->
+ <!--android:value="true" />-->
<meta-data
android:name="notch.config"
- android:value="portrait|landscape" />
+ android:value="none" />
<meta-data
android:name="android.vendor.full_screen"
diff --git a/Project/js_sdk/src/main/java/com/secondworld/univeralsdk/MainActivity.java b/Project/js_sdk/src/main/java/com/secondworld/univeralsdk/MainActivity.java
index aed6f2c..5552449 100644
--- a/Project/js_sdk/src/main/java/com/secondworld/univeralsdk/MainActivity.java
+++ b/Project/js_sdk/src/main/java/com/secondworld/univeralsdk/MainActivity.java
@@ -7,6 +7,7 @@
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.net.Uri;
+import android.os.Build;
import android.os.Bundle;
import android.os.Process;
import android.provider.Settings;
@@ -41,24 +42,25 @@
m_MainContainer = (RelativeLayout) findViewById(R.id.main_container);
String _brand = NotchPhoneUtil.getDeviceBrand();
- if (_brand.indexOf("vivo") >= 0)
+ if (_brand.toUpperCase().contains("VIVO"))
{
isNotch = NotchPhoneUtil.HasNotchVivo(MainActivity.this);
mType = 1;
}
- else if (_brand.indexOf("HUAWEI") >= 0)
+ else if (_brand.toUpperCase().contains("HUAWEI")
+ || _brand.toUpperCase().contains("HONOR"))
{
- isNotch = NotchPhoneUtil.HasNotchVivo(MainActivity.this);
- mType = 2;
+// isNotch = NotchPhoneUtil.hasNotchAtHuawei(this);;
+// mType = 2;
}
- else if (_brand.indexOf("OPPO") >= 0)
+ else if (_brand.toUpperCase().contains("OPPO"))
{
- isNotch = NotchPhoneUtil.HasNotchVivo(MainActivity.this);
+ isNotch = NotchPhoneUtil.HasNotchOPPO(MainActivity.this);
mType = 3;
}
- else if (_brand.indexOf("Xiaomi") >= 0)
+ else if (_brand.toUpperCase().contains("XIAOMI"))
{
- isNotch = NotchPhoneUtil.HasNotchVivo(MainActivity.this);
+ isNotch = NotchPhoneUtil.HasNotchXiaoMi();
mType = 4;
}
diff --git a/Project/mr_sdk/src/main/AndroidManifest.xml b/Project/mr_sdk/src/main/AndroidManifest.xml
index cb4fdd3..b5941f5 100644
--- a/Project/mr_sdk/src/main/AndroidManifest.xml
+++ b/Project/mr_sdk/src/main/AndroidManifest.xml
@@ -43,13 +43,13 @@
android:name="com.samsung.android.keepalive.density"
android:value="true" />
- <meta-data
- android:name="android.notch_support"
- android:value="true" />
+ <!--<meta-data-->
+ <!--android:name="android.notch_support"-->
+ <!--android:value="true" />-->
<meta-data
android:name="notch.config"
- android:value="portrait|landscape" />
+ android:value="none" />
<meta-data
android:name="android.vendor.full_screen"
diff --git a/Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/MainActivity.java b/Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/MainActivity.java
index d416dda..5552449 100644
--- a/Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/MainActivity.java
+++ b/Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/MainActivity.java
@@ -7,6 +7,7 @@
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.net.Uri;
+import android.os.Build;
import android.os.Bundle;
import android.os.Process;
import android.provider.Settings;
@@ -41,22 +42,23 @@
m_MainContainer = (RelativeLayout) findViewById(R.id.main_container);
String _brand = NotchPhoneUtil.getDeviceBrand();
- if (_brand.indexOf("vivo") >= 0)
+ if (_brand.toUpperCase().contains("VIVO"))
{
isNotch = NotchPhoneUtil.HasNotchVivo(MainActivity.this);
mType = 1;
}
- else if (_brand.indexOf("HUAWEI") >= 0)
+ else if (_brand.toUpperCase().contains("HUAWEI")
+ || _brand.toUpperCase().contains("HONOR"))
{
- isNotch = NotchPhoneUtil.hasNotchAtHuawei(MainActivity.this);
- mType = 2;
+// isNotch = NotchPhoneUtil.hasNotchAtHuawei(this);;
+// mType = 2;
}
- else if (_brand.indexOf("OPPO") >= 0)
+ else if (_brand.toUpperCase().contains("OPPO"))
{
isNotch = NotchPhoneUtil.HasNotchOPPO(MainActivity.this);
mType = 3;
}
- else if (_brand.indexOf("Xiaomi") >= 0)
+ else if (_brand.toUpperCase().contains("XIAOMI"))
{
isNotch = NotchPhoneUtil.HasNotchXiaoMi();
mType = 4;
diff --git a/Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/NotchPhoneUtil.java b/Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/NotchPhoneUtil.java
index 51a355c..6dac465 100644
--- a/Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/NotchPhoneUtil.java
+++ b/Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/NotchPhoneUtil.java
@@ -197,7 +197,6 @@
lphuawei.leftMargin = 0;
lphuawei.rightMargin = 0;
viewGroup.setLayoutParams(lphuawei);
-
break;
case 3: //OPPO 鐩墠閮戒负 80px
FrameLayout.LayoutParams lpOppo = (FrameLayout.LayoutParams) viewGroup.getLayoutParams();
@@ -205,8 +204,6 @@
lpOppo.leftMargin = 0;
lpOppo.rightMargin = 0;
viewGroup.setLayoutParams(lpOppo);
-
-
break;
case 4: //Xiaomi
int sizeAtXiaomi = NotchPhoneUtil.getStatusBarHeight(activity);
@@ -215,7 +212,6 @@
lpXiaomi.leftMargin = 0;
lpXiaomi.rightMargin = 0;
viewGroup.setLayoutParams(lpXiaomi);
-
break;
}
diff --git a/Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/UniversalUtil.java b/Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/UniversalUtil.java
index 8b2a47c..e2aba0a 100644
--- a/Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/UniversalUtil.java
+++ b/Project/mr_sdk/src/main/java/com/secondworld/univeralsdk/UniversalUtil.java
@@ -24,6 +24,7 @@
import com.unity3d.player.UnityPlayer;
+import org.json.JSONException;
import org.json.JSONObject;
import java.io.BufferedReader;
@@ -81,6 +82,22 @@
JSONObject _jsonObject = new JSONObject(jsonMap);
+ UnityPlayer.UnitySendMessage(StaticDefine.UnityGameObjectName,
+ StaticDefine.UnityHandleFuncName,
+ _jsonObject.toString());
+ }
+
+ public static void sendDebugLogToUnity(String content)
+ {
+ JSONObject _jsonObject = new JSONObject();
+ try
+ {
+ _jsonObject.put("code", 6);
+ _jsonObject.put("info", content);
+ } catch (JSONException e)
+ {
+ e.printStackTrace();
+ }
UnityPlayer.UnitySendMessage(StaticDefine.UnityGameObjectName,
StaticDefine.UnityHandleFuncName,
_jsonObject.toString());
@@ -389,13 +406,20 @@
return -1;
}
- public static boolean isEmpty(String s) {
+ public static boolean isEmpty(String s)
+ {
if (null == s)
+ {
return true;
+ }
if (s.length() == 0)
+ {
return true;
+ }
if (s.trim().length() == 0)
+ {
return true;
+ }
return false;
}
}
diff --git a/Project/sp_sdk/src/main/AndroidManifest.xml b/Project/sp_sdk/src/main/AndroidManifest.xml
index c7988b1..38bf0d5 100644
--- a/Project/sp_sdk/src/main/AndroidManifest.xml
+++ b/Project/sp_sdk/src/main/AndroidManifest.xml
@@ -43,13 +43,13 @@
android:name="com.samsung.android.keepalive.density"
android:value="true" />
- <meta-data
- android:name="android.notch_support"
- android:value="true" />
+ <!--<meta-data-->
+ <!--android:name="android.notch_support"-->
+ <!--android:value="true" />-->
<meta-data
android:name="notch.config"
- android:value="portrait|landscape" />
+ android:value="none" />
<meta-data
android:name="android.vendor.full_screen"
diff --git a/Project/sp_sdk/src/main/java/com/secondworld/univeralsdk/MainActivity.java b/Project/sp_sdk/src/main/java/com/secondworld/univeralsdk/MainActivity.java
index aed6f2c..5552449 100644
--- a/Project/sp_sdk/src/main/java/com/secondworld/univeralsdk/MainActivity.java
+++ b/Project/sp_sdk/src/main/java/com/secondworld/univeralsdk/MainActivity.java
@@ -7,6 +7,7 @@
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.net.Uri;
+import android.os.Build;
import android.os.Bundle;
import android.os.Process;
import android.provider.Settings;
@@ -41,24 +42,25 @@
m_MainContainer = (RelativeLayout) findViewById(R.id.main_container);
String _brand = NotchPhoneUtil.getDeviceBrand();
- if (_brand.indexOf("vivo") >= 0)
+ if (_brand.toUpperCase().contains("VIVO"))
{
isNotch = NotchPhoneUtil.HasNotchVivo(MainActivity.this);
mType = 1;
}
- else if (_brand.indexOf("HUAWEI") >= 0)
+ else if (_brand.toUpperCase().contains("HUAWEI")
+ || _brand.toUpperCase().contains("HONOR"))
{
- isNotch = NotchPhoneUtil.HasNotchVivo(MainActivity.this);
- mType = 2;
+// isNotch = NotchPhoneUtil.hasNotchAtHuawei(this);;
+// mType = 2;
}
- else if (_brand.indexOf("OPPO") >= 0)
+ else if (_brand.toUpperCase().contains("OPPO"))
{
- isNotch = NotchPhoneUtil.HasNotchVivo(MainActivity.this);
+ isNotch = NotchPhoneUtil.HasNotchOPPO(MainActivity.this);
mType = 3;
}
- else if (_brand.indexOf("Xiaomi") >= 0)
+ else if (_brand.toUpperCase().contains("XIAOMI"))
{
- isNotch = NotchPhoneUtil.HasNotchVivo(MainActivity.this);
+ isNotch = NotchPhoneUtil.HasNotchXiaoMi();
mType = 4;
}
--
Gitblit v1.8.0