diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9da30ba1d3..8823967256 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -149,7 +149,7 @@ oss-upload&send-email: ### 开启上传 ### - /usr/local/bin/python /upload.py ### 发送邮件 - - /usr/local/bin/python /ci-android-mail.py + - /usr/local/bin/python /ci-android-mail-jira-comment.py only: - dev - dev-5.33.0 \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/forum/search/CommunitySearchEventListener.kt b/app/src/main/java/com/gh/gamecenter/forum/search/CommunitySearchEventListener.kt index 6359d0685f..b0b85deff5 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/search/CommunitySearchEventListener.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/search/CommunitySearchEventListener.kt @@ -10,9 +10,6 @@ interface CommunitySearchEventListener { fun onItemExposed(contentId: String?, itemType: String?, title: String?, sequence: Int) - // 在论坛搜索点击论坛item,进入论坛详情 - fun onBbsItemClick(sequence: Int, bbsId: String, name: String, button: String) - companion object { const val SEARCH_BUTTON_FOLLOW = "关注用户" diff --git a/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt index c0a697be89..de97ac2f2d 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt @@ -292,11 +292,11 @@ class ForumContentSearchListAdapter( val answerViewHolder = ForumArticleAskItemViewHolder(includedAnswerItem) answerViewHolder.bindForumAnswerItem(answer, mEntrance, "", position) answerViewHolder.itemView.setOnClickListener { - eventListener.onBbsItemClick( - position, - answer.questions.id, + eventListener.onItemClick( + answer.id, + answer.type, htmlToString(answer.questions.title), - BUTTON_VIEW_FORUM_DETAIL + position ) mContext.startActivity( ForumVideoDetailActivity.getIntent( @@ -424,11 +424,11 @@ class ForumContentSearchListAdapter( ) } } - eventListener.onBbsItemClick( - position, - answer.questions.id, + eventListener.onItemClick( + answer.id, + answer.type, htmlToString(answer.questions.title), - BUTTON_VIEW_FORUM_DETAIL + position ) } } diff --git a/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListFragment.kt index a873389a96..0788d60dd4 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListFragment.kt @@ -172,15 +172,4 @@ class ForumContentSearchListFragment : LazyListFragment