[Feat]: 修复小组话题发布问题

xiaoyvyv · Dec 18, 2023 · 0902fab · 0902fab
1 parent cf2fe0b
commit 0902fab
Show file tree

Hide file tree

Showing 13 changed files with 126 additions and 46 deletions.
diff --git a/app/src/main/java/com/xiaoyv/bangumi/ui/discover/group/topic/GroupTopicsActivity.kt b/app/src/main/java/com/xiaoyv/bangumi/ui/discover/group/topic/GroupTopicsActivity.kt
@@ -38,31 +38,39 @@ class GroupTopicsActivity : BaseListActivity<TopicSampleEntity, GroupTopicsViewM
         }
     }
 
+    override fun onListDataFinish(list: List<TopicSampleEntity>) {
+        binding.toolbar.title = viewModel.groupName
+
+        invalidateMenu()
+    }
+
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        menu.add("发表")
-            .setIcon(CommonDrawable.ic_post_add)
-            .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_ALWAYS)
-            .setOnMenuItemClickListener {
-                if (UserHelper.isLogin.not()) {
-                    RouteHelper.jumpLogin()
-                    return@setOnMenuItemClickListener true
-                }
-                RouteHelper.jumpPostTopic(
-                    PostAttach(
-                        id = viewModel.groupId,
-                        image = "",
-                        title = viewModel.groupName,
-                        type = TopicType.TYPE_GROUP
+        // 只有在小组详情内才显示发布按钮
+        if (viewModel.isQueryMyTopic.not()) {
+            menu.add("发表")
+                .setIcon(CommonDrawable.ic_post_add)
+                .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_ALWAYS)
+                .setOnMenuItemClickListener {
+                    if (UserHelper.isLogin.not()) {
+                        RouteHelper.jumpLogin()
+                        return@setOnMenuItemClickListener true
+                    }
+
+                    // 构建小组话题发布的附件模型，跳转到发布小组话题
+                    RouteHelper.jumpPostTopic(
+                        PostAttach(
+                            id = viewModel.groupId,
+                            image = "",
+                            title = viewModel.groupName,
+                            type = TopicType.TYPE_GROUP
+                        )
                     )
-                )
-                true
-            }
+                    true
+                }
+        }
         return super.onCreateOptionsMenu(menu)
     }
 
-    override fun onListDataFinish(list: List<TopicSampleEntity>) {
-        binding.toolbar.title = viewModel.groupName
-    }
 
     override fun onCreateContentAdapter(): BaseQuickDiffBindingAdapter<TopicSampleEntity, *> {
         return GroupTopicsAdapter()

diff --git a/app/src/main/java/com/xiaoyv/bangumi/ui/discover/group/topic/GroupTopicsViewModel.kt b/app/src/main/java/com/xiaoyv/bangumi/ui/discover/group/topic/GroupTopicsViewModel.kt
@@ -17,16 +17,16 @@ class GroupTopicsViewModel : BaseListViewModel<TopicSampleEntity>() {
     internal var groupName = ""
 
     /**
-     * 我的回复和发布也是复用改类的逻辑
+     * 我的回复和发布页面，复用此类的逻辑
      */
-    private val isMyTopic: Boolean
+    val isQueryMyTopic: Boolean
         get() = groupId == GlobalConfig.GROUP_MY_REPLY_TOPIC || groupId == GlobalConfig.GROUP_MY_SEND_TOPIC
 
     override suspend fun onRequestListImpl(): List<TopicSampleEntity> {
         require(groupId.isNotBlank()) { "小组不存在" }
 
         // 如果是查询我的回复或发布
-        if (isMyTopic) {
+        if (isQueryMyTopic) {
             val (groupName, topics) = BgmApiManager.bgmWebApi
                 .queryUserTopicList(type = groupId, page = current)
                 .parserGroupTopics(groupId)

diff --git a/app/src/main/java/com/xiaoyv/bangumi/ui/feature/post/topic/PostTopicViewModel.kt b/app/src/main/java/com/xiaoyv/bangumi/ui/feature/post/topic/PostTopicViewModel.kt
@@ -5,15 +5,14 @@ import com.xiaoyv.bangumi.ui.feature.post.BasePostViewModel
 import com.xiaoyv.blueprint.kts.launchUI
 import com.xiaoyv.common.api.BgmApiManager
 import com.xiaoyv.common.api.parser.entity.CreatePostEntity
+import com.xiaoyv.common.api.parser.impl.parserGroupDetail
 import com.xiaoyv.common.api.parser.impl.parserTopicSendResult
 import com.xiaoyv.common.config.GlobalConfig
 import com.xiaoyv.common.config.annotation.TopicType
 import com.xiaoyv.common.helper.UserHelper
 import com.xiaoyv.widget.kts.errorMsg
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.MultipartBody
 
 /**
  * Class: [PostTopicViewModel]
@@ -30,9 +29,12 @@ open class PostTopicViewModel : BasePostViewModel() {
 
     internal var targetEditId = ""
 
-    internal val targetId
+    private val targetId
         get() = requireAttach?.id.orEmpty()
 
+    /**
+     * 发布话题，这里目前都是小组类型，章节和人物暂时没有支持
+     */
     @TopicType
     internal val topicType: String
         get() = requireAttach?.type.orEmpty()
@@ -49,15 +51,23 @@ open class PostTopicViewModel : BasePostViewModel() {
                 onPostTopicId.value = (null to it.errorMsg)
             },
             block = {
+                // 自己的回复不能发布
                 require(targetId.isNotBlank() && targetId != GlobalConfig.GROUP_MY_SEND_TOPIC && targetId != GlobalConfig.GROUP_MY_REPLY_TOPIC) {
                     "请先选择一个讨论的条目或小组"
                 }
 
+                // 判断是否为小组的ID，是的话需要获取数字小组 ID 才能发布
+                var sendTargetId = targetId
+                if (topicType == TopicType.TYPE_GROUP) {
+                    sendTargetId = fetchGroupNumberIdById(targetId)
+                }
+
+                // 发布
                 onPostTopicId.value = withContext(Dispatchers.IO) {
                     val map = generateMap(entity)
 
                     val topicId = BgmApiManager.bgmWebApi
-                        .postCreateTopic(topicType, targetId, map)
+                        .postCreateTopic(topicType, sendTargetId, map)
                         .parserTopicSendResult()
 
                     if (topicId.isNotBlank()) {
@@ -74,7 +84,9 @@ open class PostTopicViewModel : BasePostViewModel() {
 
     }
 
-
+    /**
+     * 构建发布参数
+     */
     private fun generateMap(entity: CreatePostEntity): Map<String, String> {
         if (entity.title.isBlank()) {
             throw IllegalArgumentException("请输入标题")
@@ -85,12 +97,32 @@ open class PostTopicViewModel : BasePostViewModel() {
 
         require(UserHelper.formHash.isNotBlank()) { "啊咧咧？参数丢失出错了！" }
 
-       return mapOf(
+        return mapOf(
             "formhash" to UserHelper.formHash,
             "title" to entity.title,
             "content" to entity.content,
             "mode" to "rakuen",
             "submit" to "加上去"
         )
     }
+
+    /**
+     * 获取小组的数字ID，用于发布话题，登录后才可以获取
+     */
+    private suspend fun fetchGroupNumberIdById(groupId: String): String {
+        return withContext(Dispatchers.IO) {
+            require(UserHelper.isLogin) { "你还没有登录呢" }
+            val groupDetail = BgmApiManager.bgmWebApi.queryGroupDetail(groupId)
+                .parserGroupDetail(groupId)
+
+            // 半公开小组，必须加入才可以发言
+            if (groupDetail.isJoin.not() && groupDetail.groupNumberId.isBlank()) {
+                throw IllegalArgumentException("小组是半公开小组，只有小组成员才能发言")
+            }
+
+            require(groupDetail.groupNumberId.isNotBlank()) { "小组ID查询失败" }
+
+            return@withContext groupDetail.groupNumberId
+        }
+    }
 }
diff --git a/app/src/main/java/com/xiaoyv/bangumi/ui/media/detail/chapter/MediaChapterAdapter.kt b/app/src/main/java/com/xiaoyv/bangumi/ui/media/detail/chapter/MediaChapterAdapter.kt
@@ -4,8 +4,12 @@ import androidx.core.view.isVisible
 import androidx.recyclerview.widget.DiffUtil
 import com.xiaoyv.bangumi.databinding.FragmentMediaChapterItemBinding
 import com.xiaoyv.common.api.parser.entity.MediaChapterEntity
+import com.xiaoyv.common.kts.CommonColor
+import com.xiaoyv.common.kts.GoogleAttr
+import com.xiaoyv.common.kts.tint
 import com.xiaoyv.widget.binder.BaseQuickBindingHolder
 import com.xiaoyv.widget.binder.BaseQuickDiffBindingAdapter
+import com.xiaoyv.widget.kts.getAttrColor
 
 /**
  * Class: [MediaChapterAdapter]
@@ -22,19 +26,27 @@ class MediaChapterAdapter : BaseQuickDiffBindingAdapter<MediaChapterEntity,
         binding.titleCn.isVisible = item.titleCn.isNotBlank()
         binding.tvTime.text = item.time
         binding.tvComment.text = String.format("讨论：%d", item.commentCount)
+        binding.vAired.text = item.stateText
+       if (item.aired) {
+           binding.vAired.backgroundTintList =   context.getColor(CommonColor.save_collect).tint
+            binding.vAired.setTextColor(context.getAttrColor(GoogleAttr.colorOnPrimarySurface))
+        } else {
+           binding.vAired.backgroundTintList = context.getAttrColor(GoogleAttr.colorSurfaceContainer).tint
+           binding.vAired.setTextColor(context.getAttrColor(GoogleAttr.colorOnSurfaceVariant))
+        }
     }
 
     private object ItemDiffItemCallback : DiffUtil.ItemCallback<MediaChapterEntity>() {
         override fun areItemsTheSame(
             oldItem: MediaChapterEntity,
-            newItem: MediaChapterEntity
+            newItem: MediaChapterEntity,
         ): Boolean {
             return oldItem.id == newItem.id
         }
 
         override fun areContentsTheSame(
             oldItem: MediaChapterEntity,
-            newItem: MediaChapterEntity
+            newItem: MediaChapterEntity,
         ): Boolean {
             return oldItem == newItem
         }

diff --git a/app/src/main/res/layout/fragment_media_action.xml b/app/src/main/res/layout/fragment_media_action.xml
@@ -140,7 +140,7 @@
         android:background="@drawable/ui_shape_rectangle_corner_6"
         android:backgroundTint="?attr/colorSurfaceContainer"
         android:gravity="top"
-        android:hint="吐槽"
+        android:hint="吐槽：公开情况下该内容会显示在详情页面最下方"
         android:minLines="4"
         android:paddingHorizontal="@dimen/ui_size_12"
         android:paddingVertical="@dimen/ui_size_12"

diff --git a/app/src/main/res/layout/fragment_media_chapter_item.xml b/app/src/main/res/layout/fragment_media_chapter_item.xml
@@ -11,14 +11,16 @@
 
     <com.xiaoyv.common.widget.text.AnimeTextView
         android:id="@+id/title_native"
-        android:layout_width="match_parent"
+        android:layout_width="@dimen/ui_size_0"
         android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/ui_layout_margin"
-        android:paddingTop="@dimen/ui_size_12"
+        android:layout_marginHorizontal="@dimen/ui_layout_margin"
+        android:layout_marginTop="@dimen/ui_size_12"
         android:paddingBottom="@dimen/ui_size_6"
         android:textAppearance="?attr/textAppearanceBodyMedium"
         android:textColor="?attr/colorPrimary"
         android:textStyle="bold"
+        app:layout_constraintEnd_toStartOf="@+id/v_aired"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="@tools:sample/lorem" />
 
@@ -32,15 +34,30 @@
         app:layout_constraintTop_toBottomOf="@+id/title_native"
         tools:text="@tools:sample/lorem" />
 
+    <com.xiaoyv.common.widget.text.AnimeTextView
+        android:id="@+id/v_aired"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/ui_layout_margin"
+        android:background="@drawable/ui_shape_rectangle_corner_6"
+        android:backgroundTint="?attr/colorSurfaceContainer"
+        android:padding="@dimen/ui_size_6"
+        android:textAppearance="?attr/textAppearanceLabelSmall"
+        android:textColor="?attr/colorOnSurfaceVariant"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/title_native"
+        tools:text="未播出" />
+
     <com.xiaoyv.common.widget.text.AnimeTextView
         android:id="@+id/tv_time"
         android:layout_width="@dimen/ui_size_0"
         android:layout_height="wrap_content"
-        android:paddingHorizontal="@dimen/ui_layout_margin"
-        android:paddingTop="@dimen/ui_size_6"
-        android:paddingBottom="@dimen/ui_layout_margin"
+        android:layout_marginHorizontal="@dimen/ui_layout_margin"
+        android:layout_marginBottom="@dimen/ui_size_10"
+        android:paddingVertical="@dimen/ui_size_6"
         android:textAppearance="?attr/textAppearanceLabelMedium"
         android:textColor="?attr/colorOnSurfaceVariant"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/tv_comment"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/title_cn"

diff --git a/lib-common/src/main/java/com/xiaoyv/common/api/BgmApiManager.kt b/lib-common/src/main/java/com/xiaoyv/common/api/BgmApiManager.kt
@@ -42,7 +42,7 @@ class BgmApiManager {
             .addNetworkInterceptor(CookieInterceptor())
             .apply {
                 if (AppUtils.isAppDebug()) {
-                    addNetworkInterceptor(HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.HEADERS))
+                    addNetworkInterceptor(HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY))
                 }
             }
             .cookieJar(cookieJar)

diff --git a/lib-common/src/main/java/com/xiaoyv/common/api/parser/Parser.kt b/lib-common/src/main/java/com/xiaoyv/common/api/parser/Parser.kt
@@ -49,7 +49,11 @@ fun String.fetchStyleBackgroundUrl(): String {
  * --->
  * https://lain.bgm.tv/pic/photo/g/41/30/823739_i8sWx.jpg
  */
-fun String.optImageUrl(large: Boolean = true, largest: Boolean = false): String {
+fun String.optImageUrl(
+    large: Boolean = true,
+    largest: Boolean = false,
+    default: Boolean = true,
+): String {
     val imageUrl = when {
         startsWith("//") -> "https:$this"
         startsWith("/") -> "${BgmApiManager.URL_BASE_WEB}$this"
@@ -64,7 +68,7 @@ fun String.optImageUrl(large: Boolean = true, largest: Boolean = false): String
         .replace("https://(.*?)/no_icon.jpg".toRegex(), defaultImage)
         .replace("https://(.*?)/no_icon_subject.png".toRegex(), defaultImage)
         .replace("https://(.*?)/icon.jpg".toRegex(), defaultImage)
-        .ifBlank { defaultImage }
+        .ifBlank { if (default) defaultImage else "" }
 }
 
 fun String?.parseCount(): Int {
@@ -160,8 +164,8 @@ fun Elements.firsTextNode(): String {
     return textNodes().firstOrNull()?.text().orEmpty()
 }
 
-fun Elements.styleBackground(): String {
-    return attr("style").fetchStyleBackgroundUrl().optImageUrl()
+fun Elements.styleBackground(default: Boolean = true): String {
+    return attr("style").fetchStyleBackgroundUrl().optImageUrl(default = default)
 }
 
 fun Element.parseStar(): Float {

diff --git a/lib-common/src/main/java/com/xiaoyv/common/api/parser/entity/GroupDetailEntity.kt b/lib-common/src/main/java/com/xiaoyv/common/api/parser/entity/GroupDetailEntity.kt
@@ -16,6 +16,7 @@ import kotlinx.parcelize.Parcelize
 @Keep
 data class GroupDetailEntity(
     override var id: String = "",
+    var groupNumberId: String = "",
     var avatar: String = "",
     var name: String = "",
     var time: String = "",
@@ -24,5 +25,5 @@ data class GroupDetailEntity(
     var recently: List<SampleAvatar> = emptyList(),
     var otherGroups: List<SampleAvatar> = emptyList(),
     var gh: String = "",
-    var isJoin: Boolean = false
+    var isJoin: Boolean = false,
 ) : IdEntity, Parcelable
diff --git a/lib-common/src/main/java/com/xiaoyv/common/api/parser/entity/MediaChapterEntity.kt b/lib-common/src/main/java/com/xiaoyv/common/api/parser/entity/MediaChapterEntity.kt
@@ -19,5 +19,7 @@ data class MediaChapterEntity(
     var titleNative: String = "",
     var finished: Boolean = false,
     var time: String = "",
-    var commentCount: Int = 0
+    var commentCount: Int = 0,
+    var stateText: String = "",
+    var aired: Boolean = false,
 ) : Parcelable, IdEntity
diff --git a/lib-common/src/main/java/com/xiaoyv/common/api/parser/impl/GroupParser.kt b/lib-common/src/main/java/com/xiaoyv/common/api/parser/impl/GroupParser.kt
@@ -25,6 +25,8 @@ fun Document.parserGroupDetail(groupId: String): GroupDetailEntity {
     requireNoError()
 
     val entity = GroupDetailEntity(id = groupId)
+    entity.groupNumberId = select("form[name=new_comment]").attr("action")
+        .parseCount().toString()
 
     selectLegal("#columnA").apply {
         entity.avatar = select(".grp_box > img").attr("src").optImageUrl()

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
@@ -35,6 +35,8 @@ fun Document.parserMediaChapters(): List<MediaChapterEntity> {
     return select(".line_detail > ul > li").map {
         if (it.select("h6").isEmpty()) return@map null
         val entity = MediaChapterEntity()
+        entity.aired = it.select(".Air").isNotEmpty()
+        entity.stateText = it.select(".epAirStatus").attr("title")
         entity.id = it.select("h6 a").hrefId()
         entity.titleCn = it.select("h6 .tip").text().substringAfterLast("/").trim()
         entity.titleNative = it.select("h6 a").text()

diff --git a/lib-common/src/main/java/com/xiaoyv/common/api/parser/impl/TimeParser.kt b/lib-common/src/main/java/com/xiaoyv/common/api/parser/impl/TimeParser.kt
@@ -157,7 +157,7 @@ fun parserTimelineText(item: Element, entity: TimelineEntity) {
 
     entity.id = item.select("a.avatar").hrefId()
     entity.name = item.select(".info > a").firstOrNull()?.text().orEmpty()
-    entity.avatar = item.select("a.avatar > span").styleBackground()
+    entity.avatar = item.select("a.avatar > span").styleBackground(false)
     entity.title = item.select(".info, .info_full").fetchHtmlTitle()
     entity.content = item.select("p.status, .info_sub").text()
 }