diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index b5d7c0e9e7..83d9b7f89f 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -123,7 +123,7 @@ public abstract class BaseActivity extends BaseToolBarActivity implements EasyPe @Override public void onConfirm() { if (FileUtils.isEmptyFile(showDialog.getPath())) { - toast(getString(R.string.install_failure_hint)); + toast(R.string.install_failure_hint); } else { startActivity(PackageUtils.getUninstallIntent(BaseActivity.this, showDialog.getPath())); } diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index db7895c6ff..b0691779ea 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -574,13 +574,13 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, newsDetailEntity.getUserData().setArticleFavorite(false); mNewsCollection.setEnabled(true); mNewsCollection.setImageResource(R.drawable.menu_ic_collect_unselect); - toast(getString(R.string.collection_cancel)); + toast(R.string.collection_cancel); } @Override public void onError() { mNewsCollection.setEnabled(true); - toast(getString(R.string.collection_cancel_failure)); + toast(R.string.collection_cancel_failure); } }); @@ -600,13 +600,13 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, userData.setArticleFavorite(true); mNewsCollection.setEnabled(true); mNewsCollection.setImageResource(R.drawable.menu_ic_collect_select); - toast(getString(R.string.collection_success)); + toast(R.string.collection_success); } @Override public void onError() { mNewsCollection.setEnabled(true); - toast(getString(R.string.collection_failure)); + toast(R.string.collection_failure); } }); } diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index bebdb3511c..dab3576ed7 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -171,7 +171,7 @@ public class SuggestionActivity extends BaseActivity implements SuggestTypeAdapt File file = new File(picturePath); if (file.length() > 8 * 1024 * 1024) { - toast(getString(R.string.suggestion_pic_hint)); + toast(R.string.suggestion_pic_hint); } else { String newPath = getCacheDir() + File.separator + System.currentTimeMillis() + ".jpg"; Observable.create((Observable.OnSubscribe) diff --git a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailAdapter.java index f01f38fb50..40417bdae0 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsDetailAdapter.java @@ -30,7 +30,6 @@ import com.gh.gamecenter.ask.entity.QuestionsDetailEntity; import com.gh.gamecenter.baselist.ListAdapter; import com.gh.gamecenter.baselist.LoadStatus; import com.google.android.flexbox.FlexboxLayout; -import com.lightgame.utils.Utils; import java.util.List; @@ -64,7 +63,7 @@ public class QuestionsDetailAdapter extends ListAdapter { protected void provideListData(List listData) { if (listData != null && listData.size() != 0 && mQuestionsDetailEntity != null) { mEntityList.addAll(listData); - notifyItemRangeInserted(mEntityList.size() - listData.size() + 1, listData.size()); + notifyItemRangeInserted(mEntityList.size() - listData.size() + TOP_ITEM_COUNT, listData.size()); } } diff --git a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsInviteAdapter.java b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsInviteAdapter.java index 96f7bc8a05..7a6ef4c01f 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsInviteAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/ask/questionsdetail/QuestionsInviteAdapter.java @@ -13,6 +13,8 @@ import com.gh.gamecenter.ask.entity.InviteEntity; import com.gh.gamecenter.ask.entity.MeEntity; import com.gh.gamecenter.baselist.ListAdapter; +import java.util.List; + /** * Created by khy on 7/12/17. */ @@ -26,6 +28,13 @@ public class QuestionsInviteAdapter extends ListAdapter { mListClickListener = listClickListener; } + protected void provideListData(List listData) { + if (listData != null && listData.size() != 0) { + mEntityList.addAll(listData); + notifyItemRangeInserted(mEntityList.size() - listData.size() + TOP_ITEM_COUNT, listData.size()); + } + } + @Override public int getItemViewType(int position) { if (position == 0) { diff --git a/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java b/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java index 4279eadcc2..fece34188e 100644 --- a/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java @@ -231,7 +231,7 @@ public class ConcernFragment extends NormalFragment implements SwipeRefreshLayou List> sequences = new ArrayList<>(); for (int i = 0, size = installedList.size() + 1; i < size; i++) { if (i == size - 1) { - sequences.add(RetrofitManager.getInstance(getContext()).getApi().getGameDigest(getContext().getString(R.string.ghzs_id)));// 光环助手ID + sequences.add(RetrofitManager.getInstance(getContext()).getApi().getGameDigest(getString(R.string.ghzs_id)));// 光环助手ID } else { sequences.add(RetrofitManager.getInstance(getContext()).getApi().getGameDigest(installedList.get(i).getId())); }