diff --git a/app/src/main/java/com/gh/gamecenter/entity/MeEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/MeEntity.kt index 231896e0b9..ff72dee65f 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/MeEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/MeEntity.kt @@ -62,7 +62,7 @@ class MeEntity(@SerializedName("is_community_voted") @SerializedName(value = "is_answer_commented", alternate = ["is_community_article_commented", "is_video_commented"]) var isAnswerCommented: Boolean = false, - @SerializedName("is_answer_comment_voted", alternate = ["is_video_comment_voted"]) + @SerializedName("is_answer_comment_voted", alternate = ["is_video_comment_voted", "is_community_article_comment_voted"]) var isAnswerCommentVoted: Boolean = false, @SerializedName("is_version_requested") diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt index 8da72fd0ea..002aecd567 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt @@ -618,9 +618,10 @@ class AnswerDetailFragment : NormalFragment() { override fun onMenuItemClick(menuItem: MenuItem) { when (menuItem.itemId) { R.id.menu_more -> mViewModel.answerDetail?.let { showMoreItemDialog(it) } - R.id.menu_question_and_answer->{ + R.id.menu_question_and_answer -> { HaloApp.remove(GameDetailAnswerAdapter.GAME_DETAIL_COME_IN) - DirectUtils.directToCommunity(context!!, null) + val community = mViewModel.answerDetail?.community + DirectUtils.directToCommunity(context!!, community) } } } @@ -655,6 +656,7 @@ class AnswerDetailFragment : NormalFragment() { } dialog.show() + val homeContainer = view.findViewById(R.id.container_home) val reportContainer = view.findViewById(R.id.container_report) val commentControlContainer = view.findViewById(R.id.container_comment_control) if (answer.me.isModerator) { @@ -666,6 +668,7 @@ class AnswerDetailFragment : NormalFragment() { } } + reportContainer.visibility = if (answer.me.isAnswerOwn) View.GONE else View.VISIBLE if (answer.me.isAnswerOwn) { commentControlContainer.visibility = View.VISIBLE val commentControlTv = commentControlContainer.findViewById(R.id.tv_comment_control) @@ -688,6 +691,10 @@ class AnswerDetailFragment : NormalFragment() { } } } + homeContainer.setOnClickListener { + val community = mViewModel.answerDetail?.community + DirectUtils.directToCommunity(context!!, community) + } reportContainer.setOnClickListener { dialog.dismiss() diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt index 86c087abf0..353b3cbd34 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt @@ -269,9 +269,10 @@ class ArticleDetailActivity : BaseActivity() { if (mViewModel.detailEntity != null) { when (item?.itemId) { R.id.menu_more -> showMoreItemDialog() - R.id.menu_question_and_answer->{ + R.id.menu_question_and_answer -> { HaloApp.remove(GAME_DETAIL_COME_IN) - DirectUtils.directToCommunity(this, null) + val community = mViewModel.articleLiveData.value?.data?.community + DirectUtils.directToCommunity(this, community) } } } @@ -540,6 +541,7 @@ class ArticleDetailActivity : BaseActivity() { } dialog.show() + val homeContainer = view.findViewById(R.id.container_home) val reportContainer = view.findViewById(R.id.container_report) val reportTv = view.findViewById(R.id.tv_report) val reportIv = view.findViewById(R.id.iv_report) @@ -592,6 +594,10 @@ class ArticleDetailActivity : BaseActivity() { } } } + homeContainer.setOnClickListener { + val community = mViewModel.articleLiveData.value?.data?.community + DirectUtils.directToCommunity(this, community) + } reportContainer.setOnClickListener { dialog.dismiss() diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.kt index 8f9636d39e..c376e8a23d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.kt @@ -354,10 +354,15 @@ class QuestionsDetailFragment : window.attributes = lp } dialog.show() + val moreItemHome = view.findViewById(R.id.more_item_home) val item1 = view.findViewById(R.id.more_item1) val item2 = view.findViewById(R.id.more_item2) val managerItem = view.findViewById(R.id.more_manager) + item1.visibility=if (mQuestionsDetailEntity!!.me.isQuestionOwn) View.GONE else View.VISIBLE managerItem.visibility = if (mQuestionsDetailEntity!!.me.isModerator) View.VISIBLE else View.GONE + moreItemHome.setOnClickListener { + DirectUtils.directToCommunity(context!!, null) + } item1.setOnClickListener { dialog.dismiss() // 跳转意见反馈 diff --git a/app/src/main/res/drawable-xhdpi/menu_more_home.png b/app/src/main/res/drawable-xhdpi/menu_more_home.png new file mode 100644 index 0000000000..79fc2c1638 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/menu_more_home.png differ diff --git a/app/src/main/res/layout/menu_answer_detail_more.xml b/app/src/main/res/layout/menu_answer_detail_more.xml index 7c84fe3561..0f4db22f14 100644 --- a/app/src/main/res/layout/menu_answer_detail_more.xml +++ b/app/src/main/res/layout/menu_answer_detail_more.xml @@ -15,7 +15,33 @@ android:orientation="vertical" android:paddingTop="2.5dp" android:paddingBottom="2.5dp"> + + + + + + + + + +