diff --git a/.idea/gradle.xml b/.idea/gradle.xml index a819445..f03c88b 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -15,6 +15,7 @@ diff --git a/app/google-services.json b/app/google-services.json new file mode 100644 index 0000000..325beca --- /dev/null +++ b/app/google-services.json @@ -0,0 +1,39 @@ +{ + "project_info": { + "project_number": "977053300219", + "project_id": "cebg-1a9ee", + "storage_bucket": "cebg-1a9ee.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:977053300219:android:556f8ae1bb64b47041c75e", + "android_client_info": { + "package_name": "com.cege.games.release" + } + }, + "oauth_client": [ + { + "client_id": "977053300219-p63olapdi7ct9ms93lst6c848qatj17l.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyBAJnU2bBYbukFuijaZMMUzn5UI2NOCMO4" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "977053300219-p63olapdi7ct9ms93lst6c848qatj17l.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/app/res/mipmap-hdpi/ic_launcher.png b/app/res/mipmap-hdpi/ic_launcher.png index 5c28bd5..1c56bdb 100644 Binary files a/app/res/mipmap-hdpi/ic_launcher.png and b/app/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/res/mipmap-mdpi/ic_launcher.png b/app/res/mipmap-mdpi/ic_launcher.png index dd76bb4..393ac63 100644 Binary files a/app/res/mipmap-mdpi/ic_launcher.png and b/app/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/res/mipmap-xhdpi/ic_launcher.png b/app/res/mipmap-xhdpi/ic_launcher.png index f2aac72..a9479fb 100644 Binary files a/app/res/mipmap-xhdpi/ic_launcher.png and b/app/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/res/mipmap-xxhdpi/ic_launcher.png b/app/res/mipmap-xxhdpi/ic_launcher.png index 3f469c2..42b067d 100644 Binary files a/app/res/mipmap-xxhdpi/ic_launcher.png and b/app/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/res/mipmap-xxxhdpi/ic_launcher.png b/app/res/mipmap-xxxhdpi/ic_launcher.png index 91deddc..e6da237 100644 Binary files a/app/res/mipmap-xxxhdpi/ic_launcher.png and b/app/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/gradle.properties b/gradle.properties index a4e4df5..d286a66 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,14 +22,19 @@ android.enableJetifier=true PROP_COMPILE_SDK_VERSION=30 # Android SDK version that will be used as the earliest version of android this application can run on -PROP_MIN_SDK_VERSION=23 +PROP_MIN_SDK_VERSION=26 # Android SDK version that will be used as the latest version of android this application has been tested on -PROP_TARGET_SDK_VERSION=30 +PROP_TARGET_SDK_VERSION=31 # Android Build Tools version that will be used as the compile project PROP_BUILD_TOOLS_VERSION=30.0.2 PROP_APP_ABI=armeabi-v7a:arm64-v8a -android.injected.testOnly=false \ No newline at end of file +android.injected.testOnly=false + +org.gradle.parallel=true +#android.enableR8=false +unityStreamingAssets= +unityTemplateVersion=3 \ No newline at end of file diff --git a/install-time-asset_pack/.gitignore b/install-time-asset_pack/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/install-time-asset_pack/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/install-time-asset_pack/build.gradle b/install-time-asset_pack/build.gradle new file mode 100644 index 0000000..24f4159 --- /dev/null +++ b/install-time-asset_pack/build.gradle @@ -0,0 +1,44 @@ +plugins { + id 'com.android.library' +} + +apply plugin: 'com.android.asset-pack' + +assetPack{ + packName = "install_time_asset_pack" + dynamicDelivery{ + deliveryType = "install-time" //PAD资源分发 安装时分发 + } +} + +android { + compileSdkVersion PROP_COMPILE_SDK_VERSION.toInteger() + + defaultConfig { + minSdkVersion 21 + targetSdkVersion 32 + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles "consumer-rules.pro" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +dependencies { + + implementation 'androidx.appcompat:appcompat:1.3.0' + implementation 'com.google.android.material:material:1.4.0' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' +} \ No newline at end of file diff --git a/install-time-asset_pack/consumer-rules.pro b/install-time-asset_pack/consumer-rules.pro new file mode 100644 index 0000000..e69de29 diff --git a/install-time-asset_pack/proguard-rules.pro b/install-time-asset_pack/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/install-time-asset_pack/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/install-time-asset_pack/src/androidTest/java/com/example/mylibrary/ExampleInstrumentedTest.java b/install-time-asset_pack/src/androidTest/java/com/example/mylibrary/ExampleInstrumentedTest.java new file mode 100644 index 0000000..81d0e70 --- /dev/null +++ b/install-time-asset_pack/src/androidTest/java/com/example/mylibrary/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.example.mylibrary; + +import android.content.Context; + +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); + assertEquals("com.example.mylibrary.test", appContext.getPackageName()); + } +} \ No newline at end of file diff --git a/install-time-asset_pack/src/main/AndroidManifest.xml b/install-time-asset_pack/src/main/AndroidManifest.xml new file mode 100644 index 0000000..ed91afc --- /dev/null +++ b/install-time-asset_pack/src/main/AndroidManifest.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/install-time-asset_pack/src/test/java/com/example/mylibrary/ExampleUnitTest.java b/install-time-asset_pack/src/test/java/com/example/mylibrary/ExampleUnitTest.java new file mode 100644 index 0000000..0c3b084 --- /dev/null +++ b/install-time-asset_pack/src/test/java/com/example/mylibrary/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.example.mylibrary; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/libs/youme_voice_engine.jar b/libs/youme_voice_engine.jar deleted file mode 100644 index 8b20c18..0000000 Binary files a/libs/youme_voice_engine.jar and /dev/null differ diff --git a/res/drawable/logo.png b/res/drawable/logo.png index 01e883b..5bd887e 100644 Binary files a/res/drawable/logo.png and b/res/drawable/logo.png differ diff --git a/settings.gradle b/settings.gradle index c268c4f..c46288c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,6 +3,7 @@ include ':app' rootProject.name = "HeadlessCocos" include ':libcocos2dx' project(':libcocos2dx').projectDir = new File(ext.cfgs.cocos2dxBasePath + '/cocos/platform/android/libcocos2dx') +include ':install-time-asset_pack' include ':unityLibrary' project(':unityLibrary').projectDir = new File(ext.cfgs.unityAndroidProject + '/unityLibrary') \ No newline at end of file