From 8ed2a138847546be10e980bd3dffa4fd8e5cf308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=99=A8?= Date: Fri, 10 Nov 2023 10:34:07 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=E5=9F=8B=E7=82=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=9A=E5=86=85=E5=AE=B9=E5=86=85=E5=AE=B9=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E8=AF=AF=20https://jira.shanqu.cc/browse/GHZ?= =?UTF-8?q?S-3940?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search/CommunitySearchEventListener.kt | 3 --- .../search/ForumContentSearchListAdapter.kt | 18 ++++++++++-------- .../search/ForumContentSearchListFragment.kt | 10 ---------- .../qa/dialog/ChooseForumContainerFragment.kt | 7 +++++++ 4 files changed, 17 insertions(+), 21 deletions(-) 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 67b2cc4331..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) - 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 f879ddf8a7..c853344265 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,10 +292,11 @@ class ForumContentSearchListAdapter( val answerViewHolder = ForumArticleAskItemViewHolder(includedAnswerItem) answerViewHolder.bindForumAnswerItem(answer, mEntrance, "", position) answerViewHolder.itemView.setOnClickListener { - eventListener.onBbsItemClick( - position, - answer.questions.id, - htmlToString(answer.questions.title) + eventListener.onItemClick( + answer.id, + answer.type, + htmlToString(answer.questions.title), + position ) mContext.startActivity( ForumVideoDetailActivity.getIntent( @@ -423,10 +424,11 @@ class ForumContentSearchListAdapter( ) } } - eventListener.onBbsItemClick( - position, - answer.questions.id, - htmlToString(answer.questions.title) + eventListener.onItemClick( + answer.id, + answer.type, + htmlToString(answer.questions.title), + 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 a650b25485..eaee6ef5a1 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,14 +172,4 @@ class ForumContentSearchListFragment : LazyListFragment { return mAdapter ?: ChooseForumContainerAdapter(requireContext(), type, mListViewModel) { enity, position -> trackSearchResultClick(mSearchKey, mSearchType) + NewFlatLogUtils.logSearchBbsClick( + SearchType.fromString(mSearchType).toChinese(), + mSearchKey, + enity.id, + position + 1, + enity.name + ) if (requireActivity() is ChooseForumActivity) { (requireActivity() as ChooseForumActivity).chooseSuccess(enity) val entrance = From 846fd7222ea362cbaeadf8a1bef7f1bdb6b3a2cf Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Fri, 10 Nov 2023 10:42:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?ci:=20jira=20=E9=9C=80=E6=B1=82=E4=B8=8B?= =?UTF-8?q?=E8=A1=A5=E5=85=85=20APK=20=E9=99=84=E4=BB=B6=E8=AF=84=E8=AE=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7c63323ace..9967b4bf83 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -150,6 +150,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.32.0 \ No newline at end of file From 86c17814268079b774137bdda412824ddbc65980 Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Fri, 10 Nov 2023 11:20:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?ci:=20jira=20=E9=9C=80=E6=B1=82=E4=B8=8B?= =?UTF-8?q?=E8=A1=A5=E5=85=85=20APK=20=E9=99=84=E4=BB=B6=E8=AF=84=E8=AE=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9967b4bf83..0ce98b9854 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -149,7 +149,6 @@ 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