diff --git a/app/build.gradle b/app/build.gradle index 2896af99a..f0660033f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' apply plugin: 'img-optimizer' apply plugin: 'com.google.gms.google-services' -// 可根据需要选择性排除 android { dexOptions { jumboMode = true } + compileSdkVersion rootProject.ext.android.compileSdkVersion buildToolsVersion rootProject.ext.android.buildToolsVersion packagingOptions { @@ -113,3 +113,16 @@ dependencies { } +// 链接包需要注释掉 否正无法更新 谷歌包需要打开 +project.afterEvaluate { + android.applicationVariants.all { variant -> + variant.outputs.each { output -> + output.processResources.doFirst { pm-> + String manifestPath = output.processResources.manifestFile; + def manifestContent = file(manifestPath).getText() + manifestContent = manifestContent.replace('android.permission.REQUEST_INSTALL_PACKAGES', '') + file(manifestPath).write(manifestContent) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f11913b70..fa41b4854 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -47,6 +47,10 @@ + + diff --git a/build.gradle b/build.gradle index 8597944f4..8be518f50 100644 --- a/build.gradle +++ b/build.gradle @@ -26,6 +26,7 @@ buildscript { } + allprojects { repositories { maven { url "https://maven.rongcloud.cn/repository/maven-releases/" } @@ -42,4 +43,5 @@ allprojects { task clean(type: Delete) { delete rootProject.buildDir -} \ No newline at end of file +} + diff --git a/common/build.gradle b/common/build.gradle index 3f9c8d5dd..d917985ff 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -63,6 +63,7 @@ repositories { } } + dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) api rootProject.ext.dependencies["appcompat-androidx"] diff --git a/config.gradle b/config.gradle index b0db8e5e2..28880e074 100644 --- a/config.gradle +++ b/config.gradle @@ -5,14 +5,14 @@ ext { minSdkVersion : 21, targetSdkVersion : 30, versionCode : 212, - versionName : "6.4.1" + versionName : "6.4.0" ] manifestPlaceholders = [ //正式 -// serverHost : "https://napi.yaoulive.com", + serverHost : "https://napi.yaoulive.com", //測試 - serverHost : "https://ceshi.yaoulive.com", +// serverHost : "https://ceshi.yaoulive.com", //腾讯地图 txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB", @@ -25,6 +25,6 @@ ext { baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S", // true表示谷歌支付 false - isGooglePlay : true + isGooglePlay : false ] } \ No newline at end of file