From d4ae878947551c1951ecfc33a78ac29a6e07756c Mon Sep 17 00:00:00 2001 From: lyr <15622190878@163.com> Date: Thu, 24 Jun 2021 17:58:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=89=8D=E7=AB=AF=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=B1=87=E6=80=BB=EF=BC=882021=E5=B9=B45=E6=9C=88?= =?UTF-8?q?=EF=BC=89(=E7=AC=AC9-11=E7=82=B9)=20https://git.ghzs.com/pm/hal?= =?UTF-8?q?o-app-issues/-/issues/1260?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/common/constant/Constants.java | 3 ++ .../com/gh/common/view/CategoryFilterView.kt | 4 ++ .../category2/CategoryV2Fragment.kt | 42 +++++++++++++++++- .../category2/CategoryV2ListFragment.kt | 9 +++- .../drawable-xxxhdpi/pic_category_guide.webp | Bin 0 -> 21384 bytes app/src/main/res/layout/fragment_category.xml | 16 +++++++ 6 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 app/src/main/res/drawable-xxxhdpi/pic_category_guide.webp diff --git a/app/src/main/java/com/gh/common/constant/Constants.java b/app/src/main/java/com/gh/common/constant/Constants.java index 79a994615f..17fd64e4c6 100644 --- a/app/src/main/java/com/gh/common/constant/Constants.java +++ b/app/src/main/java/com/gh/common/constant/Constants.java @@ -202,6 +202,9 @@ public class Constants { // 是否显示更换背景提示 public static final String SP_SHOW_CHANGE_BG_TIPS = "show_change_bg_tips" + TimeUtils.getStartTimeOfToday(); + // 新分类2.0引导 + public static final String SP_SHOW_CATEGORY_GUIDE = "show_category_guide"; + // 内容视频播放选项 public static final String SP_CONTENT_VIDEO_OPTION = "content_video_option"; diff --git a/app/src/main/java/com/gh/common/view/CategoryFilterView.kt b/app/src/main/java/com/gh/common/view/CategoryFilterView.kt index 3dbcd2d084..4343bfb056 100644 --- a/app/src/main/java/com/gh/common/view/CategoryFilterView.kt +++ b/app/src/main/java/com/gh/common/view/CategoryFilterView.kt @@ -59,6 +59,10 @@ class CategoryFilterView @JvmOverloads constructor(context: Context, attrs: Attr mOnCategoryFilterSetupListener = onCategoryFilterSetupListener } + fun resetSortSize() { + mSizeTv.text = "全部大小" + } + private fun toggleHighlightedTextView(targetTextView: TextView, highlightIt: Boolean) { if (highlightIt) { targetTextView.background = ContextCompat.getDrawable(targetTextView.context, R.drawable.bg_tag_text) diff --git a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt index a7d072f65e..102f3e957c 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2Fragment.kt @@ -64,6 +64,21 @@ class CategoryV2Fragment : LazyFragment() { drawerLayout.setScrimColor(R.color.black_alpha_30.toColor()) // 关闭手势滑动 drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED) + drawerLayout.addDrawerListener(object : DrawerLayout.DrawerListener { + override fun onDrawerStateChanged(newState: Int) { + } + + override fun onDrawerSlide(drawerView: View, slideOffset: Float) { + } + + override fun onDrawerClosed(drawerView: View) { + showGuide() + } + + override fun onDrawerOpened(drawerView: View) { + } + + }) directoryContainer.layoutParams.width = width directoryRv.layoutParams.width = width @@ -132,6 +147,27 @@ class CategoryV2Fragment : LazyFragment() { }) } + private fun showGuide() { + mBinding?.run { + val isShow = SPUtils.getBoolean(Constants.SP_SHOW_CATEGORY_GUIDE) + if (isShow) return + guideContainer.visibility = View.VISIBLE + guideContainer.setOnClickListener { + guideContainer.visibility = View.GONE + SPUtils.setBoolean(Constants.SP_SHOW_CATEGORY_GUIDE, true) + } + + countDownTimer(3) { finish, _ -> + tryCatchInRelease { + if (finish) { + guideContainer.visibility = View.GONE + SPUtils.setBoolean(Constants.SP_SHOW_CATEGORY_GUIDE, true) + } + } + } + } + } + override fun onMenuItemClick(menuItem: MenuItem?) { menuItem?.run { if (itemId == R.id.menu_search) { @@ -223,7 +259,7 @@ class CategoryV2Fragment : LazyFragment() { if (SPUtils.getBoolean(Constants.SP_FIRST_ENTER_CATEGORY_V2, true)) { SPUtils.setBoolean(Constants.SP_FIRST_ENTER_CATEGORY_V2, false) mBinding?.drawerLayout?.postDelayed({ - openDrawer() + tryCatchInRelease { openDrawer() } }, 500L) } } @@ -277,7 +313,7 @@ class CategoryV2Fragment : LazyFragment() { if (position == 1 && SPUtils.getBoolean(Constants.SP_FIRST_ENTER_CATEGORY_V2, true)) { SPUtils.setBoolean(Constants.SP_FIRST_ENTER_CATEGORY_V2, false) mBinding?.drawerLayout?.postDelayed({ - openDrawer() + tryCatchInRelease { openDrawer() } }, 200L) } } else { @@ -308,6 +344,8 @@ class CategoryV2Fragment : LazyFragment() { } } } + } else if (sidebar.name == "全部" && selectedCategoryList.isNotEmpty()) { + i = selectedCategoryList[0].primaryIndex } } } diff --git a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListFragment.kt b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListFragment.kt index c603c0485c..b6340ca9fd 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListFragment.kt @@ -104,11 +104,18 @@ class CategoryV2ListFragment : ListFragment logClickReset("游戏列表") resetDirectoryList() } + resetSortSize() changeCategoryTab() - openDirectoryLayout() +// openDirectoryLayout() } } + private fun resetSortSize() { + mBinding?.filterContainer?.resetSortSize() + mListViewModel?.sortSize = SubjectSettingEntity.Size(min = -1, max = -1, text = "全部大小") + + } + private fun initFilterView() { mBinding?.filterContainer?.run { visibility = View.VISIBLE diff --git a/app/src/main/res/drawable-xxxhdpi/pic_category_guide.webp b/app/src/main/res/drawable-xxxhdpi/pic_category_guide.webp new file mode 100644 index 0000000000000000000000000000000000000000..b229d64c55b29ab601b7ed8aeaf46f3956f2ed4a GIT binary patch literal 21384 zcmZsBQ*8^)zWwd)!~P%k^r?R8`_g^t-o90( zCMzWsqz(e2Eh(m=rNW~F2Lb|u@?Ttmfqa30h$^Va_#l9QfZ|FzY>UWk_l*-jg_9Hm z(Lr#AcY;QER9kRm^%i?F)aWh4cbnZXN*xAU0r7V@QBkmkHBf1V9C<0?`zaKV@6c?be%G{B5nX(sqY! zrS!D*K+)W_cDWqGCB8BTe!K7S7TD{zP`>Bd1QV??@OOYzs4Zq-=QX4m+#+Qppb+KN(^rlH2 z-$5=LV>&?1&3tH_fIK^oraO`P%rLaXq3%&=`Y+45I~d!D?nxB^EAZQ+ce7 z)A;+0mj?I7G^sC{kkYVMY=(n~0RPF9;y5$@Ne?UtuHJoibx_MAljjUci7QBuVSAuJ zf)6S-tfG?pAQ+2neLIFk@PH!q4!#C||3d4@{FvE9>1w9^};HgDtI$hZD*BR@iQrM}sr>gPMlFiDKc6>0xm+|Ouka(l6{*03P2v5KCgGAg2|KFT@@L4yBLTv&22Et~Pa3$#x?34KQlnr}{aGoG z^n;cwL4n5=Jg#T*0gN01ItV`D3Q4UL+F&cAyK=oe0CcY z(bqX>v?zlgoTR*Dv|-cfuHUY6`Y2HX>>c3i){j%Bezk*ZZhcHB-Zx1|c;g@t7p6rd zQ!MmqXDT~F`&eP5S~GLOVyf8dN-3oojcCb}R3eA5$C++A(=sVp7KmTgN{n`sL=kQv zR*~fbkz{tmDxM5Db1%uY)5anUkJ}mk$w?(xtl4xgY$+-hjLrn4M4Zy%h5?a57Inok z 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 @@ -46,6 +47,21 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" /> + + + + +