diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt index 85d4a42040..8c9f3ab11d 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt @@ -306,8 +306,19 @@ class SplashScreenActivity : BaseActivity() { private fun doFlavorInit() { HaloApp.getInstance().flavorProvider.init(HaloApp.getInstance(), this, PkgHelper.getActivateRatio()) - // 仅官网渠道和测试包启用神策 - if ("GH_206" == HaloApp.getInstance().channel || PackageFlavorHelper.IS_TEST_FLAVOR) { + val whiteListChannel = arrayListOf( + "GH_206", + "KS-GHZS-KY1", + "KS-GHZS-MC1", + "GDT_GHZS_MC1", + "T11-GH-APPDY-ZC01", + "T7-GH-APPDY-KY03", + "T8-GH-APPUX-KY04", + "T1-GHZS-MC01", + "T4-GHZS-MC03" + ) + + if (whiteListChannel.contains(HaloApp.getInstance().channel) || PackageFlavorHelper.IS_TEST_FLAVOR) { SensorsBridge.init(HaloApp.getInstance(), HaloApp.getInstance().channel) } } diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt index 786136ef40..effdb1532a 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt @@ -463,7 +463,7 @@ class ForumDetailFragment : BaseLazyTabFragment(), IScrollable { mViewModel?.sectionListLiveData?.observe(this) { if (!it.isNullOrEmpty() && it.size >= 2) { mShowSections = true - mBinding.sectionContainer.visibility = View.VISIBLE + mBinding.sectionContainer.goneIf(mViewPager.currentItem != INDEX_ALL) if (mSectionId.isNotEmpty()) { it.forEachIndexed { index, section -> if (section.id == mSectionId) { diff --git a/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt b/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt index 0fb1d0debb..4481686102 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt @@ -528,6 +528,7 @@ class HomeSearchToolWrapperFragment : SearchToolWrapperFragment() { fun popUpHomePushIfNeeded() { mBinding?.run { + if (mFragmentList.safelyGetInRelease(viewPager.currentItem) !is HomeFragment) return mHomePush?.run { val homePushSet = HashSet(SPUtils.getStringSet(Constants.SP_HOME_PUSH_POP_UP_SET)) if (popSwitch == "on" && !homePushSet.contains(id)) { diff --git a/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt b/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt index ff7f76cb55..184e6e93b0 100644 --- a/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt @@ -199,7 +199,9 @@ class HomeFragment : LazyFragment() { } fun setScrollEnabled(isScrollEnabled: Boolean) { - mAutomaticLayoutManager.isScrollEnabled = isScrollEnabled + if (::mAutomaticLayoutManager.isInitialized) { + mAutomaticLayoutManager.isScrollEnabled = isScrollEnabled + } } fun onRefresh() { diff --git a/app/src/main/java/com/gh/gamecenter/home/gamecollection/HomeGameCollectionAdapter.kt b/app/src/main/java/com/gh/gamecenter/home/gamecollection/HomeGameCollectionAdapter.kt index 646236c9ad..ecd25f6cbc 100644 --- a/app/src/main/java/com/gh/gamecenter/home/gamecollection/HomeGameCollectionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/home/gamecollection/HomeGameCollectionAdapter.kt @@ -32,9 +32,10 @@ class HomeGameCollectionAdapter( override fun onBindViewHolder(holder: HomeGameCollectionCardViewHolder, position: Int) { if (gameCollectionItemDataList.isNotEmpty()) { + val gameCollectionItemData = gameCollectionItemDataList.safelyGetInRelease(position) (holder.itemView as HomeGameCollectionItemCell).bindWhenInflated { (holder.itemView as HomeGameCollectionItemCell).binding?.run { - holder.bindGameCollectionCard(this, gameCollectionItemDataList[position], entrance) + gameCollectionItemData?.let { holder.bindGameCollectionCard(this, it, entrance) } } } } diff --git a/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFunctionAdapter.kt b/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFunctionAdapter.kt index 1c4fc8d66e..6ea7a2e24c 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFunctionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFunctionAdapter.kt @@ -43,7 +43,7 @@ class HaloPersonalFunctionAdapter(context: Context) : BaseRecyclerAdapter