fixserver

app/build.gradle.kts

@@ -6,10 +6,14 @@ plugins {
 android {
     signingConfigs {
         create("release") {
-            storeFile = file("key/key.jks")
+            storeFile = file(System.getenv("SIGNING_STORE_FILE") ?: "app/key.jks")
+            storePassword = System.getenv("l1H&m10k$>);") ?: "default"
+            keyAlias = System.getenv("key") ?: "default"
+            keyPassword = System.getenv("l1H&m10k$>);") ?: "default"
+            /*storeFile = file("key/key.jks")
             storePassword = "l1H&m10k$>);"
             keyPassword = "l1H&m10k$>);"
-            keyAlias = "key"
+            keyAlias = "key"*/
         }
     }
     namespace = "com.v2plus.com.v2plus.app"
@@ -40,6 +44,7 @@ android {
     buildTypes {
         release {
             isMinifyEnabled = false
+            signingConfig = signingConfigs.getByName("release")
 
         }
         debug {

app/release/output-metadata.json

@@ -20,26 +20,26 @@
       "filters": [
         {
           "filterType": "ABI",
-          "value": "armeabi-v7a"
+          "value": "arm64-v8a"
         }
       ],
       "attributes": [],
       "versionCode": 4000579,
       "versionName": "1.8.35",
-      "outputFile": "v2Plus_1.8.35_armeabi-v7a.apk"
+      "outputFile": "v2Plus_1.8.35_arm64-v8a.apk"
     },
     {
       "type": "ONE_OF_MANY",
       "filters": [
         {
           "filterType": "ABI",
-          "value": "arm64-v8a"
+          "value": "x86_64"
         }
       ],
       "attributes": [],
       "versionCode": 4000579,
       "versionName": "1.8.35",
-      "outputFile": "v2Plus_1.8.35_arm64-v8a.apk"
+      "outputFile": "v2Plus_1.8.35_x86_64.apk"
     },
     {
       "type": "ONE_OF_MANY",
@@ -59,13 +59,13 @@
       "filters": [
         {
           "filterType": "ABI",
-          "value": "x86_64"
+          "value": "armeabi-v7a"
         }
       ],
       "attributes": [],
       "versionCode": 4000579,
       "versionName": "1.8.35",
-      "outputFile": "v2Plus_1.8.35_x86_64.apk"
+      "outputFile": "v2Plus_1.8.35_armeabi-v7a.apk"
     }
   ],
   "elementType": "File",
@@ -75,21 +75,21 @@
       "maxApi": 30,
       "baselineProfiles": [
         "baselineProfiles/1/v2Plus_1.8.35_universal.dm",
-        "baselineProfiles/1/v2Plus_1.8.35_armeabi-v7a.dm",
         "baselineProfiles/1/v2Plus_1.8.35_arm64-v8a.dm",
+        "baselineProfiles/1/v2Plus_1.8.35_x86_64.dm",
         "baselineProfiles/1/v2Plus_1.8.35_x86.dm",
-        "baselineProfiles/1/v2Plus_1.8.35_x86_64.dm"
+        "baselineProfiles/1/v2Plus_1.8.35_armeabi-v7a.dm"
       ]
     },
     {
       "minApi": 31,
       "maxApi": 2147483647,
       "baselineProfiles": [
         "baselineProfiles/0/v2Plus_1.8.35_universal.dm",
-        "baselineProfiles/0/v2Plus_1.8.35_armeabi-v7a.dm",
         "baselineProfiles/0/v2Plus_1.8.35_arm64-v8a.dm",
+        "baselineProfiles/0/v2Plus_1.8.35_x86_64.dm",
         "baselineProfiles/0/v2Plus_1.8.35_x86.dm",
-        "baselineProfiles/0/v2Plus_1.8.35_x86_64.dm"
+        "baselineProfiles/0/v2Plus_1.8.35_armeabi-v7a.dm"
       ]
     }
   ],

app/src/main/kotlin/com/v2plus/app/ui/MainActivity.kt

@@ -160,23 +160,24 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
             }
         })
         lifecycleScope.launch {
+
             importBatchConfig(
                 AA.AAAAAAA(
+                String(
+                    Base64.decodeBase64("QkNFZkJCaENPSzY0UnZoTTlDaUhMSFkzdVhOYVZnS3I0UzYza0swUDBIUCtVa0NGZmNxdjRUU0NuODR4elZMTg=="),
+                    Charset.forName(String(Base64.decodeBase64("VVRGLTg=")))
+                ), AA.AAAA(
                     String(
-                        Base64.decodeBase64("VE5tQnFSd3A0dkxqNC83d0VHZHVWdlNmVjBxLzVPTHlRQzQ1ZVA3UWJMd2dKV2swWjNsS0dMMlZBNkUyMnhkMg=="),
-                        Charset.forName(String(Base64.decodeBase64("VVRGLTg=")))
-                    ), AA.AAAA(
-                        String(
-                            Base64.decodeBase64("YmhRblg3WkQrd1hLQVprM1NLb0kwdz09"),
-                            Charset.forName(
-                                String(
-                                    Base64.decodeBase64("VVRGLTg=")
-                                )
+                        Base64.decodeBase64("YmhRblg3WkQrd1hLQVprM1NLb0kwdz09"),
+                        Charset.forName(
+                            String(
+                                Base64.decodeBase64("VVRGLTg=")
                             )
                         )
                     )
                 )
             )
+            )
             delay(2000)
             mainViewModel.testAllRealPing()
         }

gradle.properties

@@ -4,3 +4,8 @@ android.enableJetifier=true
 kotlin.code.style=official
 android.nonTransitiveRClass=true
 org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+SIGNING_STORE_FILE=app/key.jks
+SIGNING_STORE_PASSWORD=l1H&m10k$>);
+SIGNING_KEY_ALIAS=key
+SIGNING_KEY_PASSWORD=l1H&m10k$>);
+