From ed1725f9cc190a9d2a8a364bf4c061ae82d404cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <1484288157@qq.com> Date: Tue, 8 Oct 2019 11:21:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV3.7.0-?= =?UTF-8?q?=E9=97=AE=E7=AD=94=E7=A4=BE=E5=8C=BA=E7=9B=B8=E5=85=B3=EF=BC=88?= =?UTF-8?q?13=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/gamecenter/GameDetailActivity.java | 9 +++++++++ .../qa/answer/detail/AnswerDetailActivity.java | 3 +-- .../qa/answer/detail/AnswerDetailFragment.kt | 8 ++++++++ .../qa/article/detail/ArticleDetailActivity.kt | 12 ++++++++++-- .../qa/questions/detail/QuestionsDetailActivity.java | 4 +--- .../qa/questions/detail/QuestionsDetailFragment.kt | 8 ++++++++ app/src/main/res/menu/menu_answer.xml | 6 ++++++ app/src/main/res/menu/menu_questions_detail.xml | 2 +- app/src/main/res/values/colors.xml | 5 +---- 9 files changed, 45 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java index 3ac424e1d2..7943b5169b 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java @@ -13,6 +13,9 @@ import com.gh.common.util.DisplayUtils; import com.gh.common.util.EntranceUtils; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.gamedetail.GameDetailFragment; +import com.halo.assistant.HaloApp; + +import static com.gh.gamecenter.gamedetail.fuli.answer.GameDetailAnswerAdapter.GAME_DETAIL_COME_IN; /** * Created by khy on 2017/3/24. @@ -163,4 +166,10 @@ public class GameDetailActivity extends NormalActivity { protected boolean showDownloadMenu() { return true; } + + @Override + protected void onDestroy() { + super.onDestroy(); + HaloApp.remove(GAME_DETAIL_COME_IN); + } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailActivity.java b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailActivity.java index 6d77d8b211..87a2883496 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailActivity.java @@ -21,9 +21,8 @@ public class AnswerDetailActivity extends NormalActivity { @Override public boolean showToolbarAtLeft() { - boolean isGameDetailComeIn = (boolean) HaloApp.get(GAME_DETAIL_COME_IN, false); - if (isGameDetailComeIn){ + if (HaloApp.get(GAME_DETAIL_COME_IN, false)!=null){ return true; } return super.showToolbarAtLeft(); 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 787a608a7b..8da72fd0ea 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 @@ -38,6 +38,7 @@ import com.gh.gamecenter.* import com.gh.gamecenter.databinding.FragmentAnswerDetailBinding import com.gh.gamecenter.entity.* import com.gh.gamecenter.eventbus.EBReuse +import com.gh.gamecenter.gamedetail.fuli.answer.GameDetailAnswerAdapter import com.gh.gamecenter.normal.NormalFragment import com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG import com.gh.gamecenter.qa.answer.edit.AnswerEditActivity @@ -48,6 +49,7 @@ import com.gh.gamecenter.qa.entity.EditorInsertEntity import com.gh.gamecenter.qa.entity.Questions import com.gh.gamecenter.qa.questions.detail.QuestionsDetailActivity import com.gh.gamecenter.suggest.SuggestType +import com.halo.assistant.HaloApp import com.lightgame.utils.Utils import com.qq.gdt.action.ActionType import org.greenrobot.eventbus.Subscribe @@ -616,6 +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->{ + HaloApp.remove(GameDetailAnswerAdapter.GAME_DETAIL_COME_IN) + DirectUtils.directToCommunity(context!!, null) + } } } @@ -992,6 +998,8 @@ class AnswerDetailFragment : NormalFragment() { (requireActivity() as BaseToolBarActivity).clearMenu() initMenu(R.menu.menu_answer) + val itemMenu = getItemMenu(R.id.menu_question_and_answer) + itemMenu.isVisible = HaloApp.get(GameDetailAnswerAdapter.GAME_DETAIL_COME_IN, false) != null } } 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 4db80883de..86c087abf0 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 @@ -31,6 +31,7 @@ import com.gh.gamecenter.entity.CommunityEntity import com.gh.gamecenter.entity.Permissions import com.gh.gamecenter.entity.SpecialColumn import com.gh.gamecenter.eventbus.EBReuse +import com.gh.gamecenter.gamedetail.fuli.answer.GameDetailAnswerAdapter import com.gh.gamecenter.gamedetail.fuli.answer.GameDetailAnswerAdapter.Companion.GAME_DETAIL_COME_IN import com.gh.gamecenter.manager.UserManager import com.gh.gamecenter.mvvm.Status @@ -69,9 +70,8 @@ class ArticleDetailActivity : BaseActivity() { private var mSpecialColumn: SpecialColumn? = null override fun showToolbarAtLeft(): Boolean { - val isGameDetailComeIn = HaloApp.get(GAME_DETAIL_COME_IN, false) as Boolean - return if (isGameDetailComeIn) { + return if (HaloApp.get(GAME_DETAIL_COME_IN, false) != null) { true } else super.showToolbarAtLeft() } @@ -115,6 +115,10 @@ class ArticleDetailActivity : BaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setToolbarMenu(R.menu.menu_answer) + + val itemMenu = getMenuItem(R.id.menu_question_and_answer) + itemMenu.isVisible = HaloApp.get(GAME_DETAIL_COME_IN, false) != null + setNavigationTitle(getString(R.string.community_article_detail_title)) mNoDataText.setText(R.string.content_delete_hint) @@ -265,6 +269,10 @@ class ArticleDetailActivity : BaseActivity() { if (mViewModel.detailEntity != null) { when (item?.itemId) { R.id.menu_more -> showMoreItemDialog() + R.id.menu_question_and_answer->{ + HaloApp.remove(GAME_DETAIL_COME_IN) + DirectUtils.directToCommunity(this, null) + } } } return super.onMenuItemClick(item) diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailActivity.java index 411c1ebdd1..bb143ac604 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailActivity.java @@ -21,9 +21,7 @@ public class QuestionsDetailActivity extends NormalActivity { @Override public boolean showToolbarAtLeft() { - boolean isGameDetailComeIn = (boolean) HaloApp.get(GAME_DETAIL_COME_IN, false); - - if (isGameDetailComeIn){ + if (HaloApp.get(GAME_DETAIL_COME_IN, false)!=null){ return true; } return super.showToolbarAtLeft(); 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 cf54ae4ccb..8f9636d39e 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 @@ -31,6 +31,7 @@ import com.gh.gamecenter.baselist.LoadType import com.gh.gamecenter.entity.Permissions import com.gh.gamecenter.entity.SpecialColumn import com.gh.gamecenter.eventbus.EBReuse +import com.gh.gamecenter.gamedetail.fuli.answer.GameDetailAnswerAdapter.Companion.GAME_DETAIL_COME_IN import com.gh.gamecenter.mvvm.Status import com.gh.gamecenter.personal.PersonalFragment.LOGIN_TAG import com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity @@ -47,6 +48,7 @@ import com.gh.gamecenter.qa.questions.invite.QuestionsInviteActivity import com.gh.gamecenter.retrofit.Response import com.gh.gamecenter.retrofit.RetrofitManager import com.gh.gamecenter.suggest.SuggestType +import com.halo.assistant.HaloApp import com.lightgame.utils.Utils import com.qq.gdt.action.ActionType import io.reactivex.android.schedulers.AndroidSchedulers @@ -124,6 +126,8 @@ class QuestionsDetailFragment : override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) initMenu(R.menu.menu_questions_detail) + val itemMenu = getItemMenu(R.id.menu_question_and_answer) + itemMenu.isVisible = HaloApp.get(GAME_DETAIL_COME_IN, false) != null } override fun onCreate(savedInstanceState: Bundle?) { @@ -327,6 +331,10 @@ class QuestionsDetailFragment : if (mQuestionsDetailEntity == null) return when (menuItem.itemId) { R.id.menu_more -> showMoreItemDialog() + R.id.menu_question_and_answer->{ + HaloApp.remove(GAME_DETAIL_COME_IN) + DirectUtils.directToCommunity(context!!, null) + } } } diff --git a/app/src/main/res/menu/menu_answer.xml b/app/src/main/res/menu/menu_answer.xml index 912fde975b..7550cd3ba1 100644 --- a/app/src/main/res/menu/menu_answer.xml +++ b/app/src/main/res/menu/menu_answer.xml @@ -2,6 +2,12 @@ + + #e6f3ff #2496FF #1F89EC -<<<<<<< HEAD #1383EB - -======= #EEF5FB ->>>>>>> 884d5d81f9f76615b189cb961f37689984a2e7fd + \ No newline at end of file