Merge remote-tracking branch 'origin/master'

This commit is contained in:
level 2025-02-14 18:51:19 +08:00
commit f91b72f54d
4 changed files with 24 additions and 3 deletions

View File

@ -762,7 +762,7 @@ class NewMainActivity : BaseActivity() {
telegramBtn.setOnClickListener {//电报 telegramBtn.setOnClickListener {//电报
var uri = Uri.parse(BZYConstants.DefTGUrl) var uri = Uri.parse(BZYConstants.DefTGUrl)
val intent = Intent(Intent.ACTION_VIEW) val intent = Intent(Intent.ACTION_VIEW)
if (BuildConfig.productId == "182265") { if (BuildConfig.is_tz) {
uri = Uri.parse(BZYConstants.TZTGUrl) uri = Uri.parse(BZYConstants.TZTGUrl)
} else { } else {
if (BuildConfig.is_ym) { if (BuildConfig.is_ym) {

View File

@ -13,7 +13,7 @@ class Conf {
} }
fun getClashConfName(context: Context?): String { fun getClashConfName(context: Context?): String {
if (BuildConfig.productId == "182265") { if (BuildConfig.is_tz) {
return context?.getString(R.string.app_name_taizi)!! return context?.getString(R.string.app_name_taizi)!!
} else { } else {
if (BuildConfig.is_ym) { if (BuildConfig.is_ym) {

View File

@ -68,7 +68,7 @@ class BZYWebViewKeFu : AppCompatActivity() {
// } // }
// } // }
if (BuildConfig.productId == "182265") { if (BuildConfig.is_tz) {
webView.loadUrl("file:///android_asset/TZKeFu.html") webView.loadUrl("file:///android_asset/TZKeFu.html")
} else { } else {
if (BuildConfig.is_ym) { if (BuildConfig.is_ym) {

View File

@ -1181,6 +1181,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") { create("22222") {