Merge remote-tracking branch 'origin/release' into dev

This commit is contained in:
juntao
2024-06-20 14:26:11 +08:00

View File

@ -14,10 +14,10 @@ class PkgConfigProviderImpl: IPkgConfigProvider {
override fun getPkgConfig(): ArrayList<String> {
val configList = arrayListOf<String>()
val sdk = when (BuildConfig.FLAVOR) {
"tea" -> "头条"
"kuaishou" -> "快手"
"gdt" -> "广点通"
val sdk = when {
BuildConfig.FLAVOR.contains("tea") -> "头条"
BuildConfig.FLAVOR.contains("kuaishou") -> "快手"
BuildConfig.FLAVOR.contains("gdt") -> "广点通"
else -> "普通包"
} + " " + BuildConfig.SDK_VERSION + " (仅头条有效)"
@ -28,7 +28,7 @@ class PkgConfigProviderImpl: IPkgConfigProvider {
}
configList.add(sdk)
if (BuildConfig.FLAVOR == "kuaishou") {
if (BuildConfig.FLAVOR.contains("kuaishou")) {
configList.add("appid: ${BuildConfig.SDK_APP_ID.ifEmpty { "81537" }}")
configList.add("appname: ${BuildConfig.SDK_APP_NAME.ifEmpty { "guanghuanzhushou_1"}}")
}