From 1be9ca982849b269201633979a1fb60408cefc57 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期六, 22 九月 2018 00:41:23 +0800
Subject: [PATCH] fixed gradle打包库修改
---
ChannelDiff/Android/822055139/libs/app-game_822055139-release.aar | 0
Project/app/src/game_822055139/AndroidManifest.xml | 4 ++--
Project/app/build.gradle | 18 +++++++++---------
ChannelDiff/Android/822055139/AndroidManifest.xml | 28 ++++++++++++++++++++++++++--
Project/app/src/main/AndroidManifest.xml | 4 ++--
5 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/ChannelDiff/Android/822055139/AndroidManifest.xml b/ChannelDiff/Android/822055139/AndroidManifest.xml
index dc1ed4b..6dd5fc1 100644
--- a/ChannelDiff/Android/822055139/AndroidManifest.xml
+++ b/ChannelDiff/Android/822055139/AndroidManifest.xml
@@ -46,8 +46,8 @@
android:name="com.secondworld.univeralsdk.MainActivity"
android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale|layoutDirection"
android:label="@string/app_name"
- android:launchMode="singleTop"
- android:screenOrientation="portrait" >
+ android:launchMode="singleTask"
+ android:screenOrientation="sensorLandscape" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -60,6 +60,15 @@
android:value="true" />
<meta-data
android:name="unityplayer.SkipPermissionsDialog"
+ android:value="true" />
+ <meta-data
+ android:name="android.vendor.home_indicator"
+ android:value="hide" />
+ <meta-data
+ android:name="android.max_aspect"
+ android:value="1075419520.000000" />
+ <meta-data
+ android:name="com.samsung.android.keepalive.density"
android:value="true" />
</activity>
@@ -240,6 +249,21 @@
<meta-data
android:name="JPUSH_APPKEY"
android:value="1c060648058afe0b5faf72ca" />
+ <meta-data
+ android:name="android.max_aspect"
+ 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" />
+ <meta-data
+ android:name="notch.config"
+ android:value="portrait|landscape" />
+ <meta-data
+ android:name="android.vendor.full_screen"
+ android:value="true" />
</application>
</manifest>
\ No newline at end of file
diff --git a/ChannelDiff/Android/822055139/libs/app-game_822055139-release.aar b/ChannelDiff/Android/822055139/libs/app-game_822055139-release.aar
index db6aaf4..2fdd53b 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/Project/app/build.gradle b/Project/app/build.gradle
index 6df76ab..b431fef 100644
--- a/Project/app/build.gradle
+++ b/Project/app/build.gradle
@@ -113,61 +113,61 @@
dependsOn 'assembleGame_815035853Release'
from zipTree("build/outputs/aar/app-game_815035853-release.aar")
include "AndroidManifest.xml"
- into "C:\\Unity3D_SDK\\ChannelDiff\\815035853\\"
+ into "C:\\Unity3D_SDK\\ChannelDiff\\Android\\815035853\\"
}
task autoCopy_815035853(type: Copy) {
dependsOn autoCopy_815035853_Manifest
from "build/outputs/aar/"
include "app-game_815035853-release.aar"
- into "C:\\Unity3D_SDK\\ChannelDiff\\815035853\\libs\\"
+ into "C:\\Unity3D_SDK\\ChannelDiff\\Android\\815035853\\libs\\"
}
task autoCopy_226114725_Manifest(type: Copy) {
dependsOn 'assembleGame_226114725Release'
from zipTree("build/outputs/aar/app-game_226114725-release.aar")
include "AndroidManifest.xml"
- into "C:\\Unity3D_SDK\\ChannelDiff\\226114725\\"
+ into "C:\\Unity3D_SDK\\ChannelDiff\\Android\\226114725\\"
}
task autoCopy_226114725(type: Copy) {
dependsOn autoCopy_226114725_Manifest
from "build/outputs/aar/"
include "app-game_226114725-release.aar"
- into "C:\\Unity3D_SDK\\ChannelDiff\\226114725\\libs\\"
+ into "C:\\Unity3D_SDK\\ChannelDiff\\Android\\226114725\\libs\\"
}
task autoCopy_822055139_Manifest(type: Copy) {
dependsOn 'assembleGame_822055139Release'
from zipTree("build/outputs/aar/app-game_822055139-release.aar")
include "AndroidManifest.xml"
- into "C:\\Unity3D_SDK\\ChannelDiff\\822055139\\"
+ into "C:\\Unity3D_SDK\\ChannelDiff\\Android\\822055139\\"
}
task autoCopy_822055139(type: Copy, dependsOn: autoCopy_822055139_Manifest) {
from "build/outputs/aar/"
include "app-game_822055139-release.aar"
- into "C:\\Unity3D_SDK\\ChannelDiff\\822055139\\libs\\"
+ into "C:\\Unity3D_SDK\\ChannelDiff\\Android\\822055139\\libs\\"
}
task autoCopy_813015059_Manifest(type: Copy) {
dependsOn 'assembleGame_813015059Release'
from zipTree("build/outputs/aar/app-game_813015059-release.aar")
include "AndroidManifest.xml"
- into "C:\\Unity3D_SDK\\ChannelDiff\\813015059\\"
+ into "C:\\Unity3D_SDK\\ChannelDiff\\Android\\813015059\\"
}
task autoCopy_813015059(type: Copy, dependsOn: autoCopy_813015059_Manifest) {
from "build/outputs/aar/"
include "app-game_813015059-release.aar"
- into "C:\\Unity3D_SDK\\ChannelDiff\\813015059\\libs\\"
+ into "C:\\Unity3D_SDK\\ChannelDiff\\Android\\813015059\\libs\\"
}
task autoCopySecondWorldAndroidManifest(type: Copy) {
dependsOn 'assembleSecondworldRelease'
from zipTree("build/outputs/aar/app-secondworld-release.aar")
include "AndroidManifest.xml"
- into "C:\\Unity3D_SDK\\ChannelDiff\\test\\"
+ into "C:\\Unity3D_SDK\\ChannelDiff\\Android\\test\\"
}
task autoCopySecondWorldAAR(type: Copy) {
diff --git a/Project/app/src/game_822055139/AndroidManifest.xml b/Project/app/src/game_822055139/AndroidManifest.xml
index 9394e46..70b9318 100644
--- a/Project/app/src/game_822055139/AndroidManifest.xml
+++ b/Project/app/src/game_822055139/AndroidManifest.xml
@@ -42,8 +42,8 @@
android:name="com.secondworld.univeralsdk.MainActivity"
android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale|layoutDirection"
android:label="@string/app_name"
- android:launchMode="singleTop"
- android:screenOrientation="landscape">
+ android:launchMode="singleTask"
+ android:screenOrientation="sensorLandscape">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
diff --git a/Project/app/src/main/AndroidManifest.xml b/Project/app/src/main/AndroidManifest.xml
index df03724..cb4fdd3 100644
--- a/Project/app/src/main/AndroidManifest.xml
+++ b/Project/app/src/main/AndroidManifest.xml
@@ -59,8 +59,8 @@
android:name="com.secondworld.univeralsdk.MainActivity"
android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale|layoutDirection"
android:label="@string/app_name"
- android:launchMode="singleTop"
- android:screenOrientation="landscape">
+ android:launchMode="singleTask"
+ android:screenOrientation="sensorLandscape">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
--
Gitblit v1.8.0