Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev-5.33.0-merged-dev

Browse Source 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/forum/search/CommunitySearchEventListener.kt
#	app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt
#	app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListFragment.kt
This commit is contained in:
张晨
2023-11-10 14:05:20 +08:00
parent 52980189ed 7189261c01
commit 3f60f85992
4 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -149,7 +149,7 @@ oss-upload&send-email:
### 开启上传 ### ### 开启上传 ###
- /usr/local/bin/python /upload.py - /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: only:
- dev - dev
- dev-5.33.0 - dev-5.33.0

3
app/src/main/java/com/gh/gamecenter/forum/search/CommunitySearchEventListener.kt
View File

@ -10,9 +10,6 @@ interface CommunitySearchEventListener {
fun onItemExposed(contentId: String?, itemType: String?, title: String?, sequence: Int) fun onItemExposed(contentId: String?, itemType: String?, title: String?, sequence: Int)
// 在论坛搜索点击论坛item，进入论坛详情
fun onBbsItemClick(sequence: Int, bbsId: String, name: String, button: String)
companion object { companion object {
const val SEARCH_BUTTON_FOLLOW = "关注用户" const val SEARCH_BUTTON_FOLLOW = "关注用户"

16
app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt
View File

@ -292,11 +292,11 @@ class ForumContentSearchListAdapter(
val answerViewHolder = ForumArticleAskItemViewHolder(includedAnswerItem) val answerViewHolder = ForumArticleAskItemViewHolder(includedAnswerItem)
answerViewHolder.bindForumAnswerItem(answer, mEntrance, "", position) answerViewHolder.bindForumAnswerItem(answer, mEntrance, "", position)
answerViewHolder.itemView.setOnClickListener { answerViewHolder.itemView.setOnClickListener {
eventListener.onBbsItemClick( eventListener.onItemClick(
position, answer.id,
answer.questions.id, answer.type,
htmlToString(answer.questions.title), htmlToString(answer.questions.title),
BUTTON_VIEW_FORUM_DETAIL position
) )
mContext.startActivity( mContext.startActivity(
ForumVideoDetailActivity.getIntent( ForumVideoDetailActivity.getIntent(
@ -424,11 +424,11 @@ class ForumContentSearchListAdapter(
) )
} }
} }
eventListener.onBbsItemClick( eventListener.onItemClick(
position, answer.id,
answer.questions.id, answer.type,
htmlToString(answer.questions.title), htmlToString(answer.questions.title),
BUTTON_VIEW_FORUM_DETAIL position
) )
} }
} }

11
app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListFragment.kt
View File

@ -172,15 +172,4 @@ class ForumContentSearchListFragment : LazyListFragment<AnswerEntity, ForumConte
sequence + 1 sequence + 1
) )
} }
override fun onBbsItemClick(sequence: Int, bbsId: String, name: String, button: String) {
NewFlatLogUtils.logSearchBbsClick(
SearchType.fromString(mSearchType).toChinese(),
mSearchKey,
bbsId,
sequence + 1,
name,
button
)
}
} }