[Feat]: 标签详情页

xiaoyvyv · Dec 10, 2023 · a825f54 · a825f54
1 parent 76e9372
commit a825f54
Show file tree

Hide file tree

Showing 17 changed files with 161 additions and 18 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -180,6 +180,10 @@
             android:name="com.xiaoyv.bangumi.ui.feature.summary.SummaryActivity"
             android:configChanges="orientation|keyboard|screenSize"
             android:exported="false" />
+        <activity
+            android:name="com.xiaoyv.bangumi.ui.feature.tag.TagDetailActivity"
+            android:configChanges="orientation|keyboard|screenSize"
+            android:exported="false" />
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/xiaoyv/bangumi/helper/RouteHelper.kt b/app/src/main/java/com/xiaoyv/bangumi/helper/RouteHelper.kt
@@ -20,6 +20,7 @@ import com.xiaoyv.bangumi.ui.feature.search.SearchActivity
 import com.xiaoyv.bangumi.ui.feature.search.detail.SearchDetailActivity
 import com.xiaoyv.bangumi.ui.feature.setting.SettingActivity
 import com.xiaoyv.bangumi.ui.feature.summary.SummaryActivity
+import com.xiaoyv.bangumi.ui.feature.tag.TagDetailActivity
 import com.xiaoyv.bangumi.ui.feature.topic.TopicActivity
 import com.xiaoyv.bangumi.ui.feature.user.UserActivity
 import com.xiaoyv.bangumi.ui.media.detail.MediaDetailActivity
@@ -28,6 +29,7 @@ import com.xiaoyv.blueprint.constant.NavKey
 import com.xiaoyv.blueprint.kts.open
 import com.xiaoyv.common.api.parser.entity.MediaDetailEntity
 import com.xiaoyv.common.config.annotation.BgmPathType
+import com.xiaoyv.common.config.annotation.MediaType
 import com.xiaoyv.common.config.annotation.TopicType
 import com.xiaoyv.common.config.bean.SearchItem
 import com.xiaoyv.common.helper.CacheHelper
@@ -56,25 +58,25 @@ object RouteHelper {
             }
             // 话题
             titleLink.contains(BgmPathType.TYPE_TOPIC) -> {
-                when{
+                when {
                     // 虚拟人物
-                    titleLink.contains(TopicType.TYPE_CRT)-> {
+                    titleLink.contains(TopicType.TYPE_CRT) -> {
                         jumpTopicDetail(id, TopicType.TYPE_CRT)
                     }
                     // 章节
-                    titleLink.contains(TopicType.TYPE_EP)-> {
+                    titleLink.contains(TopicType.TYPE_EP) -> {
                         jumpTopicDetail(id, TopicType.TYPE_EP)
                     }
                     // 小组
-                    titleLink.contains(TopicType.TYPE_GROUP)-> {
+                    titleLink.contains(TopicType.TYPE_GROUP) -> {
                         jumpTopicDetail(id, TopicType.TYPE_GROUP)
                     }
                     // 现实人物
-                    titleLink.contains(TopicType.TYPE_PERSON)-> {
+                    titleLink.contains(TopicType.TYPE_PERSON) -> {
                         jumpTopicDetail(id, TopicType.TYPE_PERSON)
                     }
                     // 条目
-                    titleLink.contains(TopicType.TYPE_SUBJECT)-> {
+                    titleLink.contains(TopicType.TYPE_SUBJECT) -> {
                         jumpTopicDetail(id, TopicType.TYPE_SUBJECT)
                     }
                 }
@@ -173,8 +175,16 @@ object RouteHelper {
 
     }
 
-    fun jumpTagDetail(tag: String) {
-
+    /**
+     * 标签详情页面
+     */
+    fun jumpTagDetail(@MediaType mediaType: String, tag: String) {
+        TagDetailActivity::class.open(
+            bundleOf(
+                NavKey.KEY_STRING to mediaType,
+                NavKey.KEY_STRING_SECOND to tag
+            )
+        )
     }
 
     fun jumpGroupDetail(groupId: String) {

diff --git a/app/src/main/java/com/xiaoyv/bangumi/ui/feature/search/detail/SearchDetailActivity.kt b/app/src/main/java/com/xiaoyv/bangumi/ui/feature/search/detail/SearchDetailActivity.kt
@@ -116,6 +116,15 @@ class SearchDetailActivity :
                 }
             }
         }
+
+        contentTagAdapter.setOnDebouncedChildClickListener(R.id.item_tag) { entity ->
+            useNotNull(viewModel.currentSearchItem.value) {
+                // 针对标签的搜索结果，SearchItem 的 id 在 SearchViewModel 填充为 MediaType
+                val tagMediaType = this.id
+                val tagName = entity.id
+                RouteHelper.jumpTagDetail(tagMediaType, tagName)
+            }
+        }
     }
 
     override fun LifecycleOwner.initViewObserver() {

diff --git a/app/src/main/java/com/xiaoyv/bangumi/ui/feature/search/detail/SearchDetailItemAdapter.kt b/app/src/main/java/com/xiaoyv/bangumi/ui/feature/search/detail/SearchDetailItemAdapter.kt
@@ -30,12 +30,12 @@ class SearchDetailItemAdapter : BaseQuickDiffBindingAdapter<SearchResultEntity,
 
         if (item.infoTip.time.isNotBlank()) {
             binding.tvTime.text = buildString {
-                append(item.searchType)
+                append(item.searchTip)
                 append(" ")
                 append(item.infoTip.time)
             }
         } else {
-            binding.tvTime.text = item.searchType
+            binding.tvTime.text = item.searchTip
         }
     }
 }
diff --git a/app/src/main/java/com/xiaoyv/bangumi/ui/feature/tag/TagDetailActivity.kt b/app/src/main/java/com/xiaoyv/bangumi/ui/feature/tag/TagDetailActivity.kt
@@ -0,0 +1,51 @@
+package com.xiaoyv.bangumi.ui.feature.tag
+
+import android.content.Intent
+import android.os.Bundle
+import com.xiaoyv.bangumi.R
+import com.xiaoyv.bangumi.base.BaseListActivity
+import com.xiaoyv.bangumi.helper.RouteHelper
+import com.xiaoyv.bangumi.ui.feature.search.detail.SearchDetailItemAdapter
+import com.xiaoyv.blueprint.constant.NavKey
+import com.xiaoyv.common.api.parser.entity.SearchResultEntity
+import com.xiaoyv.common.config.GlobalConfig
+import com.xiaoyv.common.kts.setOnDebouncedChildClickListener
+import com.xiaoyv.widget.binder.BaseQuickDiffBindingAdapter
+
+/**
+ * Class: [TagDetailActivity]
+ *
+ * @author why
+ * @since 12/10/23
+ */
+class TagDetailActivity : BaseListActivity<SearchResultEntity, TagDetailViewModel>() {
+
+    override val isOnlyOnePage: Boolean
+        get() = false
+
+    override fun initIntentData(intent: Intent, bundle: Bundle, isNewIntent: Boolean) {
+        viewModel.mediaType = bundle.getString(NavKey.KEY_STRING).orEmpty()
+        viewModel.tag = bundle.getString(NavKey.KEY_STRING_SECOND).orEmpty()
+    }
+
+    override fun initView() {
+        super.initView()
+        binding.toolbar.title = buildString {
+            append(GlobalConfig.mediaTypeName(viewModel.mediaType))
+            append("标签：")
+            append(viewModel.tag)
+        }
+    }
+
+    override fun initListener() {
+        super.initListener()
+
+        contentAdapter.setOnDebouncedChildClickListener(R.id.item_search) {
+            RouteHelper.jumpMediaDetail(it.id)
+        }
+    }
+
+    override fun onCreateContentAdapter(): BaseQuickDiffBindingAdapter<SearchResultEntity, *> {
+        return SearchDetailItemAdapter()
+    }
+}
diff --git a/app/src/main/java/com/xiaoyv/bangumi/ui/feature/tag/TagDetailViewModel.kt b/app/src/main/java/com/xiaoyv/bangumi/ui/feature/tag/TagDetailViewModel.kt
@@ -0,0 +1,30 @@
+package com.xiaoyv.bangumi.ui.feature.tag
+
+import com.xiaoyv.bangumi.base.BaseListViewModel
+import com.xiaoyv.common.api.BgmApiManager
+import com.xiaoyv.common.api.parser.entity.SearchResultEntity
+import com.xiaoyv.common.api.parser.impl.parserTagDetail
+import com.xiaoyv.common.config.annotation.BrowserSortType
+import com.xiaoyv.common.config.annotation.MediaType
+
+/**
+ * Class: [TagDetailViewModel]
+ *
+ * @author why
+ * @since 12/10/23
+ */
+class TagDetailViewModel : BaseListViewModel<SearchResultEntity>() {
+    internal var mediaType = MediaType.TYPE_UNKNOWN
+    internal var tag = ""
+    internal var time = ""
+
+    @BrowserSortType
+    internal var sort = BrowserSortType.TYPE_DEFAULT
+
+    override suspend fun onRequestListImpl(): List<SearchResultEntity> {
+        require(mediaType.isNotBlank()) { "标签条目类型不存在" }
+        require(tag.isNotBlank()) { "标签不存在" }
+        return BgmApiManager.bgmWebApi.queryTagDetail(mediaType, tag, time, sort, current)
+            .parserTagDetail()
+    }
+}
diff --git a/app/src/main/java/com/xiaoyv/bangumi/ui/media/detail/overview/OverviewFragment.kt b/app/src/main/java/com/xiaoyv/bangumi/ui/media/detail/overview/OverviewFragment.kt
@@ -47,7 +47,7 @@ class OverviewFragment : BaseViewModelFragment<FragmentOverviewBinding, Overview
                 RouteHelper.jumpPerson(it.id, true)
             },
             onClickTagItem = {
-                RouteHelper.jumpTagDetail(it.tagName)
+                RouteHelper.jumpTagDetail(it.mediaType, it.tagName)
             },
             onClickRelatedItem = {
                 RouteHelper.jumpMediaDetail(it.id)

diff --git a/app/src/main/res/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml
@@ -40,5 +40,6 @@
     <com.xiaoyv.common.widget.state.AnimeStateView
         android:id="@+id/state_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_search_detail_tag.xml b/app/src/main/res/layout/activity_search_detail_tag.xml
@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/item_search"
+    android:id="@+id/item_tag"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="@dimen/ui_size_8"
@@ -19,6 +19,7 @@
         android:id="@+id/tv_title_tag"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:lineSpacingMultiplier="1.25"
         android:textAppearance="?attr/textAppearanceBodyMedium"
         android:textColor="?attr/colorOnSurface"
         android:textStyle="bold"

diff --git a/lib-common/src/main/java/com/xiaoyv/common/api/api/BgmWebApi.kt b/lib-common/src/main/java/com/xiaoyv/common/api/api/BgmWebApi.kt
@@ -423,6 +423,22 @@ interface BgmWebApi {
         @Path("mediaType") mediaType: String,
         @Path("keyword") keyword: String
     ): Document
+
+    /**
+     * 标签详细内容
+     *
+     * time 格式
+     * - /airtime/2024
+     * - /airtime/2024-12
+     */
+    @GET("/{mediaType}/tag/{tag}{time}")
+    suspend fun queryTagDetail(
+        @Path("mediaType") mediaType: String,
+        @Path("tag") tag: String,
+        @Path("time", encoded = true) time: String,
+        @Query("sort") @BrowserSortType sortType: String? = null,
+        @Query("page") page: Int
+    ): Document
 }
 
 

diff --git a/lib-common/src/main/java/com/xiaoyv/common/api/parser/entity/MediaDetailEntity.kt b/lib-common/src/main/java/com/xiaoyv/common/api/parser/entity/MediaDetailEntity.kt
@@ -124,6 +124,7 @@ data class MediaDetailEntity(
         @SerializedName("tagName") var tagName: String = "",
         @SerializedName("title") var title: String = "",
         @SerializedName("count") var count: Int = 0,
+        @SerializedName("mediaType") var mediaType: String = "",
         @SerializedName("url") var url: String = ""
     ) : Parcelable
 

diff --git a/lib-common/src/main/java/com/xiaoyv/common/api/parser/entity/SearchResultEntity.kt b/lib-common/src/main/java/com/xiaoyv/common/api/parser/entity/SearchResultEntity.kt
@@ -24,5 +24,5 @@ data class SearchResultEntity(
     var infoTip: BrowserEntity.InfoTip = BrowserEntity.InfoTip(),
     var rank: String = "",
     var coverImage: String = "",
-    var searchType: String = ""
+    var searchTip: String = ""
 ) : IdEntity, Parcelable
diff --git a/lib-common/src/main/java/com/xiaoyv/common/api/parser/impl/BlogParser.kt b/lib-common/src/main/java/com/xiaoyv/common/api/parser/impl/BlogParser.kt
@@ -91,6 +91,7 @@ fun Document.parserBlogDetail(blogId: String): BlogDetailEntity {
             tag.tagName = item.attr("href").substringAfterLast("/").decodeUrl()
             tag.title = item.text()
             tag.url = item.attr("href")
+            tag.mediaType = item.attr("href").trim('/').substringBefore("/")
             tag
         }
         blogEntity.comments = parserBottomComment()

diff --git a/lib-common/src/main/java/com/xiaoyv/common/api/parser/impl/MediaDetailParser.kt b/lib-common/src/main/java/com/xiaoyv/common/api/parser/impl/MediaDetailParser.kt
@@ -284,6 +284,8 @@ fun Document.parserMediaDetail(): MediaDetailEntity {
             mediaTag.tagName = attr("href").substringAfterLast("/").decodeUrl()
             mediaTag.title = select("span").text()
             mediaTag.count = select("small").text().parseCount()
+            mediaTag.mediaType = attr("href").trim('/').substringBefore("/").trim()
+            mediaTag.url = attr("href")
         }
 
         mediaTag

diff --git a/lib-common/src/main/java/com/xiaoyv/common/api/parser/impl/SearchParser.kt b/lib-common/src/main/java/com/xiaoyv/common/api/parser/impl/SearchParser.kt
@@ -6,6 +6,7 @@ import com.xiaoyv.common.api.parser.requireNoError
 import com.xiaoyv.common.config.GlobalConfig
 import com.xiaoyv.common.config.annotation.BgmPathType
 import com.xiaoyv.common.config.annotation.MediaType
+import com.xiaoyv.common.kts.decodeUrl
 import com.xiaoyv.common.widget.star.StarCommentView
 import org.jsoup.nodes.Element
 
@@ -51,7 +52,7 @@ fun Element.parserSearchResult(@BgmPathType pathType: String): List<SearchResult
                         else -> MediaType.TYPE_UNKNOWN
                     }
                 }
-                entity.searchType = GlobalConfig.mediaTypeName(mediaType)
+                entity.searchTip = GlobalConfig.mediaTypeName(mediaType)
                 entity
             }
         }
@@ -70,18 +71,18 @@ fun Element.parserSearchResult(@BgmPathType pathType: String): List<SearchResult
                     }
                     entity.infoTip =
                         BrowserParser.parserInfoTip(item.select(".prsn_info .tip").text().trim('/'))
-                    entity.searchType = "人物"
+                    entity.searchTip = "人物"
                     entity
                 }
         }
         // 搜索标签解析
         BgmPathType.TYPE_SEARCH_TAG -> {
             select("#tagList > a").map { item ->
                 val entity = SearchResultEntity()
-                entity.id = item.attr("href").substringAfterLast("/")
+                entity.id = item.attr("href").substringAfterLast("/").decodeUrl()
                 entity.count = item.nextElementSibling()?.text().orEmpty()
                 entity.title = item.text()
-                entity.searchType = "标签"
+                entity.searchTip = "标签"
                 entity
             }
         }

diff --git a/lib-common/src/main/java/com/xiaoyv/common/api/parser/impl/TagParser.kt b/lib-common/src/main/java/com/xiaoyv/common/api/parser/impl/TagParser.kt
@@ -0,0 +1,14 @@
+package com.xiaoyv.common.api.parser.impl
+
+import com.xiaoyv.common.api.parser.entity.SearchResultEntity
+import com.xiaoyv.common.config.annotation.BgmPathType
+import org.jsoup.nodes.Element
+
+/**
+ * @author why
+ * @since 12/10/23
+ */
+fun Element.parserTagDetail(): List<SearchResultEntity> {
+    // 标签详情页面复用 BgmPathType.TYPE_SEARCH_SUBJECT 的解析逻辑
+    return parserSearchResult(BgmPathType.TYPE_SEARCH_SUBJECT)
+}
diff --git a/lib-common/src/main/java/com/xiaoyv/common/config/annotation/BrowserSortType.kt b/lib-common/src/main/java/com/xiaoyv/common/config/annotation/BrowserSortType.kt
@@ -13,6 +13,7 @@ import androidx.annotation.StringDef
     BrowserSortType.TYPE_DATE,
     BrowserSortType.TYPE_TITLE,
     BrowserSortType.TYPE_RATE,
+    BrowserSortType.TYPE_COLLECTS,
     BrowserSortType.TYPE_DEFAULT
 )
 @Retention(AnnotationRetention.SOURCE)
@@ -23,6 +24,7 @@ annotation class BrowserSortType {
         const val TYPE_TITLE = "title"
 
         const val TYPE_RATE = "rate"
+        const val TYPE_COLLECTS = "collects"
         const val TYPE_DEFAULT = ""
     }
 }