hxMac 6 месяцев назад
Родитель
Сommit
f6720b8ad0
2 измененных файлов с 70 добавлено и 30 удалено
  1. 69 29
      frpc_android-master/app/build.gradle
  2. 1 1
      frpc_android-master/ussd-library/build.gradle

+ 69 - 29
frpc_android-master/app/build.gradle

@@ -18,6 +18,7 @@ android {
             buildConfigField "String", "FRPC_IP", "\"XXXXXX\""
             buildConfigField "String", "FRPC_PORT", "\"XXXXX\""
             manifestPlaceholders = [app_icon: "@mipmap/ic_a"]
+            minSdkVersion 29
         }
         user1 {
             dimension "baseUrl"
@@ -34,8 +35,9 @@ android {
             manifestPlaceholders = [app_icon: "@mipmap/ic_b"]
             ndk {
                 //noinspection ChromeOsAbiSupport
-                abiFilters 'armeabi-v8a', 'armeabi-v7a'
+                abiFilters 'arm64-v8a', 'armeabi-v7a'
             }
+            minSdkVersion 29
         }
         user2 {
             dimension "baseUrl"
@@ -52,8 +54,9 @@ android {
             manifestPlaceholders = [app_icon: "@mipmap/ic_c"]
             ndk {
                 //noinspection ChromeOsAbiSupport
-                abiFilters 'armeabi-v8a', 'armeabi-v7a'
+                abiFilters 'arm64-v8a', 'armeabi-v7a'
             }
+            minSdkVersion 29
         }
         user3 {
             dimension "baseUrl"
@@ -70,8 +73,10 @@ android {
             manifestPlaceholders = [app_icon: "@mipmap/ic_d"]
             ndk {
                 //noinspection ChromeOsAbiSupport
-                abiFilters 'armeabi-v8a', 'armeabi-v7a'
+                abiFilters 'arm64-v8a', 'armeabi-v7a'
             }
+            minSdkVersion 29
+
         }
         user4 {
             dimension "baseUrl"
@@ -88,8 +93,9 @@ android {
             manifestPlaceholders = [app_icon: "@mipmap/ic_e"]
             ndk {
                 //noinspection ChromeOsAbiSupport
-                abiFilters 'armeabi-v8a', 'armeabi-v7a'
+                abiFilters 'arm64-v8a', 'armeabi-v7a'
             }
+            minSdkVersion 21
         }
         user5 {
             dimension "baseUrl"
@@ -106,8 +112,9 @@ android {
             manifestPlaceholders = [app_icon: "@mipmap/ic_f"]
             ndk {
                 //noinspection ChromeOsAbiSupport
-                abiFilters 'armeabi-v8a', 'armeabi-v7a'
+                abiFilters 'arm64-v8a', 'armeabi-v7a'
             }
+            minSdkVersion 29
         }
         user6 {
             dimension "baseUrl"
@@ -124,8 +131,9 @@ android {
             manifestPlaceholders = [app_icon: "@mipmap/ic_g"]
             ndk {
                 //noinspection ChromeOsAbiSupport
-                abiFilters 'armeabi-v8a', 'armeabi-v7a'
+                abiFilters 'arm64-v8a', 'armeabi-v7a'
             }
+            minSdkVersion 29
         }
         user7 {
             dimension "baseUrl"
@@ -142,8 +150,9 @@ android {
             manifestPlaceholders = [app_icon: "@mipmap/ic_h"]
             ndk {
                 //noinspection ChromeOsAbiSupport
-                abiFilters 'armeabi-v8a', 'armeabi-v7a'
+                abiFilters 'arm64-v8a', 'armeabi-v7a'
             }
+            minSdkVersion 29
         }
         user8 {
             dimension "baseUrl"
@@ -160,8 +169,9 @@ android {
             manifestPlaceholders = [app_icon: "@mipmap/ic_i"]
             ndk {
                 //noinspection ChromeOsAbiSupport
-                abiFilters 'armeabi-v8a', 'armeabi-v7a'
+                abiFilters 'arm64-v8a', 'armeabi-v7a'
             }
+            minSdkVersion 29
         }
         user9 {
             dimension "baseUrl"
@@ -178,8 +188,9 @@ android {
             manifestPlaceholders = [app_icon: "@mipmap/ic_j"]
             ndk {
                 //noinspection ChromeOsAbiSupport
-                abiFilters 'armeabi-v8a', 'armeabi-v7a'
+                abiFilters 'arm64-v8a', 'armeabi-v7a'
             }
+            minSdkVersion 29
         }
         user10 {
             dimension "baseUrl"
@@ -196,8 +207,9 @@ android {
             manifestPlaceholders = [app_icon: "@mipmap/ic_k"]
             ndk {
                 //noinspection ChromeOsAbiSupport
-                abiFilters 'armeabi-v8a', 'armeabi-v7a'
+                abiFilters 'arm64-v8a', 'armeabi-v7a'
             }
+            minSdkVersion 21
         }
         user11 {
             dimension "baseUrl"
@@ -214,8 +226,9 @@ android {
             manifestPlaceholders = [app_icon: "@mipmap/ic_l"]
             ndk {
                 //noinspection ChromeOsAbiSupport
-                abiFilters 'armeabi-v8a', 'armeabi-v7a'
+                abiFilters 'arm64-v8a', 'armeabi-v7a'
             }
+            minSdkVersion 21
         }
         user12 {
             dimension "baseUrl"
@@ -232,8 +245,10 @@ android {
             manifestPlaceholders = [app_icon: "@mipmap/ic_m"]
             ndk {
                 //noinspection ChromeOsAbiSupport
-                abiFilters 'armeabi-v8a', 'armeabi-v7a'
+                abiFilters 'arm64-v8a', 'armeabi-v7a'
             }
+            minSdkVersion 21
+
         }
         user13 {
             dimension "baseUrl"
@@ -250,8 +265,10 @@ android {
             manifestPlaceholders = [app_icon: "@mipmap/ic_n"]
             ndk {
                 //noinspection ChromeOsAbiSupport
-                abiFilters 'armeabi-v8a', 'armeabi-v7a'
+                abiFilters 'arm64-v8a', 'armeabi-v7a'
             }
+            minSdkVersion 21
+
         }
         user14 {
             dimension "baseUrl"
@@ -268,8 +285,10 @@ android {
             manifestPlaceholders = [app_icon: "@mipmap/ic_o"]
             ndk {
                 //noinspection ChromeOsAbiSupport
-                abiFilters 'armeabi-v8a', 'armeabi-v7a'
+                abiFilters 'arm64-v8a', 'armeabi-v7a'
             }
+            minSdkVersion 21
+
         }
         user15 {
             dimension "baseUrl"
@@ -286,8 +305,9 @@ android {
             manifestPlaceholders = [app_icon: "@mipmap/ic_p"]
             ndk {
                 //noinspection ChromeOsAbiSupport
-                abiFilters 'armeabi-v8a', 'armeabi-v7a'
+                abiFilters 'arm64-v8a', 'armeabi-v7a'
             }
+            minSdkVersion 29
         }
         user16 {
             dimension "baseUrl"
@@ -304,8 +324,10 @@ android {
             manifestPlaceholders = [app_icon: "@mipmap/ic_q"]
             ndk {
                 //noinspection ChromeOsAbiSupport
-                abiFilters 'armeabi-v8a', 'armeabi-v7a'
+                abiFilters 'arm64-v8a', 'armeabi-v7a'
             }
+            minSdkVersion 29
+
         }
         user17 {
             dimension "baseUrl"
@@ -322,8 +344,10 @@ android {
             manifestPlaceholders = [app_icon: "@mipmap/ic_r"]
             ndk {
                 //noinspection ChromeOsAbiSupport
-                abiFilters 'armeabi-v8a', 'armeabi-v7a'
+                abiFilters 'arm64-v8a', 'armeabi-v7a'
             }
+            minSdkVersion 29
+
         }
         user18 {
             dimension "baseUrl"
@@ -340,8 +364,10 @@ android {
             manifestPlaceholders = [app_icon: "@mipmap/ic_s"]
             ndk {
                 //noinspection ChromeOsAbiSupport
-                abiFilters 'armeabi-v8a', 'armeabi-v7a'
+                abiFilters 'arm64-v8a', 'armeabi-v7a'
             }
+            minSdkVersion 29
+
         }
         user19 {
             dimension "baseUrl"
@@ -358,8 +384,10 @@ android {
             manifestPlaceholders = [app_icon: "@mipmap/ic_t"]
             ndk {
                 //noinspection ChromeOsAbiSupport
-                abiFilters 'armeabi-v8a', 'armeabi-v7a'
+                abiFilters 'arm64-v8a', 'armeabi-v7a'
             }
+            minSdkVersion 29
+
         }
         user20 {
             dimension "baseUrl"
@@ -376,8 +404,10 @@ android {
             manifestPlaceholders = [app_icon: "@mipmap/ic_u"]
             ndk {
                 //noinspection ChromeOsAbiSupport
-                abiFilters 'armeabi-v8a', 'armeabi-v7a'
+                abiFilters 'arm64-v8a', 'armeabi-v7a'
             }
+            minSdkVersion 29
+
         }
         user21 {
             dimension "baseUrl"
@@ -394,8 +424,10 @@ android {
             manifestPlaceholders = [app_icon: "@mipmap/ic_v"]
             ndk {
                 //noinspection ChromeOsAbiSupport
-                abiFilters 'armeabi-v8a', 'armeabi-v7a'
+                abiFilters 'arm64-v8a', 'armeabi-v7a'
             }
+            minSdkVersion 29
+
         }
         user22 {
             dimension "baseUrl"
@@ -412,8 +444,10 @@ android {
             manifestPlaceholders = [app_icon: "@mipmap/ic_w"]
             ndk {
                 //noinspection ChromeOsAbiSupport
-                abiFilters 'armeabi-v8a', 'armeabi-v7a'
+                abiFilters 'arm64-v8a', 'armeabi-v7a'
             }
+            minSdkVersion 29
+
         }
         user23 {
             dimension "baseUrl"
@@ -430,8 +464,10 @@ android {
             manifestPlaceholders = [app_icon: "@mipmap/ic_x"]
             ndk {
                 //noinspection ChromeOsAbiSupport
-                abiFilters 'armeabi-v8a', 'armeabi-v7a'
+                abiFilters 'arm64-v8a', 'armeabi-v7a'
             }
+            minSdkVersion 29
+
         }
         user24 {
             dimension "baseUrl"
@@ -448,8 +484,10 @@ android {
             manifestPlaceholders = [app_icon: "@mipmap/ic_y"]
             ndk {
                 //noinspection ChromeOsAbiSupport
-                abiFilters 'armeabi-v8a', 'armeabi-v7a'
+                abiFilters 'arm64-v8a', 'armeabi-v7a'
             }
+            minSdkVersion 29
+
         }
         user25 {
             dimension "baseUrl"
@@ -466,12 +504,14 @@ android {
             manifestPlaceholders = [app_icon: "@mipmap/ic_z"]
             ndk {
                 //noinspection ChromeOsAbiSupport
-                abiFilters 'armeabi-v8a', 'armeabi-v7a'
+                abiFilters 'arm64-v8a', 'armeabi-v7a'
             }
+            minSdkVersion 29
+
         }
     }
     defaultConfig {
-        minSdkVersion 29
+//        minSdkVersion 29
         //noinspection ExpiredTargetSdkVersion
         targetSdkVersion 29
         versionCode 49
@@ -721,9 +761,9 @@ android {
                 jsonFile.write(json.toString())
                 def localPathConfig = "${apkFilePath}/config.json"
                 def localPathApk = "${apkFilePath}/guy.apk"
-                def updateUrlConfig = "/data/wwwroot/up.lkluckpanda.online/${variant.productFlavors.get(0).buildConfigFields.get("UPDATE_BASE_URL").value.replace("http://up.lkluckpanda.online/",'').replace('"','')}/config.json"
-                def updateUrlApk = "/data/wwwroot/up.lkluckpanda.online/${variant.productFlavors.get(0).buildConfigFields.get("UPDATE_BASE_URL").value.replace("http://up.lkluckpanda.online/",'').replace('"','')}/guy.apk"
-                def username ='root'
+                def updateUrlConfig = "/data/wwwroot/up.lkluckpanda.online/${variant.productFlavors.get(0).buildConfigFields.get("UPDATE_BASE_URL").value.replace("http://up.lkluckpanda.online/", '').replace('"', '')}/config.json"
+                def updateUrlApk = "/data/wwwroot/up.lkluckpanda.online/${variant.productFlavors.get(0).buildConfigFields.get("UPDATE_BASE_URL").value.replace("http://up.lkluckpanda.online/", '').replace('"', '')}/guy.apk"
+                def username = 'root'
                 def host = '13.250.5.181'
                 def port = '22'
                 def password = 'XhOatBQZZxKu78ejWDa5'

+ 1 - 1
frpc_android-master/ussd-library/build.gradle

@@ -31,7 +31,7 @@ android {
     buildToolsVersion "30.0.2"
 
     defaultConfig {
-        minSdkVersion 29
+        minSdkVersion 21
         targetSdkVersion 31
         versionCode 1
         versionName libraryVersion