From 07de30ceeab286e00a8c7048c611b5dabdcb1160 Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Fri, 27 Apr 2018 01:27:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=8A=95=E7=A5=A8=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E9=80=89=E6=8B=A9=E6=B8=B8=E6=88=8F=E5=85=A5?= =?UTF-8?q?=E5=8F=A3=E6=98=BE=E7=A4=BA=E5=B0=8F=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/AskSelectGameAdapter.java | 5 ++- .../gh/gamecenter/adapter/VoteAdapter.java | 4 +- .../gamecenter/ask/AnswerDetailFragment.java | 7 ++++ .../com/gh/gamecenter/ask/AskFragment.java | 40 ++++++++++++++++--- app/src/main/res/layout/fragment_ask.xml | 14 ++++++- 5 files changed, 59 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/adapter/AskSelectGameAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/AskSelectGameAdapter.java index b99ca90c32..c8a072479f 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/AskSelectGameAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/AskSelectGameAdapter.java @@ -1,6 +1,7 @@ package com.gh.gamecenter.adapter; import android.content.Context; +import android.graphics.Color; import android.support.v4.content.ContextCompat; import android.support.v7.widget.RecyclerView; import android.text.TextUtils; @@ -143,8 +144,8 @@ public class AskSelectGameAdapter extends ListAdapter { bodyHolder.mVoteBtn.setTextColor(ContextCompat.getColor(mContext, R.color.content)); bodyHolder.mVoteBtn.setText(R.string.voted); } else { - bodyHolder.mVoteBtn.setBackgroundResource(R.drawable.comment_border_bg); - bodyHolder.mVoteBtn.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); + bodyHolder.mVoteBtn.setBackgroundResource(R.drawable.button_normal_style); + bodyHolder.mVoteBtn.setTextColor(Color.WHITE); bodyHolder.mVoteBtn.setText(R.string.vote); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java index 79b6e4ee74..4c30f5edba 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java @@ -64,8 +64,8 @@ public class VoteAdapter extends ListAdapter { VersionVoteEntity versionVoteEntity = mEntityList.get(position); UserDataEntity userData = versionVoteEntity.getUserData(); if (userData != null && userData.isVersionRequested()) { - viewHolder.voteBtn.setBackgroundResource(R.drawable.button_normal_border); - viewHolder.voteBtn.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); + viewHolder.voteBtn.setBackgroundResource(R.drawable.border_suggest_bg); + viewHolder.voteBtn.setTextColor(ContextCompat.getColor(mContext, R.color.content)); viewHolder.voteBtn.setText(R.string.voted); viewHolder.voteBtn.setEnabled(false); } else { diff --git a/app/src/main/java/com/gh/gamecenter/ask/AnswerDetailFragment.java b/app/src/main/java/com/gh/gamecenter/ask/AnswerDetailFragment.java index 3d270208c7..9a257702a6 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AnswerDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AnswerDetailFragment.java @@ -110,6 +110,10 @@ public class AnswerDetailFragment extends NormalFragment { TextView mAnswerDetailLikeTv; @BindView(R.id.answer_detail_comment_like_iv) ImageView mAnswerDetailLiveIv; + @BindView(R.id.answer_detail_line) + View mDividerView; + @BindView(R.id.answer_detail_comment_container) + View mBottomContainer; private static final int ANSWER_STATUS_UNKNOWN = 0; private static final int ANSWERED_MY_ANSWER = 1; @@ -227,16 +231,19 @@ public class AnswerDetailFragment extends NormalFragment { HttpException e = apiResponse.getHttpException(); try { if (e != null && e.code() == 404 && e.response().errorBody().string().length() > 0) { + mBottomContainer.setVisibility(View.GONE); mNoDataTv.setText(R.string.content_delete_hint); mNoData.setVisibility(View.VISIBLE); mNoConn.setVisibility(View.GONE); mLoading.setVisibility(View.GONE); mContent.setVisibility(View.GONE); + mDividerView.setVisibility(View.GONE); Utils.toast(getContext(), R.string.content_delete_toast); } else { mNoConn.setVisibility(View.VISIBLE); mLoading.setVisibility(View.GONE); mContent.setVisibility(View.GONE); + mBottomContainer.setVisibility(View.GONE); } } catch (IOException e1) { e1.printStackTrace(); diff --git a/app/src/main/java/com/gh/gamecenter/ask/AskFragment.java b/app/src/main/java/com/gh/gamecenter/ask/AskFragment.java index 5d03e61ba0..30541b1018 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/AskFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/AskFragment.java @@ -2,7 +2,9 @@ package com.gh.gamecenter.ask; import android.app.Activity; import android.content.Intent; +import android.content.SharedPreferences; import android.os.Bundle; +import android.preference.PreferenceManager; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v4.app.Fragment; @@ -58,13 +60,33 @@ public class AskFragment extends BaseFragment { View mAskTabBar; @BindView(R.id.ask_loading) View mLoading; + @BindView(R.id.select_game_hint) + View mSelectGameHint; + private SharedPreferences sp; + private boolean mHasClickedSelectGame; private AskQuestionsRecommendsFragment mRecommendsFragment; public static final int INDEX_HOT = 0; public static final int INDEX_QUESTIONS = 1; // communities public static final int COMMUNITIES_SELECT_REQUEST = 103; + private static final String SP_KEY_CLICKED_SELECT_GAME = "has_clicked_select_game"; + + @Override + public void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + sp = PreferenceManager.getDefaultSharedPreferences(getContext()); + mHasClickedSelectGame = sp.getBoolean(SP_KEY_CLICKED_SELECT_GAME, false); + } + + @Override + public void onResume() { + super.onResume(); + + mSelectGameHint.setVisibility(!mHasClickedSelectGame ? View.VISIBLE : View.GONE); + } + @Override protected int getLayoutId() { return R.layout.fragment_ask; @@ -91,19 +113,18 @@ public class AskFragment extends BaseFragment { mAskGamename.setText(UserManager.getInstance().getCommunityName(getContext())); initViewPager(); setTabbarPosition(INDEX_HOT); - mAskGamename.setOnTouchListener(new onDoubleTapListener(getContext()) { - @Override - public void onDoubleTap() { - mRecommendsFragment.scrollToTop(); - } - }); } + } @OnClick({R.id.ask_selectgame, R.id.ask_search, R.id.ask_hot, R.id.ask_questions, R.id.reuse_no_connection}) public void onViewClicked(View view) { switch (view.getId()) { case R.id.ask_selectgame: + if (!mHasClickedSelectGame) { + mHasClickedSelectGame = true; + sp.edit().putBoolean(SP_KEY_CLICKED_SELECT_GAME, mHasClickedSelectGame).apply(); + } startActivityForResult(CommunitiesSelectActivity.getIntent(getContext()), COMMUNITIES_SELECT_REQUEST); break; case R.id.ask_search: @@ -131,6 +152,13 @@ public class AskFragment extends BaseFragment { fragmentList.add(new AskQuestionsNewFragment()); mAskViewpager.setAdapter(new FragmentAdapter(getChildFragmentManager(), fragmentList)); mAskViewpager.setScrollable(false); + + mAskGamename.setOnTouchListener(new onDoubleTapListener(getContext()) { + @Override + public void onDoubleTap() { + mRecommendsFragment.scrollToTop(); + } + }); } private void setTabbarPosition(int index) { diff --git a/app/src/main/res/layout/fragment_ask.xml b/app/src/main/res/layout/fragment_ask.xml index d9b72ed252..cb27c980fe 100644 --- a/app/src/main/res/layout/fragment_ask.xml +++ b/app/src/main/res/layout/fragment_ask.xml @@ -1,6 +1,7 @@ @@ -10,7 +11,6 @@ android:layout_height = "wrap_content" android:background = "@android:color/white" > - + +