From a92de9ffa0b7b7f725bf53e67213a5da8a0f50d7 Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Wed, 17 May 2017 19:52:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/common/constant/Config.java | 8 ++++---- .../main/java/com/gh/gamecenter/SuggestionActivity.java | 1 + .../java/com/gh/gamecenter/game/GameFragmentAdapter.java | 4 ++-- .../main/java/com/gh/gamecenter/libao/Libao1Fragment.java | 6 +++--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/gh/common/constant/Config.java b/app/src/main/java/com/gh/common/constant/Config.java index bb7606d368..7dee089abc 100644 --- a/app/src/main/java/com/gh/common/constant/Config.java +++ b/app/src/main/java/com/gh/common/constant/Config.java @@ -7,11 +7,11 @@ import com.gh.gamecenter.BuildConfig; public class Config { - public static final String HOST = "http://dev.api2.ghzhushou.com/v2d5/"; - public static final String USER_HOST = "http://dev.user2.ghzhushou.com/v1d2/"; - public static final String COMMENT_HOST = "http://dev.comment2.ghzhushou.com/v1d2/"; + public static final String HOST = "http://api2.ghzhushou.com/v2d5/"; + public static final String USER_HOST = "http://user2.ghzhushou.com/v1d2/"; + public static final String COMMENT_HOST = "http://comment2.ghzhushou.com/v1d2/"; public static final String DATA_HOST = "http://data.ghzhushou.com/"; - public static final String LIBAO_HOST = "http://dev.libao2.ghzhushou.com/v1d2/"; + public static final String LIBAO_HOST = "http://libao2.ghzhushou.com/v1d2/"; public static final String MESSAGE_HOST = "http://message.ghzhushou.com/v1d0/"; public static final String PREFERENCE = "ghzhushou"; diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index da8ffbc345..4fad92c076 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -20,6 +20,7 @@ import com.gh.base.BaseActivity; import com.gh.common.constant.Config; import com.gh.common.util.*; import com.gh.gamecenter.entity.InstallGameEntity; +import com.gh.gamecenter.entity.SuggestionTypeEntity; import com.gh.gamecenter.fragment.WaitingDialogFragment; import com.gh.gamecenter.retrofit.JSONObjectResponse; import com.gh.gamecenter.retrofit.RetrofitManager; diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java index 77e927aef5..dc1bc371d6 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java @@ -135,7 +135,7 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { .subscribe(new Response>() { @Override public void onResponse(List response) { - if (response.size() == 5) { + if (response.size() > 0) { mSubjectDigestList = response; } else { mIsSubjectDigestError = true; @@ -644,7 +644,7 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { contentView.setLayoutParams(lp); viewHolder.subjectLl.addView(contentView); - if (mSubjectDigestList.size() >= entrance_size) { + if (mSubjectDigestList.size() >= i + 1) { // if (mSubjectDigestList.size() >= 5 && i < 5) { ImageUtils.display(subjectIcon, mSubjectDigestList.get(i).getIcon()); diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java index e09f2913b8..beb79112d5 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java @@ -247,9 +247,9 @@ public class Libao1Fragment extends BaseFragment implements SwipeRefreshLayout.O } isDone = true; - - if (!mIsSearch) { - View view = mRecyclerView.getChildAt(mRecyclerView.getChildCount() - 1); + int i = mRecyclerView.getChildCount() - 1; + if (!mIsSearch && i > 0) { + View view = mRecyclerView.getChildAt(i); mFooterHint = (TextView) view.findViewById(R.id.footerview_hint); } }