version:6.4.1

fix:
update:去掉腾讯推送，增加保存电子书包激活码

app/build.gradle

@@ -1,5 +1,4 @@
 apply plugin: 'com.android.application'
-apply plugin: "com.tencent.android.tpns"
 
 static def appName() {
     return "AoleyunDeviceInfo"
@@ -78,35 +77,51 @@ android {
             buildConfigField "String", "platform", '"ZhanRui"'
         }
 
+        AH6016 {
+            flavorDimensions "default"
+            versionCode 8
+            versionName "1.7"
+            buildConfigField "String", "platform", '"AH6016"'
+        }
+
+        G10Z {
+            flavorDimensions "default"
+            versionCode 8
+            versionName "1.7"
+            buildConfigField "String", "platform", '"ZR6016"'
+        }
+
         //酷比魔方
         cube {
             flavorDimensions "default"
-            versionCode 80
-            versionName "6.4.0"
+            versionCode 81
+            versionName "6.4.1"
             buildConfigField "String", "platform", '"ZhanRuiCube"'
         }
 
         //MTK
         MTKnewly {
             flavorDimensions "default"
-            versionCode 55
-            versionName "2.4.5"
+            versionCode 56
+            versionName "2.4.6"
             buildConfigField "String", "platform", '"MTK"'
         }
 
         Huaruian {
             flavorDimensions "default"
-            versionCode 8
-            versionName "1.0.7"
+            versionCode 9
+            versionName "1.0.8"
             buildConfigField "String", "platform", '"MTK11"'
         }
 
         Teclast {
             flavorDimensions "default"
-            versionCode 8
-            versionName "1.0.7"
+            versionCode 13
+            versionName "1.0.9.3"
             buildConfigField "String", "platform", '"P20S"'
         }
+
+
     }
 
     sourceSets {
@@ -135,6 +150,15 @@ android {
             v2SigningEnabled false
         }
 
+        zhanRui12 {
+            storeFile file("keystore/zhanrui12.jks")
+            storePassword "123456"
+            keyAlias "zhanrui12"
+            keyPassword "123456"
+            v1SigningEnabled true
+            v2SigningEnabled false
+        }
+
         mtk {
             storeFile file("keystore/xueshibaoos.jks")
             storePassword "123456"
@@ -162,6 +186,15 @@ android {
             v2SigningEnabled true
         }
 
+        zhanruiG10Z{
+            storeFile file("keystore/zhanruiG10Z.keystore")
+            storePassword "123456"
+            keyAlias "zhanruiG10Z"
+            keyPassword "123456"
+            v1SigningEnabled true
+            v2SigningEnabled true
+        }
+
         mtk12 {
             storeFile file("keystore/mtkAndroid12.keystore")
             storePassword "123456"
@@ -241,6 +274,18 @@ android {
             signingConfig signingConfigs.G10PUserDebug
         }
 
+        zhanruiG10ZDebug.initWith(debug)
+        zhanruiG10ZDebug {
+            versionNameSuffix "-debug"
+            debuggable true
+            signingConfig signingConfigs.zhanruiG10Z
+        }
+
+        zhanruiG10ZRelease.initWith(release)
+        zhanruiG10ZRelease {
+            signingConfig signingConfigs.zhanruiG10Z
+        }
+
         TeclastP20SDebug.initWith(debug)
         TeclastP20SDebug {
             debuggable true
@@ -279,6 +324,18 @@ android {
             signingConfig signingConfigs.zhanRuiUserdebug
         }
 
+        zhanRui12Debug.initWith(debug)
+        zhanRui12Debug {
+            debuggable true
+            versionNameSuffix "-debug"
+            signingConfig signingConfigs.zhanRui12
+        }
+
+        zhanRui12Release.initWith(release)
+        zhanRui12Release {
+            signingConfig signingConfigs.zhanRui12
+        }
+
         debug {
             debuggable true
             versionNameSuffix "-debug"
@@ -290,7 +347,7 @@ android {
                 variant.outputs.each { output ->
                     def outputFile = output.outputFile
                     if (outputFile != null) {
-                        def fileName = "${appName()}-${variant.versionCode}-V${variant.versionName}-${releaseTime()}-${buildType.name}.apk"
+                        def fileName = "${appName()}-${variant.versionCode}-V${variant.versionName}-${releaseTime()}-${productFlavors[0].name}-${buildType.name}.apk"
                         output.outputFileName = fileName
                     }
                 }
@@ -309,7 +366,7 @@ android {
                 variant.outputs.each { output ->
                     def outputFile = output.outputFile
                     if (outputFile != null) {
-                        def fileName = "${appName()}-${variant.versionCode}-V${variant.versionName}-${releaseTime()}-${buildType.name}.apk"
+                        def fileName = "${appName()}-${variant.versionCode}-V${variant.versionName}-${releaseTime()}-${productFlavors[0].name}-${buildType.name}.apk"
                         output.outputFileName = fileName
                     }
                 }
@@ -378,14 +435,10 @@ dependencies {
     implementation 'com.jakewharton:disklrucache:2.0.2'
     //阿里云推送
     implementation 'com.aliyun.ams:alicloud-android-push:3.8.0'
-//    //fastjson
-//    implementation 'com.alibaba:fastjson:1.2.83'
     //百度地图
     implementation 'com.baidu.lbsyun:BaiduMapSDK_Location:9.1.8'
     //MMKV
     implementation 'com.tencent:mmkv-static:1.2.13'
-    //腾讯移动推送 TPNS
-    implementation 'com.tencent.tpns:tpns:1.4.0.1-release'
     //工具类
     implementation 'com.blankj:utilcodex:1.31.0'
     //Aria