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 b94a626..0000000 Binary files a/app/keystore/xueshibaoos.jks and /dev/null differ diff --git a/app/src/main/java/com/aoleyun/sn/service/GuardService.java b/app/src/main/java/com/aoleyun/sn/service/GuardService.java index b93d38f..62fa218 100644 --- a/app/src/main/java/com/aoleyun/sn/service/GuardService.java +++ b/app/src/main/java/com/aoleyun/sn/service/GuardService.java @@ -443,14 +443,14 @@ public class GuardService extends Service { Log.e("setDefaultUSBStatus", "setting_usb---------" + setting_usb); String usbStatus = ""; if (TextUtils.isEmpty(setting_usb)) { - usbStatus = "qch_action_usb_usb_charge"; + usbStatus = "aole_action_usb_usb_charge"; } else { switch (setting_usb) { case "usb_charge": - usbStatus = "qch_action_usb_usb_charge"; + usbStatus = "aole_action_usb_usb_charge"; break; case "usb_mtp": - usbStatus = "qch_action_usb_usb_mtp"; + usbStatus = "aole_action_usb_usb_mtp"; break; case "usb_midi": usbStatus = "qch_action_usb_usb_midi"; diff --git a/app/src/main/java/com/aoleyun/sn/utils/SysSettingUtils.java b/app/src/main/java/com/aoleyun/sn/utils/SysSettingUtils.java index 342a595..f900059 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/SysSettingUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/SysSettingUtils.java @@ -174,7 +174,7 @@ public class SysSettingUtils { try { boolean qch_usb_choose = Settings.System.putString(context.getContentResolver(), "qch_usb_choose", "usb_charge"); Log.e(TAG, "qch_usb_choose:" + qch_usb_choose); - String usbStatus = "qch_action_usb_usb_charge"; + String usbStatus = "aole_action_usb_usb_charge"; Intent usbIntent = new Intent(usbStatus).setPackage("com.android.settings"); context.sendBroadcast(usbIntent); } catch (Exception e) { @@ -196,10 +196,10 @@ public class SysSettingUtils { String usbStatus = ""; switch (setting_usb) { case "usb_charge": - usbStatus = "qch_action_usb_usb_charge"; + usbStatus = "aole_action_usb_usb_charge"; break; case "usb_mtp": - usbStatus = "qch_action_usb_usb_mtp"; + usbStatus = "aole_action_usb_usb_mtp"; break; case "usb_midi": usbStatus = "qch_action_usb_usb_midi"; diff --git a/settings.gradle b/settings.gradle index b32e95f..c69420b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ include ':app' -rootProject.name='奥乐云我的设备' +rootProject.name='酷比我的设备'