diff --git a/app/src/main/java/com/yingmao/clash/webview/CustomerServiceWebView.kt b/app/src/main/java/com/yingmao/clash/webview/CustomerServiceWebView.kt index 3435a57..9a44083 100644 --- a/app/src/main/java/com/yingmao/clash/webview/CustomerServiceWebView.kt +++ b/app/src/main/java/com/yingmao/clash/webview/CustomerServiceWebView.kt @@ -23,6 +23,7 @@ import androidx.constraintlayout.widget.ConstraintLayout import androidx.lifecycle.ViewModelProvider import com.cncat.vpn.common.log.Log 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 @@ -102,7 +103,8 @@ class CustomerServiceWebView:BaseActivity() { .encode(BZYConstants.MMKV_KEY_KEFU_HOST, str) } customerServiceHost = str - csWebView.loadUrl(str+"&app_account=${enName}") + csWebView.loadUrl(str+"&app_account=${enName}"+"&app_t=${resources.getString(R.string.yijianlian)}"+"&app_v=${BuildConfig.VERSION_NAME}."+BuildConfig.productId) + } override fun err() { @@ -112,12 +114,13 @@ class CustomerServiceWebView:BaseActivity() { MMKV.defaultMMKV() .encode(BZYConstants.MMKV_KEY_KEFU_HOST, str) } - csWebView.loadUrl(str+"&app_account=${enName}") + csWebView.loadUrl(str+"&app_account=${enName}"+"&app_t=${resources.getString(R.string.yijianlian)}"+"&app_v=${BuildConfig.VERSION_NAME}."+BuildConfig.productId) } override fun err() { if (!TextUtils.isEmpty(mmkvHost)) { - csWebView.loadUrl(mmkvHost + "&app_account=${enName}") + csWebView.loadUrl(mmkvHost+"&app_account=${enName}"+"&app_t=${resources.getString(R.string.yijianlian)}"+"&app_v=${BuildConfig.VERSION_NAME}."+BuildConfig.productId) + } } diff --git a/build.gradle.kts b/build.gradle.kts index cbafc0d..a9f8ce7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -93,7 +93,7 @@ subprojects { } productFlavors { flavorDimensions("feature") - create("66666") { + create("7077") { isDefault = true dimension = flavorDimensionList[0] buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")") @@ -104,7 +104,7 @@ subprojects { buildConfigField("String", "applicationId", "\"com.jsq.wufu\"") buildConfigField("String", "service_url", "\"https://api.yijianlianjsq.com/\"") buildConfigField("boolean", "is_free", "false") - buildConfigField("String", "productId", "\"66666\"") + buildConfigField("String", "productId", "\"7077\"") manifestPlaceholders( mapOf( "APP_NAME" to "@string/wf", @@ -112,7 +112,8 @@ subprojects { ) ) } - create("2222") { + + create("8088") { isDefault = true dimension = flavorDimensionList[0] buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")") @@ -123,7 +124,7 @@ subprojects { buildConfigField("String", "applicationId", "\"com.jsq.wufu\"") buildConfigField("String", "service_url", "\"https://api.yijianlianjsq.com/\"") buildConfigField("boolean", "is_free", "false") - buildConfigField("String", "productId", "\"2222\"") + buildConfigField("String", "productId", "\"8088\"") manifestPlaceholders( mapOf( "APP_NAME" to "@string/wf", @@ -131,9 +132,29 @@ subprojects { ) ) } + create("9099") { + 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("boolean", "is_yunti", "false") + buildConfigField("String", "applicationId", "\"com.jsq.wufu\"") + buildConfigField("String", "service_url", "\"https://api.yijianlianjsq.com/\"") + buildConfigField("boolean", "is_free", "false") + buildConfigField("String", "productId", "\"9099\"") + manifestPlaceholders( + mapOf( + "APP_NAME" to "@string/wf", + "APP_ICON" to "@mipmap/oneclickconnection" + ) + ) + } + } sourceSets { - getByName("2222") { + getByName("8088") { java.srcDirs("src/foss/java") } }