Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	dependencies.gradle
This commit is contained in:
chenjuntao
2023-05-19 15:55:10 +08:00
parent bde7685dc6 91ba665c4c
commit 119cdf4f91
9 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt
View File

@ -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<String>(
"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)
}
}

2
app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt
View File

@ -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) {

1
app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt
View File

@ -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)) {

4
app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt
View File

@ -199,7 +199,9 @@ class HomeFragment : LazyFragment() {
}
fun setScrollEnabled(isScrollEnabled: Boolean) {
mAutomaticLayoutManager.isScrollEnabled = isScrollEnabled
if (::mAutomaticLayoutManager.isInitialized) {
mAutomaticLayoutManager.isScrollEnabled = isScrollEnabled
}
}
fun onRefresh() {

3
app/src/main/java/com/gh/gamecenter/home/gamecollection/HomeGameCollectionAdapter.kt
View File

@ -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) }
}
}
}

2
app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFunctionAdapter.kt
View File

@ -43,7 +43,7 @@ class HaloPersonalFunctionAdapter(context: Context) : BaseRecyclerAdapter<Recycl
}
mEntityList.clear()
mEntityList.addAll(functionList)
notifyItemRangeChanged(0, itemCount)
notifyDataSetChanged()
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder =

2
app/src/main/java/com/gh/gamecenter/personal/HaloPersonalRecommendAdapter.kt
View File

@ -44,7 +44,7 @@ class HaloPersonalRecommendAdapter(val context: Context) : BaseRecyclerAdapter<R
}
mEntityList.clear()
mEntityList.addAll(recommendList)
notifyItemRangeChanged(0, itemCount)
notifyDataSetChanged()
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder =