diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e4f9f44..0a569dd 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -158,16 +158,15 @@ tasks.getByName("clean", type = Delete::class) { delete(file(geoFilesDownloadDir + "/geosite.dat")) } android { - defaultConfig { ndk { abiFilters.add("arm64-v8a") abiFilters.add("armeabi-v7a") } } - sourceSets.all { - jniLibs.srcDir("src/main/jniLibs") - } +// sourceSets.all { +// jniLibs.srcDir("src/main/jniLibs") +// } } repositories { flatDir { diff --git a/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt b/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt index 8d7e899..256ebd1 100644 --- a/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt @@ -675,7 +675,7 @@ class NewMainActivity : BaseActivity() { // } // }) - findViewById(R.id.tv_version).text = resources.getString(R.string.edition)+"${BuildConfig.VERSION_NAME}" + findViewById(R.id.tv_version).text = resources.getString(R.string.edition)+"${BuildConfig.VERSION_NAME}."+BuildConfig.productId if (MMKV.defaultMMKV().decodeBool(BZYConstants.MMKV_KEY_IS_PERFECT)) { // 临时用户显示默认密码 @@ -955,7 +955,6 @@ class NewMainActivity : BaseActivity() { } endTimeInfo = dateFormat.format(validPeriod) } - }else{ if(decodeString == "English"){ val dateFormat = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { diff --git a/app/src/main/libs/common.aar b/app/src/main/libs/common.aar new file mode 100644 index 0000000..2a5e8d7 Binary files /dev/null and b/app/src/main/libs/common.aar differ diff --git a/app/src/main/libs/core.aar b/app/src/main/libs/core.aar new file mode 100644 index 0000000..fd313cd Binary files /dev/null and b/app/src/main/libs/core.aar differ diff --git a/app/src/main/libs/hideapi.aar b/app/src/main/libs/hideapi.aar new file mode 100644 index 0000000..ee463dd Binary files /dev/null and b/app/src/main/libs/hideapi.aar differ diff --git a/app/src/main/libs/service.aar b/app/src/main/libs/service.aar new file mode 100644 index 0000000..541d919 Binary files /dev/null and b/app/src/main/libs/service.aar differ diff --git a/build.gradle.kts b/build.gradle.kts index f206c6e..194a5c4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -90,7 +90,7 @@ subprojects { buildConfigField("boolean", "is_back_cn", "true") buildConfigField("boolean", "is_ym", "false") buildConfigField("boolean", "is_tz", "false") - buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") + buildConfigField("String", "applicationId", "\"com.kuaifei.clash\"") buildConfigField("String", "service_url", "\"https://api.huiguovpn.win\"") buildConfigField("String", "productId", "\"1000\"") manifestPlaceholders( @@ -101,6 +101,41 @@ subprojects { } //影猫 + create("7161") { + isDefault = true + dimension = flavorDimensionList[0] + buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")") + buildConfigField("boolean", "is_back_cn", "false") + buildConfigField("boolean", "is_ym", "true") + buildConfigField("boolean", "is_tz", "false") + buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") + buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") + buildConfigField("boolean", "is_free", "false") + buildConfigField("String", "productId", "\"7161\"") + manifestPlaceholders( + mapOf( + "APP_NAME" to "@string/app_name_gz", "APP_ICON" to "@mipmap/ic_logo_9972" + ) + ) + } + create("7669") { + isDefault = true + dimension = flavorDimensionList[0] + buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")") + buildConfigField("boolean", "is_back_cn", "false") + buildConfigField("boolean", "is_ym", "true") + buildConfigField("boolean", "is_tz", "false") + buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") + buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") + buildConfigField("boolean", "is_free", "false") + buildConfigField("String", "productId", "\"7669\"") + manifestPlaceholders( + mapOf( + "APP_NAME" to "@string/app_name_gz", "APP_ICON" to "@mipmap/ic_logo_9972" + ) + ) + } + create("1133") { isDefault = true dimension = flavorDimensionList[0] @@ -668,6 +703,23 @@ subprojects { ) } //八爪鱼 182227 182250 182256 182251 + create("1822275") { + isDefault = true + dimension = flavorDimensionList[0] + buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")") + buildConfigField("boolean", "is_free", "false") + buildConfigField("boolean", "is_back_cn", "false") + buildConfigField("boolean", "is_ym", "false") + buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") + buildConfigField("boolean", "is_tz", "false") + buildConfigField("String", "service_url", "\"https://app.bazhuayujiasu.cc:8700\"") + buildConfigField("String", "productId", "\"1822275\"") + manifestPlaceholders( + mapOf( + "APP_NAME" to "@string/app_name", "APP_ICON" to "@mipmap/logo" + ) + ) + } create("182227") { isDefault = true dimension = flavorDimensionList[0]