From af4e5e5baa0248904e9924b63cef5082cb5b2d75 Mon Sep 17 00:00:00 2001 From: cyh Date: Tue, 29 Oct 2024 17:42:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=AA=E5=AD=90=E5=A4=87?= =?UTF-8?q?=E7=94=A8=E6=BA=90,=E6=B7=BB=E5=8A=A0=E5=A4=AA=E5=AD=90?= =?UTF-8?q?=E5=92=8C=E5=85=AB=E7=88=AA=E9=B1=BC=E9=98=B2=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clash/act/LossPreventionActivity.kt | 16 ++- .../com/yingmao/clash/act/SplashActivity.kt | 5 +- .../com/yingmao/clash/net/http/HttpApi.kt | 2 + .../java/com/yingmao/clash/vm/SplashAtyVM.kt | 14 +- build.gradle.kts | 128 ++++++++++++++---- 5 files changed, 133 insertions(+), 32 deletions(-) diff --git a/app/src/main/java/com/yingmao/clash/act/LossPreventionActivity.kt b/app/src/main/java/com/yingmao/clash/act/LossPreventionActivity.kt index fe68bd1..a4fb318 100644 --- a/app/src/main/java/com/yingmao/clash/act/LossPreventionActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/LossPreventionActivity.kt @@ -19,6 +19,7 @@ import com.bumptech.glide.Glide import com.yingmao.clash.view.dialog.RxDialogShapeLoading import com.tencent.mmkv.MMKV +import com.yingmao.clash.BuildConfig import com.yingmao.clash.R import com.yingmao.clash.base.BaseActivity import com.yingmao.clash.conf.BZYConstants @@ -48,7 +49,14 @@ class LossPreventionActivity : BaseActivity() { } } - Glide.with(this).load("https://www.lead2win.cc/assets/yingmao.jpg").fitCenter() + var fdsUrl = if (BuildConfig.is_ym) { + "https://yingmao.oss-cn-hongkong.aliyuncs.com/fds/fds_yingmao.jpg" + } else if (BuildConfig.is_tz) { + "https://yingmao.oss-cn-hongkong.aliyuncs.com/fds/fds_taizi.png" + } else { + "https://yingmao.oss-cn-hongkong.aliyuncs.com/fds/fds_bzy.png" + } + Glide.with(this).load(fdsUrl).fitCenter() .into(iv_lossper!!) } @@ -58,7 +66,11 @@ class LossPreventionActivity : BaseActivity() { MediaStore.Images.Media.EXTERNAL_CONTENT_URI, ContentValues() ) ?: kotlin.run { - Toast.makeText(this@LossPreventionActivity, "存储失败,请使用屏幕截屏功能保存", Toast.LENGTH_SHORT).show() + Toast.makeText( + this@LossPreventionActivity, + "存储失败,请使用屏幕截屏功能保存", + Toast.LENGTH_SHORT + ).show() } this@LossPreventionActivity.contentResolver.openOutputStream(imageUrl as Uri).use { iv_lossper?.let { iv -> diff --git a/app/src/main/java/com/yingmao/clash/act/SplashActivity.kt b/app/src/main/java/com/yingmao/clash/act/SplashActivity.kt index 668237d..69fb809 100644 --- a/app/src/main/java/com/yingmao/clash/act/SplashActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/SplashActivity.kt @@ -103,7 +103,6 @@ class SplashActivity : BaseActivity() { // } - var clashBinder = MainApplication.getApp()?.let { ClashManager(it).wrap() as IClashManager } @@ -117,14 +116,16 @@ class SplashActivity : BaseActivity() { registerKey = cb.getRegisterKey(si) registerIV2 = cb.getRegisterKiv(si) // com.yingmao.clash.common.log.Log.d("si==>${si}, ss1==>${ss1}, ss2==>${ss2}") + AESUtil.KEY2 = ss1 AESUtil.IV2 = ss2 +// com.yingmao.clash.common.log.Log.d("encrypt:"+ AESUtil.byteArrayToHexStr(AESUtil.encrypt("https://api.otcopusvpn.cc:18008"))) val routerSet = MMKV.defaultMMKV().decodeStringSet(BZYConstants.MMKV_KEY_ROUTER_HOST) if (routerSet != null && routerSet.size > 0) { isNeedRegister() } else { - if (BuildConfig.productId == "182265" || BuildConfig.is_back_cn == true) { //太子没有备用域名所以无需调用getHost + if (BuildConfig.is_back_cn == true) { //没有备用域名所以无需调用getHost isNeedRegister() } else { splashAtyVM.getHost(object : AsyncCallback { diff --git a/app/src/main/java/com/yingmao/clash/net/http/HttpApi.kt b/app/src/main/java/com/yingmao/clash/net/http/HttpApi.kt index 284eafb..1dec46b 100644 --- a/app/src/main/java/com/yingmao/clash/net/http/HttpApi.kt +++ b/app/src/main/java/com/yingmao/clash/net/http/HttpApi.kt @@ -163,6 +163,8 @@ interface HttpApi { @GET("/hostdef.txt") suspend fun getHostDef(): String + @GET("/hosttaizi.txt") + suspend fun getHostTZ(): String // @Headers( // "User-Agent: Octopus_Android" // ) diff --git a/app/src/main/java/com/yingmao/clash/vm/SplashAtyVM.kt b/app/src/main/java/com/yingmao/clash/vm/SplashAtyVM.kt index 224bd33..8a6a7b7 100644 --- a/app/src/main/java/com/yingmao/clash/vm/SplashAtyVM.kt +++ b/app/src/main/java/com/yingmao/clash/vm/SplashAtyVM.kt @@ -43,7 +43,8 @@ class SplashAtyVM : PublicViewMode() { fun getHost(function: () -> Job) { NetService.instances - val rt = NetService.instances.createFreeBaseUrl("https://yingmao.oss-cn-hongkong.aliyuncs.com/") + val rt = + NetService.instances.createFreeBaseUrl("https://yingmao.oss-cn-hongkong.aliyuncs.com/") doAsyncNoNeedReturn(HttpReqType.GET_HOST) { try { //TODO bug 会引起崩溃 @@ -64,26 +65,28 @@ class SplashAtyVM : PublicViewMode() { } fun getHost(callback: AsyncCallback) { - val rt = NetService.instances.createFreeBaseUrl("https://yingmao.oss-cn-hongkong.aliyuncs.com/") + val rt = + NetService.instances.createFreeBaseUrl("https://yingmao.oss-cn-hongkong.aliyuncs.com/") doAsyncNoNeedReturn(HttpReqType.GET_HOST) { try { //TODO bug 会引起崩溃 if (BuildConfig.productId == "182265") { } else { - var host = if (BuildConfig.is_ym) { rt.getHost() + } else if (true == BuildConfig.is_tz) { + rt.getHostTZ() } else { rt.getHostDef() } Log.e("data", "2:$host") if (!TextUtils.isEmpty(host)) { - host= AESUtil.decrypt(host) + host = AESUtil.decrypt(host) val hostSet = host.split("+").toSet() MMKV.defaultMMKV().encode(BZYConstants.MMKV_KEY_ROUTER_HOST, hostSet) } - Log.e("data", "22:$host") +// Log.e("data", "22:$host") } callback.suc() } catch (e: Exception) { @@ -101,6 +104,7 @@ class SplashAtyVM : PublicViewMode() { httpApi.register(params) } } + fun registerByEncryption(params: Map) { Log.e("data", "register ....") val httpApi = NetService.instances.createHttps(HttpApi::class.java) diff --git a/build.gradle.kts b/build.gradle.kts index 7769b78..8956590 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -51,8 +51,8 @@ subprojects { minSdk = 21 //noinspection ExpiredTargetSdkVersion targetSdk = 31 - versionName = "1.0.2.1" - versionCode = 1021 + versionName = "1.0.2.2" + versionCode = 1022 resValue("string", "release_name", "v$versionName") resValue("integer", "release_code", "$versionCode") externalNativeBuild { @@ -92,6 +92,7 @@ subprojects { buildConfigField("boolean", "is_free", "false") buildConfigField("boolean", "is_back_cn", "true") buildConfigField("boolean", "is_ym", "false") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") buildConfigField("String", "service_url", "\"https://api.huiguovpn.win\"") buildConfigField("String", "productId", "\"1000\"") @@ -104,6 +105,62 @@ subprojects { //影猫 + + create("2917") { + 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", "\"2917\"") + manifestPlaceholders( + mapOf( + "APP_NAME" to "@string/app_name_gz", "APP_ICON" to "@mipmap/ic_logo_9972" + ) + ) + } + create("8300") { + isDefault = true + dimension = flavorDimensionList[0] + buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")") + if (isApp) { + } + 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", "\"8300\"") + manifestPlaceholders( + mapOf( + "APP_NAME" to "@string/app_name_gz", "APP_ICON" to "@mipmap/ic_logo_9972" + ) + ) + } + create("8937") { + isDefault = true + dimension = flavorDimensionList[0] + buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")") + if (isApp) { + } + 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", "\"8937\"") + manifestPlaceholders( + mapOf( + "APP_NAME" to "@string/app_name_gz", "APP_ICON" to "@mipmap/ic_logo_9972" + ) + ) + } create("6768") { isDefault = true dimension = flavorDimensionList[0] @@ -112,6 +169,7 @@ subprojects { } 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") @@ -131,6 +189,7 @@ subprojects { } 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.gaogaoshousoft.cc:8700\"") buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") @@ -152,6 +211,7 @@ subprojects { } 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.gaogaoshousoft.cc:8700\"") buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") @@ -175,6 +235,7 @@ subprojects { } 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.gaogaoshousoft.cc:8700\"") buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") @@ -198,7 +259,7 @@ subprojects { buildConfigField("boolean", "is_back_cn", "false") buildConfigField("boolean", "is_ym", "true") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") -// buildConfigField("String", "service_url", "\"https://api.gaogaoshousoft.cc:8700\"") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") buildConfigField("boolean", "is_free", "false") buildConfigField("String", "productId", "\"9686\"") @@ -219,6 +280,7 @@ subprojects { buildConfigField("boolean", "is_back_cn", "false") buildConfigField("boolean", "is_ym", "true") buildConfigField("boolean", "is_free", "false") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") buildConfigField("String", "productId", "\"6789\"") @@ -238,6 +300,7 @@ subprojects { buildConfigField("boolean", "is_back_cn", "false") buildConfigField("boolean", "is_ym", "true") buildConfigField("boolean", "is_free", "false") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") buildConfigField("String", "productId", "\"3229\"") @@ -258,6 +321,7 @@ subprojects { buildConfigField("boolean", "is_back_cn", "false") buildConfigField("boolean", "is_ym", "true") buildConfigField("boolean", "is_free", "false") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") buildConfigField("String", "productId", "\"5352\"") @@ -278,6 +342,7 @@ subprojects { buildConfigField("boolean", "is_back_cn", "false") buildConfigField("boolean", "is_ym", "true") buildConfigField("boolean", "is_free", "false") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") buildConfigField("String", "productId", "\"9583\"") @@ -298,6 +363,7 @@ subprojects { buildConfigField("boolean", "is_back_cn", "false") buildConfigField("boolean", "is_ym", "true") buildConfigField("boolean", "is_free", "false") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") buildConfigField("String", "productId", "\"9952\"") @@ -317,6 +383,7 @@ subprojects { buildConfigField("boolean", "is_back_cn", "false") buildConfigField("boolean", "is_ym", "true") buildConfigField("boolean", "is_free", "false") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") buildConfigField("String", "productId", "\"7595\"") @@ -337,6 +404,7 @@ subprojects { buildConfigField("boolean", "is_back_cn", "false") buildConfigField("boolean", "is_ym", "true") buildConfigField("boolean", "is_free", "false") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") buildConfigField("String", "productId", "\"9738\"") @@ -356,6 +424,7 @@ subprojects { buildConfigField("boolean", "is_back_cn", "false") buildConfigField("boolean", "is_ym", "true") buildConfigField("boolean", "is_free", "false") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") // buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") @@ -376,6 +445,7 @@ subprojects { buildConfigField("boolean", "is_back_cn", "false") buildConfigField("boolean", "is_ym", "true") buildConfigField("boolean", "is_free", "false") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") // buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") @@ -393,6 +463,7 @@ subprojects { buildConfigField("boolean", "is_back_cn", "false") buildConfigField("boolean", "is_ym", "true") buildConfigField("boolean", "is_free", "false") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") buildConfigField("String", "productId", "\"1588\"") @@ -410,6 +481,7 @@ subprojects { buildConfigField("boolean", "is_back_cn", "false") buildConfigField("boolean", "is_ym", "true") buildConfigField("boolean", "is_free", "false") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") buildConfigField("String", "productId", "\"1595\"") @@ -430,7 +502,7 @@ subprojects { buildConfigField("boolean", "is_ym", "true") buildConfigField("boolean", "is_free", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") -// buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") buildConfigField("String", "productId", "\"1979\"") manifestPlaceholders( @@ -451,7 +523,7 @@ subprojects { buildConfigField("boolean", "is_ym", "true") buildConfigField("boolean", "is_free", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") -// buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") buildConfigField("String", "productId", "\"9059\"") manifestPlaceholders( @@ -470,6 +542,7 @@ subprojects { buildConfigField("boolean", "is_back_cn", "false") buildConfigField("boolean", "is_ym", "true") buildConfigField("boolean", "is_free", "false") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") buildConfigField("String", "productId", "\"6507\"") @@ -490,6 +563,7 @@ subprojects { buildConfigField("boolean", "is_back_cn", "false") buildConfigField("boolean", "is_ym", "true") buildConfigField("boolean", "is_free", "false") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") buildConfigField("String", "productId", "\"6193\"") @@ -510,6 +584,7 @@ subprojects { buildConfigField("boolean", "is_back_cn", "false") buildConfigField("boolean", "is_ym", "true") buildConfigField("boolean", "is_free", "false") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") buildConfigField("String", "productId", "\"6886\"") @@ -530,6 +605,7 @@ subprojects { buildConfigField("boolean", "is_back_cn", "false") buildConfigField("boolean", "is_ym", "true") buildConfigField("boolean", "is_free", "false") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") buildConfigField("String", "productId", "\"6159\"") @@ -549,6 +625,7 @@ subprojects { buildConfigField("boolean", "is_back_cn", "false") buildConfigField("boolean", "is_ym", "true") buildConfigField("boolean", "is_free", "false") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") buildConfigField("String", "productId", "\"1608\"") @@ -568,6 +645,7 @@ subprojects { buildConfigField("boolean", "is_back_cn", "false") buildConfigField("boolean", "is_ym", "true") buildConfigField("boolean", "is_free", "false") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") buildConfigField("String", "productId", "\"182242\"") @@ -589,7 +667,7 @@ subprojects { buildConfigField("boolean", "is_back_cn", "false") buildConfigField("boolean", "is_ym", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") -// buildConfigField("String", "service_url", "\"https://api.gaogaoshousoft.cc:8700\"") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "service_url", "\"https://app.bazhuayujiasu.cc:8700\"") buildConfigField("String", "productId", "\"182227\"") manifestPlaceholders( @@ -609,7 +687,7 @@ subprojects { buildConfigField("boolean", "is_back_cn", "false") buildConfigField("boolean", "is_ym", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") -// buildConfigField("String", "service_url", "\"https://api.gaogaoshousoft.cc:8700\"") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "service_url", "\"https://app.bazhuayujiasu.cc:8700\"") buildConfigField("String", "productId", "\"182250\"") manifestPlaceholders( @@ -629,7 +707,7 @@ subprojects { buildConfigField("boolean", "is_back_cn", "false") buildConfigField("boolean", "is_ym", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") -// buildConfigField("String", "service_url", "\"https://api.gaogaoshousoft.cc:8700\"") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "service_url", "\"https://app.bazhuayujiasu.cc:8700\"") buildConfigField("String", "productId", "\"182256\"") manifestPlaceholders( @@ -649,8 +727,8 @@ subprojects { buildConfigField("boolean", "is_free", "false") buildConfigField("boolean", "is_back_cn", "false") buildConfigField("boolean", "is_ym", "false") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") -// buildConfigField("String", "service_url", "\"https://api.gaogaoshousoft.cc:8700\"") buildConfigField("String", "service_url", "\"https://app.bazhuayujiasu.cc:8700\"") buildConfigField("String", "productId", "\"182251\"") manifestPlaceholders( @@ -667,7 +745,7 @@ subprojects { 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", "\"182258\"") manifestPlaceholders( @@ -684,7 +762,7 @@ subprojects { 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", "\"11111\"") manifestPlaceholders( @@ -701,7 +779,7 @@ subprojects { 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", "\"182254\"") manifestPlaceholders( @@ -718,7 +796,7 @@ subprojects { 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", "\"182223\"") manifestPlaceholders( @@ -735,7 +813,7 @@ subprojects { 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", "\"182222\"") manifestPlaceholders( @@ -751,6 +829,7 @@ subprojects { buildConfigField("boolean", "is_free", "false") buildConfigField("boolean", "is_back_cn", "false") buildConfigField("boolean", "is_ym", "false") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") buildConfigField("String", "service_url", "\"https://app.bazhuayujiasu.cc:8700\"") buildConfigField("String", "productId", "\"182257\"") @@ -768,7 +847,7 @@ subprojects { 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", "\"182225\"") manifestPlaceholders( @@ -785,7 +864,7 @@ subprojects { 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", "\"182224\"") manifestPlaceholders( @@ -802,7 +881,7 @@ subprojects { 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", "\"182226\"") manifestPlaceholders( @@ -819,7 +898,7 @@ subprojects { 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", "\"182261\"") manifestPlaceholders( @@ -837,7 +916,7 @@ subprojects { 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", "\"182221\"") manifestPlaceholders( @@ -854,7 +933,7 @@ subprojects { 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", "\"182228\"") manifestPlaceholders( @@ -871,7 +950,7 @@ subprojects { 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", "\"182253\"") manifestPlaceholders( @@ -891,10 +970,10 @@ subprojects { // applicationIdSuffix = ".meta" } buildConfigField("boolean", "is_back_cn", "false") - buildConfigField("boolean", "is_ym", "true") + buildConfigField("boolean", "is_ym", "false") + buildConfigField("boolean", "is_tz", "true") buildConfigField("boolean", "is_free", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") -// buildConfigField("String", "service_url", "\"https://api.gaogaoshousoft.cc:8700\"") buildConfigField("String", "service_url", "\"https://api.otcopusvpn.cc:18008\"") buildConfigField("String", "productId", "\"182265\"") manifestPlaceholders( @@ -916,6 +995,7 @@ subprojects { buildConfigField("boolean", "is_back_cn", "false") buildConfigField("boolean", "is_ym", "false") buildConfigField("boolean", "is_free", "true") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") // buildConfigField("String", "service_url", "\"https://api.gaogaoshousoft.cc:8700\"") buildConfigField("String", "service_url", "\"https://app.bazhuayujiasu.cc:8700\"") @@ -937,6 +1017,7 @@ subprojects { buildConfigField("boolean", "is_back_cn", "false") buildConfigField("boolean", "is_ym", "true") buildConfigField("boolean", "is_free", "true") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"") buildConfigField("String", "productId", "\"22222\"") @@ -957,6 +1038,7 @@ subprojects { buildConfigField("boolean", "is_back_cn", "false") buildConfigField("boolean", "is_ym", "true") buildConfigField("boolean", "is_free", "false") + buildConfigField("boolean", "is_tz", "false") buildConfigField("String", "applicationId", "\"com.yingmao.clash\"") // buildConfigField("String", "service_url", "\"https://113.108.210.50:21002\"") buildConfigField("String", "service_url", "\"https://test.yingmaox.cc:21002\"")