tongtong/CubeAoleyunSN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:6.4.2

Browse Source 
fix:统一版本号
update:增加G13型号
This commit is contained in:
Fanhuitong
2023-09-07 14:43:52 +08:00
parent af14f02fba
commit a069f5c848
4 changed files with 50 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
app/build.gradle
View File

@@ -29,6 +29,9 @@ android {
defaultConfig { defaultConfig {
applicationId "com.aoleyun.sn" applicationId "com.aoleyun.sn"
versionCode 82
versionName "6.4.2"
//There are no CERT files because If the mini sdk version is 23+, the AGP will ignore the V1 scheme signature. //There are no CERT files because If the mini sdk version is 23+, the AGP will ignore the V1 scheme signature.
minSdkVersion 24 minSdkVersion 24
targetSdkVersion 29 targetSdkVersion 29
@@ -65,65 +68,6 @@ android {
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8
} }
//多渠道
productFlavors {
// 展锐：6.2.8.19
// MTK：2.2.8.19
//新平台正式
newly {
flavorDimensions "default"
versionCode 21
versionName "3.0"
buildConfigField "String", "platform", '"ZhanRui"'
}
AH6016 {
flavorDimensions "default"
versionCode 9
versionName "1.8"
buildConfigField "String", "platform", '"AH6016"'
}
G10Z {
flavorDimensions "default"
versionCode 9
versionName "1.8"
buildConfigField "String", "platform", '"ZR6016"'
}
//酷比魔方
cube {
flavorDimensions "default"
versionCode 81
versionName "6.4.1"
buildConfigField "String", "platform", '"ZhanRuiCube"'
}
//MTK
MTKnewly {
flavorDimensions "default"
versionCode 56
versionName "2.4.6"
buildConfigField "String", "platform", '"MTK"'
}
Huaruian {
flavorDimensions "default"
versionCode 13
versionName "1.1.2"
buildConfigField "String", "platform", '"ZR6016"'
}
Teclast {
flavorDimensions "default"
versionCode 13
versionName "1.0.9.3"
buildConfigField "String", "platform", '"P20S"'
}
}
sourceSets { sourceSets {
//测试版的图标 //测试版的图标
// beta.res.srcDirs = ['src/beta/res'] // beta.res.srcDirs = ['src/beta/res']
@@ -215,27 +159,6 @@ android {
// Disable release builds for now // Disable release builds for now
android.variantFilter { variant -> 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 (name.startsWith('newly')) {
variant.setIgnore(name.endsWith("newlyDebug")
|| name.endsWith('newlyRelease'))
}
if (name.startsWith('cube')) {
variant.setIgnore(name.endsWith("cubeDebug")
|| name.endsWith('cubeRelease'))
}
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")
|| variant.buildType.name.endsWith("alldocubeDebug")
|| variant.buildType.name.endsWith("alldocubeDebugRelease")
)
}
// // Icon recents is Go only // // Icon recents is Go only
// if (name.contains("WithQuickstepIconRecents") && !name.contains("l3go")) { // if (name.contains("WithQuickstepIconRecents") && !name.contains("l3go")) {
// variant.setIgnore(true) // variant.setIgnore(true)
@@ -255,16 +178,32 @@ android {
signingConfig signingConfigs.mtk12 signingConfig signingConfigs.mtk12
} }
G13Debug.initWith(debug)
G13Debug {
versionNameSuffix "-debug"
debuggable true
signingConfig signingConfigs.G10P
buildConfigField "String", "platform", '"HRAD13"'
}
G13Release.initWith(release)
G13Release {
signingConfig signingConfigs.G10P
buildConfigField "String", "platform", '"HRAD13"'
}
G10PDebug.initWith(debug) G10PDebug.initWith(debug)
G10PDebug { G10PDebug {
versionNameSuffix "-debug" versionNameSuffix "-debug"
debuggable true debuggable true
signingConfig signingConfigs.G10P signingConfig signingConfigs.G10P
buildConfigField "String", "platform", '"MTK11"'
} }
G10PRelease.initWith(release) G10PRelease.initWith(release)
G10PRelease { G10PRelease {
signingConfig signingConfigs.G10P signingConfig signingConfigs.G10P
buildConfigField "String", "platform", '"MTK11"'
} }
G10PUserDebug.initWith(debug) G10PUserDebug.initWith(debug)
@@ -272,6 +211,7 @@ android {
versionNameSuffix "-debug" versionNameSuffix "-debug"
debuggable true debuggable true
signingConfig signingConfigs.G10PUserDebug signingConfig signingConfigs.G10PUserDebug
buildConfigField "String", "platform", '"MTK11"'
} }
zhanruiG10ZDebug.initWith(debug) zhanruiG10ZDebug.initWith(debug)
@@ -279,11 +219,13 @@ android {
versionNameSuffix "-debug" versionNameSuffix "-debug"
debuggable true debuggable true
signingConfig signingConfigs.zhanruiG10Z signingConfig signingConfigs.zhanruiG10Z
buildConfigField "String", "platform", '"ZR6016"'
} }
zhanruiG10ZRelease.initWith(release) zhanruiG10ZRelease.initWith(release)
zhanruiG10ZRelease { zhanruiG10ZRelease {
signingConfig signingConfigs.zhanruiG10Z signingConfig signingConfigs.zhanruiG10Z
buildConfigField "String", "platform", '"ZR6016"'
} }
TeclastP20SDebug.initWith(debug) TeclastP20SDebug.initWith(debug)
@@ -291,11 +233,13 @@ android {
debuggable true debuggable true
versionNameSuffix "-debug" versionNameSuffix "-debug"
signingConfig signingConfigs.P20S signingConfig signingConfigs.P20S
buildConfigField "String", "platform", '"P20S"'
} }
TeclastP20SRelease.initWith(release) TeclastP20SRelease.initWith(release)
TeclastP20SRelease { TeclastP20SRelease {
signingConfig signingConfigs.P20S signingConfig signingConfigs.P20S
buildConfigField "String", "platform", '"P20S"'
} }
zhanRuiDebug.initWith(debug) zhanRuiDebug.initWith(debug)
@@ -303,11 +247,13 @@ android {
debuggable true debuggable true
versionNameSuffix "-debug" versionNameSuffix "-debug"
signingConfig signingConfigs.zhanRui signingConfig signingConfigs.zhanRui
buildConfigField "String", "platform", '"ZhanRuiCube"'
} }
zhanRuiRelease.initWith(release) zhanRuiRelease.initWith(release)
zhanRuiRelease { zhanRuiRelease {
signingConfig signingConfigs.zhanRui signingConfig signingConfigs.zhanRui
buildConfigField "String", "platform", '"ZhanRuiCube"'
} }
//userdebug rom使用这个版本 //userdebug rom使用这个版本
@@ -316,12 +262,14 @@ android {
debuggable true debuggable true
versionNameSuffix "-debug" versionNameSuffix "-debug"
signingConfig signingConfigs.zhanRuiUserdebug signingConfig signingConfigs.zhanRuiUserdebug
buildConfigField "String", "platform", '"ZhanRuiCube"'
} }
zhanRuiUserdebugReleas.initWith(release) zhanRuiUserdebugReleas.initWith(release)
zhanRuiUserdebugReleas { zhanRuiUserdebugReleas {
debuggable true debuggable true
signingConfig signingConfigs.zhanRuiUserdebug signingConfig signingConfigs.zhanRuiUserdebug
buildConfigField "String", "platform", '"ZhanRuiCube"'
} }
zhanRui12Debug.initWith(debug) zhanRui12Debug.initWith(debug)
@@ -329,11 +277,13 @@ android {
debuggable true debuggable true
versionNameSuffix "-debug" versionNameSuffix "-debug"
signingConfig signingConfigs.zhanRui12 signingConfig signingConfigs.zhanRui12
buildConfigField "String", "platform", '"AH6016"'
} }
zhanRui12Release.initWith(release) zhanRui12Release.initWith(release)
zhanRui12Release { zhanRui12Release {
signingConfig signingConfigs.zhanRui12 signingConfig signingConfigs.zhanRui12
buildConfigField "String", "platform", '"AH6016"'
} }
debug { debug {
@@ -347,12 +297,13 @@ android {
variant.outputs.each { output -> variant.outputs.each { output ->
def outputFile = output.outputFile def outputFile = output.outputFile
if (outputFile != null) { 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 output.outputFileName = fileName
} }
} }
} }
signingConfig signingConfigs.mtk signingConfig signingConfigs.mtk
buildConfigField "String", "platform", '"MTK"'
} }
release { release {
@@ -366,12 +317,13 @@ android {
variant.outputs.each { output -> variant.outputs.each { output ->
def outputFile = output.outputFile def outputFile = output.outputFile
if (outputFile != null) { 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 output.outputFileName = fileName
} }
} }
} }
signingConfig signingConfigs.mtk signingConfig signingConfigs.mtk
buildConfigField "String", "platform", '"MTK"'
} }
} }

3
app/src/main/java/com/aoleyun/sn/network/NetInterfaceManager.java
View File

@@ -2316,7 +2316,10 @@ public class NetInterfaceManager {
tagSets.add(JGYUtils.AH6016Tag); tagSets.add(JGYUtils.AH6016Tag);
} else if (platform == JGYUtils.ZR6016Platform) { } else if (platform == JGYUtils.ZR6016Platform) {
tagSets.add(JGYUtils.ZR6016Tag); tagSets.add(JGYUtils.ZR6016Tag);
} else if (platform == JGYUtils.HRAD13Platform) {
tagSets.add(JGYUtils.HRAD13Tag);
} }
}); });
Log.e(TAG, "clearAndAppendTags: " + tagSets); Log.e(TAG, "clearAndAppendTags: " + tagSets);
String[] tag = new ArrayList<>(tagSets).toArray(new String[tagSets.size()]); String[] tag = new ArrayList<>(tagSets).toArray(new String[tagSets.size()]);

11
app/src/main/java/com/aoleyun/sn/utils/JGYUtils.java
View File

@@ -119,6 +119,8 @@ public class JGYUtils {
public static final int TeclastP20sPlatform = 6; public static final int TeclastP20sPlatform = 6;
public static final int AH6016Platform = 9; public static final int AH6016Platform = 9;
public static final int ZR6016Platform = 10; public static final int ZR6016Platform = 10;
public static final int HRAD13Platform = 11;
public static final String Other = "其他"; public static final String Other = "其他";
public static final String MTKTag = "MTK"; public static final String MTKTag = "MTK";
@@ -128,6 +130,7 @@ public class JGYUtils {
public static final String TeclastP20sTag = "P20S"; public static final String TeclastP20sTag = "P20S";
public static final String AH6016Tag = "AH6016"; public static final String AH6016Tag = "AH6016";
public static final String ZR6016Tag = "ZR6016"; public static final String ZR6016Tag = "ZR6016";
public static final String HRAD13Tag = "HRAD13";
private CacheHelper cacheHelper; private CacheHelper cacheHelper;
@@ -198,6 +201,9 @@ public class JGYUtils {
} else if (ZR6016Tag.equalsIgnoreCase(platform)) { } else if (ZR6016Tag.equalsIgnoreCase(platform)) {
Log.i(TAG, "checkAppPlatform: " + "ZR6016"); Log.i(TAG, "checkAppPlatform: " + "ZR6016");
return ZR6016Platform; return ZR6016Platform;
} else if (HRAD13Tag.equalsIgnoreCase(platform)) {
Log.i(TAG, "checkAppPlatform: " + "HRAD13");
return HRAD13Platform;
} else { } else {
Log.i(TAG, "checkAppPlatform: " + "没有数据"); Log.i(TAG, "checkAppPlatform: " + "没有数据");
return UnknowPlatform; return UnknowPlatform;
@@ -233,6 +239,8 @@ public class JGYUtils {
getAppPlatformCallback.AppPlatform(AH6016Platform); getAppPlatformCallback.AppPlatform(AH6016Platform);
} else if (ZR6016Tag.equalsIgnoreCase(platform)) { } else if (ZR6016Tag.equalsIgnoreCase(platform)) {
getAppPlatformCallback.AppPlatform(ZR6016Platform); getAppPlatformCallback.AppPlatform(ZR6016Platform);
} else if (HRAD13Tag.equalsIgnoreCase(platform)) {
getAppPlatformCallback.AppPlatform(HRAD13Platform);
} else { } else {
getAppPlatformCallback.AppPlatform(UnknowPlatform); getAppPlatformCallback.AppPlatform(UnknowPlatform);
} }
@@ -254,6 +262,8 @@ public class JGYUtils {
return AH6016Tag; return AH6016Tag;
} else if (ZR6016Tag.equalsIgnoreCase(platform)) { } else if (ZR6016Tag.equalsIgnoreCase(platform)) {
return ZR6016Tag; return ZR6016Tag;
} else if (HRAD13Tag.equalsIgnoreCase(platform)) {
return HRAD13Tag;
} else { } else {
return Other; return Other;
} }
@@ -1656,6 +1666,7 @@ public class JGYUtils {
|| JGYUtils.getInstance().checkAppPlatform() == JGYUtils.CubePlatform || JGYUtils.getInstance().checkAppPlatform() == JGYUtils.CubePlatform
|| JGYUtils.getInstance().checkAppPlatform() == JGYUtils.AH6016Platform || JGYUtils.getInstance().checkAppPlatform() == JGYUtils.AH6016Platform
|| JGYUtils.getInstance().checkAppPlatform() == JGYUtils.ZR6016Platform || JGYUtils.getInstance().checkAppPlatform() == JGYUtils.ZR6016Platform
|| JGYUtils.getInstance().checkAppPlatform() == JGYUtils.HRAD13Platform
) { ) {
Settings.Global.putInt(crv, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, state == 1 ? 0 : 1); Settings.Global.putInt(crv, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, state == 1 ? 0 : 1);
Settings.Global.putInt(crv, Settings.Global.ADB_ENABLED, state == 1 ? 0 : 1); Settings.Global.putInt(crv, Settings.Global.ADB_ENABLED, state == 1 ? 0 : 1);

3
app/src/main/java/com/aoleyun/sn/utils/Utils.java
View File

@@ -785,7 +785,7 @@ public class Utils {
return t1; return t1;
} }
public static final String NOSN = "012345679ABCDEF"; public static final String NOSN = "0123456789ABCDEF";
public static final String TECLAST_BRAND = "Teclast"; public static final String TECLAST_BRAND = "Teclast";
/** /**
@@ -1758,6 +1758,7 @@ public class Utils {
|| JGYUtils.getInstance().checkAppPlatform() == JGYUtils.TeclastP20sPlatform || JGYUtils.getInstance().checkAppPlatform() == JGYUtils.TeclastP20sPlatform
|| JGYUtils.getInstance().checkAppPlatform() == JGYUtils.AH6016Platform || JGYUtils.getInstance().checkAppPlatform() == JGYUtils.AH6016Platform
|| JGYUtils.getInstance().checkAppPlatform() == JGYUtils.ZR6016Platform || JGYUtils.getInstance().checkAppPlatform() == JGYUtils.ZR6016Platform
|| JGYUtils.getInstance().checkAppPlatform() == JGYUtils.HRAD13Platform
) { ) {
return Utils.getProperty("ro.build.display.id", "获取失败"); return Utils.getProperty("ro.build.display.id", "获取失败");
} else { } else {