From 6efcba28290490a5f0ca679220f349100ff9345c Mon Sep 17 00:00:00 2001 From: Godfather <981964879@qq.com> Date: Wed, 2 Mar 2022 14:59:11 +0800 Subject: [PATCH] =?UTF-8?q?version:=20fix:=20update:=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=88=B0=E9=85=B7=E6=AF=94=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 165 ++++++------------ app/keystore/xueshibaoos.jks | Bin 2552 -> 0 bytes .../com/aoleyun/sn/service/GuardService.java | 6 +- .../com/aoleyun/sn/utils/SysSettingUtils.java | 6 +- settings.gradle | 2 +- 5 files changed, 59 insertions(+), 120 deletions(-) delete mode 100644 app/keystore/xueshibaoos.jks diff --git a/app/build.gradle b/app/build.gradle index b54beda..ccec4f2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -59,7 +59,7 @@ android { //多版本 productFlavors { //新平台正式 - newly { + cube { flavorDimensions "default" versionCode 20 versionName "2.9" @@ -81,26 +81,6 @@ android { buildConfigField "String", "WebsocketURL", '"wss://led.aoleyun.cn:2018"' } - MTKnewly { - flavorDimensions "default" - versionCode 8 - versionName "1.7" - /*********************************极光推送************************************/ - manifestPlaceholders = [ - XG_ACCESS_ID : "1500026372", - XG_ACCESS_KEY: "AR7A1L5M0LPH", -// JPUSH_PKGNAME: "com.aoleyun.sn", -// JPUSH_APPKEY : "79c64ef41b8728ad6aa29af1", //JPush上注册的包名对应的appkey. -// JPUSH_CHANNEL: "developer-default", //暂时填写默认值即可. -// channel_value: "newly", - ] - /*********************************极光推送end************************************/ - buildConfigField "String", "ROOT_URL", '"https://led.aoleyun.cn/api/"' - buildConfigField "String", "SCREEN_BASE_URL", '"https://led.aoleyun.cn:2018/"' - buildConfigField "String", "SCREEN_URL", '"https://led.aoleyun.cn:2018/wm/is_online"' - buildConfigField "String", "WebsocketURL", '"wss://led.aoleyun.cn:2018"' - } - //新平台测试 beta { versionNameSuffix "-beta" @@ -133,7 +113,7 @@ android { //签名 signingConfigs { - zhanRui { + alldocube { storeFile file("keystore/zhanxun.keystore") storePassword "123456" keyAlias "zhanxun" @@ -142,7 +122,7 @@ android { v2SigningEnabled true } - zhanRuiUserdebug { + alldocubeDebug { storeFile file("keystore/zhanxunUserdebug.keystore") storePassword "123456" keyAlias "zhanxunUserdebug" @@ -150,102 +130,42 @@ android { v1SigningEnabled true v2SigningEnabled true } - - debug { - storeFile file("keystore/xueshibaoos.jks") - storePassword "123456" - keyAlias "xueshibaoos" - keyPassword "123456" - v1SigningEnabled true - v2SigningEnabled true - } - - release { - storeFile file("keystore/xueshibaoos.jks") - storePassword "123456" - keyAlias "xueshibaoos" - keyPassword "123456" - v1SigningEnabled true - v2SigningEnabled true - } } // Disable release builds for now - android.variantFilter { variant -> - if (variant.buildType.name.endsWith('zhanRuiRelease')) { - variant.setIgnore(variant.getFlavors().get(0).name.equals('official') || variant.getFlavors().get(0).name.equals('zhongyou')) - } - if (variant.buildType.name.endsWith('zhanRuiDebug')) { - variant.setIgnore(variant.getFlavors().get(0).name.equals('official') || variant.getFlavors().get(0).name.equals('zhongyou')) - } - if (name.contains("MTKnewly")) { - variant.setIgnore(variant.buildType.name.endsWith("zhanRuiRelease") || variant.buildType.name.endsWith("zhanRuiDebug") || variant.buildType.name.endsWith("zhanRuiUserdebug") - || variant.buildType.name.endsWith("zhanRuiUserdebugReleas")) - } - if (name.endsWith("newlyDebug") || name.endsWith("newlyRelease")) { - variant.setIgnore(!name.contains("MTK")) - } - -// // Icon recents is Go only -// if (name.contains("WithQuickstepIconRecents") && !name.contains("l3go")) { -// variant.setIgnore(true) +// android.variantFilter { variant -> +// if (variant.buildType.name.endsWith('zhanRuiRelease')) { +// variant.setIgnore(variant.getFlavors().get(0).name.equals('official') || variant.getFlavors().get(0).name.equals('zhongyou')) // } - } +// if (variant.buildType.name.endsWith('zhanRuiDebug')) { +// variant.setIgnore(variant.getFlavors().get(0).name.equals('official') || variant.getFlavors().get(0).name.equals('zhongyou')) +// } +// if (name.contains("MTKnewly")) { +// variant.setIgnore(variant.buildType.name.endsWith("zhanRuiRelease") || variant.buildType.name.endsWith("zhanRuiDebug") || variant.buildType.name.endsWith("zhanRuiUserdebug") +// || variant.buildType.name.endsWith("zhanRuiUserdebugReleas")) +// } +// if (name.endsWith("newlyDebug") || name.endsWith("newlyRelease")) { +// variant.setIgnore(!name.contains("MTK")) +// } +// +//// // Icon recents is Go only +//// if (name.contains("WithQuickstepIconRecents") && !name.contains("l3go")) { +//// variant.setIgnore(true) +//// } +// } buildTypes { - zhanRuiRelease.initWith(release) - zhanRuiRelease { - manifestPlaceholders = [ - AMAP_KEY: "6e339305206eeb43f2b4cc1f31751f89" - ] - buildConfigField "String", "platform", '"ZhanRui"' - signingConfig signingConfigs.zhanRui - } - - zhanRuiDebug.initWith(debug) - zhanRuiDebug { - manifestPlaceholders = [ - AMAP_KEY: "6e339305206eeb43f2b4cc1f31751f89" - ] - versionNameSuffix "-debug" - buildConfigField "String", "platform", '"ZhanRui"' - debuggable true - signingConfig signingConfigs.zhanRui - } - - //userdebug rom使用这个版本 - zhanRuiUserdebug.initWith(zhanRuiDebug) - zhanRuiUserdebug { - manifestPlaceholders = [ - AMAP_KEY: "6e339305206eeb43f2b4cc1f31751f89" - ] - versionNameSuffix "-debug" - buildConfigField "String", "platform", '"ZhanRui"' - debuggable true - signingConfig signingConfigs.zhanRuiUserdebug - } - - zhanRuiUserdebugReleas.initWith(release) - zhanRuiUserdebugReleas { - manifestPlaceholders = [ - AMAP_KEY: "6e339305206eeb43f2b4cc1f31751f89" - ] - buildConfigField "String", "platform", '"ZhanRui"' - debuggable true - signingConfig signingConfigs.zhanRuiUserdebug - } - debug { - buildConfigField "String", "platform", '"MTK"' + buildConfigField "String", "platform", '"ZhanRui"' manifestPlaceholders = [ - AMAP_KEY: "1af68e0a7edcaac82678b1cbb7643408" + AMAP_KEY: "6e339305206eeb43f2b4cc1f31751f89" ] + debuggable true versionNameSuffix "-debug" minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' //Zipalign优化 zipAlignEnabled true - signingConfig signingConfigs.debug applicationVariants.all { variant -> variant.outputs.each { output -> def outputFile = output.outputFile @@ -255,12 +175,13 @@ android { } } } + signingConfig signingConfigs.alldocube } release { - buildConfigField "String", "platform", '"MTK"' + buildConfigField "String", "platform", '"ZhanRui"' manifestPlaceholders = [ - AMAP_KEY: "1af68e0a7edcaac82678b1cbb7643408" + AMAP_KEY: "6e339305206eeb43f2b4cc1f31751f89" ] //混淆 minifyEnabled false @@ -268,18 +189,37 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' //Zipalign优化 zipAlignEnabled true - //签名 - signingConfig signingConfigs.release - //将release版本的包名重命名，加上版本及日期 applicationVariants.all { variant -> variant.outputs.each { output -> - def outputFile = "" + def outputFile = output.outputFile if (outputFile != null) { - def fileName = "${appName()}-${variant.versionCode}-V${variant.versionName}-${releaseTime()}-${productFlavors[0].name}-${buildType.name}.apk" + def fileName = "${appName()}-${variant.versionCode}-V${variant.versionName}-${releaseTime()}-${buildType.name}.apk" output.outputFileName = fileName } } } + signingConfig signingConfigs.alldocube + } + + //userdebug rom使用这个版本 + alldocubeDebug.initWith(debug) + alldocubeDebug { + buildConfigField "String", "platform", '"ZhanRui"' + manifestPlaceholders = [ + AMAP_KEY: "6e339305206eeb43f2b4cc1f31751f89" + ] + debuggable true + versionNameSuffix "-debug" + signingConfig signingConfigs.alldocubeDebug + } + + alldocubeDebugReleas.initWith(release) + alldocubeDebugReleas { + buildConfigField "String", "platform", '"ZhanRui"' + manifestPlaceholders = [ + AMAP_KEY: "6e339305206eeb43f2b4cc1f31751f89" + ] + signingConfig signingConfigs.alldocubeDebug } } @@ -332,7 +272,6 @@ dependencies { annotationProcessor 'com.github.bumptech.glide:compiler:4.13.1' // debugImplementation because LeakCanary should only run in debug builds. debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.8.1' - zhanRuiDebugImplementation 'com.squareup.leakcanary:leakcanary-android:2.8.1' //fastjson implementation 'com.alibaba:fastjson:1.2.79' diff --git a/app/keystore/xueshibaoos.jks b/app/keystore/xueshibaoos.jks deleted file mode 100644 index b94a626a1e59b41e0d2b0e1725c1d164b6a8f5ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2552 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 h=~IOHotm-=tG={6OY~?wV#1*=AWE