From 70eb8ea596c351974cd3b073d5693600e3c16881 Mon Sep 17 00:00:00 2001 From: cyh Date: Thu, 13 Feb 2025 14:23:38 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=A4=AA=E5=AD=90=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yingmao/clash/act/NewMainActivity.kt | 2 +- .../main/java/com/yingmao/clash/conf/Conf.kt | 2 +- .../yingmao/clash/webview/BZYWebViewKeFu.kt | 2 +- build.gradle.kts | 21 +++++++++++++++++++ 4 files changed, 24 insertions(+), 3 deletions(-) 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 c19ead2..5be2008 100644 --- a/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt @@ -762,7 +762,7 @@ class NewMainActivity : BaseActivity() { telegramBtn.setOnClickListener {//电报 var uri = Uri.parse(BZYConstants.DefTGUrl) val intent = Intent(Intent.ACTION_VIEW) - if (BuildConfig.productId == "182265") { + if (BuildConfig.is_tz) { uri = Uri.parse(BZYConstants.TZTGUrl) } else { if (BuildConfig.is_ym) { diff --git a/app/src/main/java/com/yingmao/clash/conf/Conf.kt b/app/src/main/java/com/yingmao/clash/conf/Conf.kt index baa1fdf..5ea705b 100644 --- a/app/src/main/java/com/yingmao/clash/conf/Conf.kt +++ b/app/src/main/java/com/yingmao/clash/conf/Conf.kt @@ -13,7 +13,7 @@ class Conf { } fun getClashConfName(context: Context?): String { - if (BuildConfig.productId == "182265") { + if (BuildConfig.is_tz) { return context?.getString(R.string.app_name_taizi)!! } else { if (BuildConfig.is_ym) { diff --git a/app/src/main/java/com/yingmao/clash/webview/BZYWebViewKeFu.kt b/app/src/main/java/com/yingmao/clash/webview/BZYWebViewKeFu.kt index 4b6a78a..d6a841d 100644 --- a/app/src/main/java/com/yingmao/clash/webview/BZYWebViewKeFu.kt +++ b/app/src/main/java/com/yingmao/clash/webview/BZYWebViewKeFu.kt @@ -68,7 +68,7 @@ class BZYWebViewKeFu : AppCompatActivity() { // } // } - if (BuildConfig.productId == "182265") { + if (BuildConfig.is_tz) { webView.loadUrl("file:///android_asset/TZKeFu.html") } else { if (BuildConfig.is_ym) { diff --git a/build.gradle.kts b/build.gradle.kts index 176eea7..e172d9a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1180,6 +1180,27 @@ subprojects { ) ) } + create("182270") { + isDefault = true + dimension = flavorDimensionList[0] + buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")") + if (isApp) { +// applicationIdSuffix = ".meta" + } + buildConfigField("boolean", "is_back_cn", "false") + 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.otcopusvpn.cc:18008\"") + buildConfigField("String", "productId", "\"182270\"") + manifestPlaceholders( + mapOf( + "APP_NAME" to "@string/app_name_taizi", + "APP_ICON" to "@mipmap/ic_taizi_logo" + ) + ) + } //----自由包八爪鱼 create("22222") {