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

光环助手V3.7.0-问答社区相关（13）

Browse Source
This commit is contained in:
张玉久
2019-10-08 11:21:37 +08:00
parent 8d5cc4e983
commit ed1725f9cc
9 changed files with 45 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/gh/gamecenter/GameDetailActivity.java
View File

@ -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);
}
}

3
app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailActivity.java
View File

@ -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();

8
app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt
View File

@ -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
}
}

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

@ -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)

4
app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailActivity.java
View File

@ -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();

8
app/src/main/java/com/gh/gamecenter/qa/questions/detail/QuestionsDetailFragment.kt
View File

@ -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)
}
}
}