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

feat: 【光环助手】神策埋点问题-帖子浏览来源入口上报缺失 https://jira.shanqu.cc/browse/GHZSCY-6545

Browse Source
This commit is contained in:
曾祥俊
2024-08-20 11:28:25 +08:00
parent 21226ec96c
commit fd77516e7c
13 changed files with 45 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -72,7 +72,6 @@ android_build:
only: only:
- dev - dev
- release - release
- feat/GHZSCY-6578
# 代码检查 # 代码检查
sonarqube_analysis: sonarqube_analysis:
@ -157,5 +156,4 @@ oss-upload&send-email:
- /usr/local/bin/python /ci-android-mail-jira-comment.py - /usr/local/bin/python /ci-android-mail-jira-comment.py
only: only:
- dev - dev
- release - release
- feat/GHZSCY-6578

2
app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java
View File

@ -137,7 +137,7 @@ public class AnswerAdapter extends ListAdapter<AnswerEntity> implements ISyncAda
holder.itemView.setOnClickListener(v -> { holder.itemView.setOnClickListener(v -> {
if (mCurrentOption == ManageOption.OPTION_MANAGER) { if (mCurrentOption == ManageOption.OPTION_MANAGER) {
if (entity.getActive()) { if (entity.getActive()) {
mContext.startActivity(NewQuestionDetailActivity.getCommentIntent(mContext, entity.getQuestions().getId(), entity.getId(), mEntrance, path)); mContext.startActivity(NewQuestionDetailActivity.getCommentIntent(mContext, entity.getQuestions().getId(), entity.getId(), mEntrance, path, ""));
} else { } else {
showDeleteDialog(entity.getId()); showDeleteDialog(entity.getId());
} }

11
app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListAdapter.kt
View File

@ -117,7 +117,7 @@ class ForumArticleAskListAdapter(
answerViewHolder.itemView.setOnClickListener { answerViewHolder.itemView.setOnClickListener {
val entrance = BaseActivity.mergeEntranceAndPath(entrance, path) val entrance = BaseActivity.mergeEntranceAndPath(entrance, path)
val userId = answer.user.id ?: "" val userId = answer.user.id ?: ""
val contentId = answer.id ?: "" val contentId = answer.id
val sequence = articlePosition + 1 val sequence = articlePosition + 1
val bbsType = if (answer.bbs.type == "official_bbs") "综合论坛" else "游戏论坛" val bbsType = if (answer.bbs.type == "official_bbs") "综合论坛" else "游戏论坛"
when (answer.type) { when (answer.type) {
@ -164,7 +164,7 @@ class ForumArticleAskListAdapter(
holder.getKey(entrance), holder.getKey(entrance),
"${answer.title}（${answer.id}）" "${answer.title}（${answer.id}）"
) )
mContext.startActivity(ForumVideoDetailActivity.getIntent(mContext, answer.id ?: "", bbsId, "论坛详情-信息流")) mContext.startActivity(ForumVideoDetailActivity.getIntent(mContext, answer.id, bbsId, "论坛详情-信息流"))
} }
"question" -> { "question" -> {
NewLogUtils.logForumDetailFeedContentClick( NewLogUtils.logForumDetailFeedContentClick(
@ -206,7 +206,12 @@ class ForumArticleAskListAdapter(
) )
mContext.startActivity( mContext.startActivity(
NewQuestionDetailActivity.getCommentIntent( NewQuestionDetailActivity.getCommentIntent(
mContext, answer.questions.id, answer.id, entrance, path mContext,
answer.questions.id,
answer.id,
entrance,
path,
sourceEntrance = "论坛详情-信息流"
) )
) )
} }

8
app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt
View File

@ -486,7 +486,7 @@ class ForumArticleAskItemViewHolder(
val intent = ArticleDetailActivity.getCommentIntent( val intent = ArticleDetailActivity.getCommentIntent(
itemView.context, itemView.context,
CommunityEntity(communityId, entity.communityName ?: ""), CommunityEntity(communityId, entity.communityName ?: ""),
entity.id ?: "", entity.id,
entrance, "" entrance, ""
) )
itemView.context.startActivity(intent) itemView.context.startActivity(intent)
@ -497,8 +497,7 @@ class ForumArticleAskItemViewHolder(
val communityId = entity.community.id val communityId = entity.community.id
itemView.context.startActivity( itemView.context.startActivity(
ForumVideoDetailActivity.getIntent( ForumVideoDetailActivity.getIntent(
itemView.context, entity.id itemView.context, entity.id, communityId, true
?: "", communityId, true
) )
) )
} }
@ -522,8 +521,9 @@ class ForumArticleAskItemViewHolder(
NewQuestionDetailActivity.getCommentIntent( NewQuestionDetailActivity.getCommentIntent(
it.context, it.context,
entity.questions.id, entity.questions.id,
entity.id ?: "", entity.id,
entrance, entrance,
"",
"" ""
) )
) )

3
app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListAdapter.kt
View File

@ -199,7 +199,8 @@ class ForumArticleListAdapter(
articleEntity.recommendId, articleEntity.recommendId,
mEntrance, mEntrance,
path, path,
true true,
sourceEntrance = "社区-推荐信息流"
) )
) )
} }

6
app/src/main/java/com/gh/gamecenter/forum/home/follow/FollowActivityResultLauncher.kt
View File

@ -128,7 +128,8 @@ class FollowActivityResultLauncher(
context, context,
input.historyEntity.id, input.historyEntity.id,
"", "",
UserHistoryFragment.PATH_USER_QUESTION_ANSWER UserHistoryFragment.PATH_USER_QUESTION_ANSWER,
sourceEntrance = "关注-论坛动态"
) )
} else { } else {
if (input.answerEntity?.type == "question") { if (input.answerEntity?.type == "question") {
@ -144,7 +145,8 @@ class FollowActivityResultLauncher(
input.answerEntity?.questions?.id ?: "", input.answerEntity?.questions?.id ?: "",
input.answerEntity?.answerId ?: "", input.answerEntity?.answerId ?: "",
"", "",
"" "",
sourceEntrance = "关注-论坛动态",
) )
} }

3
app/src/main/java/com/gh/gamecenter/forum/home/follow/viewholder/FollowPostCardViewHolder.kt
View File

@ -113,7 +113,8 @@ class FollowPostCardViewHolder(
articleEntity.recommendId, articleEntity.recommendId,
"", "",
path, path,
true true,
sourceEntrance = "社区-关注"
) )
) )
} }

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

@ -201,7 +201,7 @@ class ForumContentSearchListAdapter(
mContext.startActivity( mContext.startActivity(
ForumVideoDetailActivity.getIntent( ForumVideoDetailActivity.getIntent(
mContext, mContext,
answer.id ?: "", answer.id,
answer.bbs.id, answer.bbs.id,
sourceEntrance = "社区-搜索-内容榜单" sourceEntrance = "社区-搜索-内容榜单"
) )
@ -309,8 +309,9 @@ class ForumContentSearchListAdapter(
mContext.startActivity( mContext.startActivity(
ForumVideoDetailActivity.getIntent( ForumVideoDetailActivity.getIntent(
mContext, mContext,
answer.id ?: "", answer.id,
answer.bbs.id answer.bbs.id,
sourceEntrance = "社区-搜索-内容榜单"
) )
) )
} }
@ -406,8 +407,9 @@ class ForumContentSearchListAdapter(
mContext.startActivity( mContext.startActivity(
ForumVideoDetailActivity.getIntent( ForumVideoDetailActivity.getIntent(
mContext, mContext,
answer.id ?: "", answer.id,
answer.bbs.id answer.bbs.id,
sourceEntrance = "社区-搜索-内容榜单"
) )
) )
} }

3
app/src/main/java/com/gh/gamecenter/qa/answer/BaseAnswerOrArticleItemViewHolder.kt
View File

@ -71,7 +71,7 @@ open class BaseAnswerOrArticleItemViewHolder(itemView: View) : BaseRecyclerViewH
val intent = ArticleDetailActivity.getCommentIntent( val intent = ArticleDetailActivity.getCommentIntent(
itemView.context, itemView.context,
CommunityEntity(communityId, entity.communityName ?: ""), CommunityEntity(communityId, entity.communityName ?: ""),
entity.id ?: "", entrance, "" entity.id, entrance, ""
) )
itemView.context.startActivity(intent) itemView.context.startActivity(intent)
} }
@ -250,6 +250,7 @@ open class BaseAnswerOrArticleItemViewHolder(itemView: View) : BaseRecyclerViewH
entity.questions.id, entity.questions.id,
entity.id, entity.id,
entrance, entrance,
"",
"" ""
) )
itemView.context.startActivity(intent) itemView.context.startActivity(intent)

8
app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt
View File

@ -65,7 +65,8 @@ class ArticleDetailActivity : ToolBarActivity() {
community: CommunityEntity, community: CommunityEntity,
articleId: String, articleId: String,
entrance: String, entrance: String,
path: String path: String,
sourceEntrance: String = "",
): Intent { ): Intent {
val intent = Intent(context, ArticleDetailActivity::class.java) val intent = Intent(context, ArticleDetailActivity::class.java)
intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path))
@ -73,6 +74,7 @@ class ArticleDetailActivity : ToolBarActivity() {
intent.putExtra(EntranceConsts.KEY_COMMUNITY_DATA, community) intent.putExtra(EntranceConsts.KEY_COMMUNITY_DATA, community)
intent.putExtra(EntranceConsts.KEY_SCROLL_TO_COMMENT_AREA, true) intent.putExtra(EntranceConsts.KEY_SCROLL_TO_COMMENT_AREA, true)
intent.putExtra(EntranceConsts.KEY_PATH, path) intent.putExtra(EntranceConsts.KEY_PATH, path)
intent.putExtra(EntranceConsts.KEY_SOURCE_ENTRANCE, sourceEntrance)
return intent return intent
} }
@ -106,7 +108,8 @@ class ArticleDetailActivity : ToolBarActivity() {
articleId: String, articleId: String,
topCommentId: String, topCommentId: String,
entrance: String, entrance: String,
path: String path: String,
sourceEntrance: String = "",
): Intent { ): Intent {
val intent = Intent(context, ArticleDetailActivity::class.java) val intent = Intent(context, ArticleDetailActivity::class.java)
intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path))
@ -115,6 +118,7 @@ class ArticleDetailActivity : ToolBarActivity() {
intent.putExtra(EntranceConsts.KEY_SCROLL_TO_COMMENT_AREA, true) intent.putExtra(EntranceConsts.KEY_SCROLL_TO_COMMENT_AREA, true)
intent.putExtra(EntranceConsts.KEY_TOP_COMMENT_ID, topCommentId) intent.putExtra(EntranceConsts.KEY_TOP_COMMENT_ID, topCommentId)
intent.putExtra(EntranceConsts.KEY_PATH, path) intent.putExtra(EntranceConsts.KEY_PATH, path)
intent.putExtra(EntranceConsts.KEY_SOURCE_ENTRANCE, sourceEntrance)
return intent return intent
} }
} }

1
app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailRelatedContentListAdapter.kt
View File

@ -85,6 +85,7 @@ class ArticleDetailRelatedContentListAdapter(
item.questions.id, item.questions.id,
item.id, item.id,
entrance, entrance,
"",
"" ""
) )
it.context.startActivity(intent) it.context.startActivity(intent)

2
app/src/main/java/com/gh/gamecenter/qa/myqa/MyAnswerAdapter.java
View File

@ -85,7 +85,7 @@ class MyAnswerAdapter extends ListAdapter<AnswerEntity> implements ISyncAdapterH
NewFlatLogUtils.logHaloSelfPublishContent("回答", "卡片内容"); NewFlatLogUtils.logHaloSelfPublishContent("回答", "卡片内容");
} }
mContext.startActivity(NewQuestionDetailActivity.getCommentIntent(mContext, mContext.startActivity(NewQuestionDetailActivity.getCommentIntent(mContext,
entity.getQuestions().getId(), entity.getId() != null ? entity.getId() : "", mEntrance, "我的光环-我的问答-我的回答")); entity.getQuestions().getId(), entity.getId() != null ? entity.getId() : "", mEntrance, "我的光环-我的问答-我的回答", ""));
}); });
answerViewHolder.getCommentCount().setVisibility(View.INVISIBLE); answerViewHolder.getCommentCount().setVisibility(View.INVISIBLE);

8
app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailActivity.kt
View File

@ -58,13 +58,15 @@ class NewQuestionDetailActivity : ToolBarActivity() {
context: Context, context: Context,
questionId: String, questionId: String,
entrance: String, entrance: String,
path: String path: String,
sourceEntrance: String = ""
): Intent { ): Intent {
val intent = Intent(context, NewQuestionDetailActivity::class.java) val intent = Intent(context, NewQuestionDetailActivity::class.java)
intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path))
intent.putExtra(EntranceConsts.KEY_QUESTIONS_ID, questionId) intent.putExtra(EntranceConsts.KEY_QUESTIONS_ID, questionId)
intent.putExtra(EntranceConsts.KEY_SCROLL_TO_COMMENT_AREA, true) intent.putExtra(EntranceConsts.KEY_SCROLL_TO_COMMENT_AREA, true)
intent.putExtra(EntranceConsts.KEY_PATH, path) intent.putExtra(EntranceConsts.KEY_PATH, path)
intent.putExtra(EntranceConsts.KEY_SOURCE_ENTRANCE, sourceEntrance)
return intent return intent
} }
@ -74,7 +76,8 @@ class NewQuestionDetailActivity : ToolBarActivity() {
questionId: String, questionId: String,
answerId: String, answerId: String,
entrance: String, entrance: String,
path: String path: String,
sourceEntrance: String = ""
): Intent { ): Intent {
val intent = Intent(context, NewQuestionDetailActivity::class.java) val intent = Intent(context, NewQuestionDetailActivity::class.java)
intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path)) intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path))
@ -82,6 +85,7 @@ class NewQuestionDetailActivity : ToolBarActivity() {
intent.putExtra(EntranceConsts.KEY_ANSWER_ID, answerId) intent.putExtra(EntranceConsts.KEY_ANSWER_ID, answerId)
intent.putExtra(EntranceConsts.KEY_SCROLL_TO_COMMENT_AREA, true) intent.putExtra(EntranceConsts.KEY_SCROLL_TO_COMMENT_AREA, true)
intent.putExtra(EntranceConsts.KEY_PATH, path) intent.putExtra(EntranceConsts.KEY_PATH, path)
intent.putExtra(EntranceConsts.KEY_SOURCE_ENTRANCE, sourceEntrance)
return intent return intent
} }