diff --git a/app/build.gradle b/app/build.gradle index 1167f530ac..95ed12e156 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -214,9 +214,6 @@ android { kuaishou { dimension "env" - String KUAI_SHOU_APP_ID = "" - String KUAI_SHOU_APP_NAME = "" - buildConfigField "String", "DEV_API_HOST", "\"${API_HOST}\"" buildConfigField "String", "NEW_DEV_API_HOST", "\"${NEW_API_HOST}\"" buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\"" diff --git a/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperViewModel.kt b/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperViewModel.kt index 970d6cac4d..fd3fb0c3fa 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperViewModel.kt @@ -84,6 +84,7 @@ class HomeSearchToolWrapperViewModel(application: Application) : AndroidViewMode if (pkgLinkEntity.type == tab.type && (pkgLinkEntity.link == tab.link || tab.link == null)) { defaultTabPosition = index + PkgHelper.markConfigUsed() break } } diff --git a/app/src/main/java/com/gh/gamecenter/pkg/PkgHelper.kt b/app/src/main/java/com/gh/gamecenter/pkg/PkgHelper.kt index da5ee44180..5443b55c8c 100644 --- a/app/src/main/java/com/gh/gamecenter/pkg/PkgHelper.kt +++ b/app/src/main/java/com/gh/gamecenter/pkg/PkgHelper.kt @@ -26,7 +26,7 @@ object PkgHelper { /** * 获取激活比例 */ - fun getActivateRatio() : Int { + fun getActivateRatio(): Int { return if (mActivateRatioFromInternet > 0) { mActivateRatioFromInternet } else { @@ -42,19 +42,18 @@ object PkgHelper { } fun getPkgConfig(isFromHomeTopTab: Boolean): PkgConfigEntity.PkgLinkEntity? { - if (mPkgConfigLink == null - && !SPUtils.getBoolean(SP_PKG_CONFIG_IS_USED, false) + if (!SPUtils.getBoolean(SP_PKG_CONFIG_IS_USED, false) && BuildConfig.FIRST_LAUNCH.isNotEmpty() ) { - - mPkgConfigLink = - String(Base64.decode(BuildConfig.FIRST_LAUNCH, Base64.DEFAULT), Charset.defaultCharset()).toObject() + if (mPkgConfigLink == null) { + mPkgConfigLink = + String(Base64.decode(BuildConfig.FIRST_LAUNCH, Base64.DEFAULT), Charset.defaultCharset()).toObject() + } mTempPkgConfigEntity = mPkgConfigLink return if (isFromHomeTopTab) { - if (mPkgConfigLink?.shouldStayAtHomePage != true && mPkgConfigLink?.homeBottomTab == "home") { - markConfigUsed() + if (mPkgConfigLink?.shouldStayAtHomePage == true && mPkgConfigLink?.homeBottomTab == "home") { mPkgConfigLink } else { null @@ -77,7 +76,7 @@ object PkgHelper { } /** - * 获取特殊包配置 + * 从接口获取特殊包配置 */ fun requestPkgConfig(configId: String) { if (SPUtils.getBoolean(SP_PKG_CONFIG_IS_USED, false)) return