From b907f1c76a7631b076a32bd2a90d8be138e8368b Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 03 十二月 2020 20:45:11 +0800
Subject: [PATCH] 0312 刘海屏统一减80宽度
---
ChannelDiff/Android/qkbtgame/AndroidManifest.xml | 2 +-
Project/qkbt_sdk/src/main/java/com/secondworld/universalsdk/MainActivity.java | 5 +++++
Project/qkbt_sdk/build.gradle | 6 +++---
ChannelDiff/Android/qkbtgame/libs/qkbt_sdk-game_qk-release.aar | 0
Project/qk_sdk/build.gradle | 2 +-
5 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ChannelDiff/Android/qkbtgame/AndroidManifest.xml b/ChannelDiff/Android/qkbtgame/AndroidManifest.xml
index ae04649..466bdd2 100644
--- a/ChannelDiff/Android/qkbtgame/AndroidManifest.xml
+++ b/ChannelDiff/Android/qkbtgame/AndroidManifest.xml
@@ -7,7 +7,7 @@
android:versionName="1.0" >
<uses-sdk
- android:minSdkVersion="17"
+ android:minSdkVersion="18"
android:targetSdkVersion="26" />
<uses-permission android:name="android.permission.INTERNET" />
diff --git a/ChannelDiff/Android/qkbtgame/libs/qkbt_sdk-game_qk-release.aar b/ChannelDiff/Android/qkbtgame/libs/qkbt_sdk-game_qk-release.aar
index 9b9e679..9947fb0 100644
--- a/ChannelDiff/Android/qkbtgame/libs/qkbt_sdk-game_qk-release.aar
+++ b/ChannelDiff/Android/qkbtgame/libs/qkbt_sdk-game_qk-release.aar
Binary files differ
diff --git a/Project/qk_sdk/build.gradle b/Project/qk_sdk/build.gradle
index 1521cb2..8de6c95 100644
--- a/Project/qk_sdk/build.gradle
+++ b/Project/qk_sdk/build.gradle
@@ -6,7 +6,7 @@
defaultConfig {
- minSdkVersion 16
+ minSdkVersion 17
targetSdkVersion 26
versionCode 1
versionName "1.0"
diff --git a/Project/qkbt_sdk/build.gradle b/Project/qkbt_sdk/build.gradle
index e4d5b10..7f0ecd3 100644
--- a/Project/qkbt_sdk/build.gradle
+++ b/Project/qkbt_sdk/build.gradle
@@ -6,7 +6,7 @@
defaultConfig {
- minSdkVersion 17
+ minSdkVersion 18
targetSdkVersion 26
versionCode 1
versionName "1.0"
@@ -58,12 +58,12 @@
dependsOn 'assembleGame_qkRelease'
from zipTree("build/outputs/aar/qkbt_sdk-game_qk-release.aar")
include "AndroidManifest.xml"
- into "C:\\Unity3D_SDK\\ChannelDiff\\Android\\qkbtgame\\"
+ into "D:\\u3dpro\\U3DRepository\\ChannelDiff\\Android\\qkbtgame\\"
}
task autoCopy_qkbtgame(type: Copy) {
dependsOn autoCopy_qkbtgame_Manifest
from "build/outputs/aar/"
include "qkbt_sdk-game_qk-release.aar"
- into "C:\\Unity3D_SDK\\ChannelDiff\\Android\\qkbtgame\\libs\\"
+ into "D:\\u3dpro\\U3DRepository\\ChannelDiff\\Android\\qkbtgame\\libs\\"
}
diff --git a/Project/qkbt_sdk/src/main/java/com/secondworld/universalsdk/MainActivity.java b/Project/qkbt_sdk/src/main/java/com/secondworld/universalsdk/MainActivity.java
index 9ec4feb..fe53d58 100644
--- a/Project/qkbt_sdk/src/main/java/com/secondworld/universalsdk/MainActivity.java
+++ b/Project/qkbt_sdk/src/main/java/com/secondworld/universalsdk/MainActivity.java
@@ -113,6 +113,11 @@
this.getWindowManager().getDefaultDisplay().getRealMetrics(dm);
if(gameWidth == 0){
gameWidth = dm.widthPixels;
+ if (isNotch)
+ {
+ //鍒樻捣灞忓噺涓�浜�
+ gameWidth = dm.widthPixels - 80;
+ }
}
if(gameHeight == 0)
--
Gitblit v1.8.0