From 354d286a98c38b5e7044bef5332cbbdee7abe49e Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Sun, 1 Dec 2019 21:41:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV3.7.1=20RE?= =?UTF-8?q?LEASE=EF=BC=8820191201-1500=EF=BC=89=E6=B5=8B=E8=AF=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E6=B1=87=E6=80=BB(1.2.7)=20https://gitlab.ghzs.com/pm?= =?UTF-8?q?/halo-app-issues/issues/713?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseFragment_ViewPager_Checkable.java | 39 ++++++++++--------- .../gh/common/databind/BindingAdapters.java | 13 +++++++ .../rating/RatingCommentItemViewHolder.kt | 2 +- .../home/slide/HomeSlideListAdapter.kt | 6 +-- app/src/main/res/layout/game_attach_item.xml | 2 +- 5 files changed, 39 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager_Checkable.java b/app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager_Checkable.java index 90c268218e..d7653c7fb3 100755 --- a/app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager_Checkable.java +++ b/app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager_Checkable.java @@ -77,30 +77,33 @@ public abstract class BaseFragment_ViewPager_Checkable extends BaseFragment_View @Override public void onPageSelected(int index) { onPageChanged(index); + try { + // 补充Viewpager Fragment的生命周期 + if (mFragmentsList.size() > index) { + Fragment fragment = mFragmentsList.get(index); + fragment.onResume(); - // 补充Viewpager Fragment的生命周期 - if (mFragmentsList.size() > index) { - Fragment fragment = mFragmentsList.get(index); - fragment.onResume(); - - FragmentManager childFragmentManager = fragment.getChildFragmentManager(); - List fragments = childFragmentManager.getFragments(); - for (Fragment childFragment : fragments) { - childFragment.onResume(); + FragmentManager childFragmentManager = fragment.getChildFragmentManager(); + List fragments = childFragmentManager.getFragments(); + for (Fragment childFragment : fragments) { + childFragment.onResume(); + } } - } - if (mFragmentsList.size() > mLastPosition) { - Fragment fragment = mFragmentsList.get(mLastPosition); - fragment.onPause(); + if (mFragmentsList.size() > mLastPosition) { + Fragment fragment = mFragmentsList.get(mLastPosition); + fragment.onPause(); - FragmentManager childFragmentManager = fragment.getChildFragmentManager(); - List fragments = childFragmentManager.getFragments(); - for (Fragment childFragment : fragments) { - childFragment.onPause(); + FragmentManager childFragmentManager = fragment.getChildFragmentManager(); + List fragments = childFragmentManager.getFragments(); + for (Fragment childFragment : fragments) { + childFragment.onPause(); + } } + mLastPosition = index; + } catch (Exception ignore) { + } - mLastPosition = index; } @Override diff --git a/app/src/main/java/com/gh/common/databind/BindingAdapters.java b/app/src/main/java/com/gh/common/databind/BindingAdapters.java index 9883f355e2..9cd9fb2c16 100644 --- a/app/src/main/java/com/gh/common/databind/BindingAdapters.java +++ b/app/src/main/java/com/gh/common/databind/BindingAdapters.java @@ -23,6 +23,7 @@ import com.gh.base.OnViewClickListener; import com.gh.common.constant.Config; import com.gh.common.exposure.ExposureEvent; import com.gh.common.exposure.ExposureUtils; +import com.gh.common.repository.ReservationRepository; import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.DisplayUtils; @@ -329,6 +330,18 @@ public class BindingAdapters { return; } + // 显示预约 + if (gameEntity.isReservable()) { + if (!ReservationRepository.thisGameHasBeenReserved(gameEntity.getId())) { + progressBar.setText("预约"); + progressBar.setDownloadType(DownloadProgressBar.DownloadType.RESERVABLE); + } else { + progressBar.setText("已预约"); + progressBar.setDownloadType(DownloadProgressBar.DownloadType.RESERVED); + } + return; + } + // 显示下载按钮状态 if (gameEntity.getApk().isEmpty() || gameEntity.getDownloadOffStatus() != null) { String offStatus = gameEntity.getDownloadOffStatus(); diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt index 536122a46b..490dcea420 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt @@ -210,7 +210,7 @@ class RatingCommentItemViewHolder(val binding: RatingCommentItemBinding) : BaseR } override fun onClick(widget: View) { - context.startActivity(WebActivity.getCommunityRuleIntent(context)) + context.startActivity(WebActivity.getCommentRulesIntent(context)) } }, 8, 18, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) diff --git a/app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideListAdapter.kt b/app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideListAdapter.kt index 6e95c5aad2..bd1cdc3c8e 100644 --- a/app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideListAdapter.kt @@ -67,7 +67,7 @@ class HomeSlideListAdapter(context: Context, fun checkResetData(updateList: List) { if (updateList != slideList) { slideList = ArrayList(updateList) - notifyDataSetChanged() + notifyItemChanged(0, itemCount - 1) } startScroll() @@ -115,9 +115,9 @@ class HomeSlideListAdapter(context: Context, } fun getActualFirstPositionInCenter(): Int { - var index = itemCount/2 + var index = itemCount / 2 while (getActualPosition(index) != 0) { - index ++ + index++ } return index } diff --git a/app/src/main/res/layout/game_attach_item.xml b/app/src/main/res/layout/game_attach_item.xml index 3eba707804..a0d0f767e8 100644 --- a/app/src/main/res/layout/game_attach_item.xml +++ b/app/src/main/res/layout/game_attach_item.xml @@ -33,7 +33,7 @@