diff --git a/app/src/main/java/com/gh/common/util/AskErrorResponseUtils.java b/app/src/main/java/com/gh/common/util/AskErrorResponseUtils.java index d6c8d26b79..6fa7184b5b 100644 --- a/app/src/main/java/com/gh/common/util/AskErrorResponseUtils.java +++ b/app/src/main/java/com/gh/common/util/AskErrorResponseUtils.java @@ -2,7 +2,6 @@ package com.gh.common.util; import android.content.Context; -import com.gh.gamecenter.R; import com.lightgame.utils.Utils; import org.json.JSONObject; @@ -37,7 +36,7 @@ public class AskErrorResponseUtils { Utils.toast(context, "用户的评论被墙（黑名单）"); break; default: - Utils.toast(context, context.getString(R.string.request_failure_normal_hint)); + Utils.toast(context, "网络错误"); break; } } else if (code == 403) { @@ -88,7 +87,7 @@ public class AskErrorResponseUtils { Utils.toast(context, "已经关注过了"); break; default: - Utils.toast(context, context.getString(R.string.request_failure_normal_hint)); + Utils.toast(context, "网络错误"); break; } } else if (code == 401 && errorCode == 404001) { diff --git a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java index 187b81a8ba..4ea7b79364 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java @@ -441,7 +441,7 @@ public class DownloadItemUtils { if (downloadEntity != null) { final String path = downloadEntity.getPath(); if (FileUtils.isEmptyFile(path)) { - Utils.toast(context, context.getString(R.string.install_failure_hint)); + Utils.toast(context, R.string.install_failure_hint); DownloadManager.getInstance(context).cancel(downloadEntity.getUrl()); if (gameEntity.getEntryMap() != null) { gameEntity.getEntryMap().remove(apkEntity.getPlatform()); diff --git a/app/src/main/java/com/gh/common/util/MessageShareUtils.java b/app/src/main/java/com/gh/common/util/MessageShareUtils.java index 8a73ef0d26..f33489850e 100644 --- a/app/src/main/java/com/gh/common/util/MessageShareUtils.java +++ b/app/src/main/java/com/gh/common/util/MessageShareUtils.java @@ -86,7 +86,7 @@ public class MessageShareUtils { @Override public void onCancel() { - Utils.toast(mContext, mContext.getString(R.string.share_cancel_hint)); + Utils.toast(mContext, R.string.share_cancel_hint); } }; // 适配快传成绩单分享 diff --git a/app/src/main/java/com/gh/common/util/PostCommentUtils.java b/app/src/main/java/com/gh/common/util/PostCommentUtils.java index 580f06de05..b10fa85fce 100644 --- a/app/src/main/java/com/gh/common/util/PostCommentUtils.java +++ b/app/src/main/java/com/gh/common/util/PostCommentUtils.java @@ -44,7 +44,7 @@ public class PostCommentUtils { listener.postSuccess(response); } } else { - Utils.toast(context, context.getString(R.string.post_failure_hint)); + Utils.toast(context, R.string.post_failure_hint); } } diff --git a/app/src/main/java/com/gh/common/util/ShareUtils.java b/app/src/main/java/com/gh/common/util/ShareUtils.java index 6277297f87..a753798aff 100644 --- a/app/src/main/java/com/gh/common/util/ShareUtils.java +++ b/app/src/main/java/com/gh/common/util/ShareUtils.java @@ -101,17 +101,17 @@ public class ShareUtils { public IUiListener QqShareListener = new IUiListener() { @Override public void onComplete(Object o) { - Utils.toast(mContext, mContext.getString(R.string.share_success_hint)); + Utils.toast(mContext, R.string.share_success_hint); } @Override public void onError(UiError uiError) { - Utils.toast(mContext, mContext.getString(R.string.share_fail_hint)); + Utils.toast(mContext, R.string.share_fail_hint); } @Override public void onCancel() { - Utils.toast(mContext, mContext.getString(R.string.share_cancel_hint)); + Utils.toast(mContext, R.string.share_cancel_hint); } }; @@ -215,7 +215,7 @@ public class ShareUtils { //QQ分享 private void qqShare() { - Utils.toast(mContext, mContext.getString(R.string.share_skip)); + Utils.toast(mContext, R.string.share_skip); Bundle params = new Bundle(); switch (mShareType) { @@ -243,7 +243,7 @@ public class ShareUtils { //微信好友分享 private void wechatShare() { - Utils.toast(mContext, mContext.getString(R.string.share_skip)); + Utils.toast(mContext, R.string.share_skip); WXWebpageObject webpage = new WXWebpageObject(); WXMediaMessage msg = new WXMediaMessage(webpage); webpage.webpageUrl = shareUrl; @@ -345,7 +345,7 @@ public class ShareUtils { //QQ空间分享 private void qZoneShare() { - Utils.toast(mContext, mContext.getString(R.string.share_skip)); + Utils.toast(mContext, R.string.share_skip); Bundle params = new Bundle(); switch (mShareType) { @@ -377,7 +377,7 @@ public class ShareUtils { //微信朋友圈分享 private void wechatMomentsShare() { - Utils.toast(mContext, mContext.getString(R.string.share_skip)); + Utils.toast(mContext, R.string.share_skip); WXWebpageObject webpage = new WXWebpageObject(); WXMediaMessage msg = new WXMediaMessage(webpage); diff --git a/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java b/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java index 9a16d10de4..702856c6c3 100644 --- a/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java @@ -593,7 +593,7 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick // 连接失败-动画 private void connFailedAnimView() { getSupportActionBar().show(); - Utils.toast(ChooseReceiverActivity.this, "连接失败"); + toast("连接失败"); if (mScaleAnimation != null) { mScaleAnimation.cancel(); } diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index 951c384174..bebdb3511c 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -401,7 +401,7 @@ public class SuggestionActivity extends BaseActivity implements SuggestTypeAdapt String url = mSuggestNewsLinkEt.getText().toString().trim(); if (!TextUtils.isEmpty(url) && !PatternUtils.isUrlAddress(url)) { - Utils.toast(SuggestionActivity.this, getString(R.string.suggestion_url_error_hint)); + toast(R.string.suggestion_url_error_hint); return; } diff --git a/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java b/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java index 4024093c2d..2991b7774e 100644 --- a/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java +++ b/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java @@ -69,7 +69,7 @@ public class WeiBoShareActivity extends Activity implements WbShareCallback { shareUrl = extras.getString(KET_SHAREURL); mShareType = extras.getString(KET_TYPE); - Utils.toast(this, getString(R.string.share_skip)); + Utils.toast(this, R.string.share_skip); mWeiboShareAPI = new WbShareHandler(this); mWeiboShareAPI.registerApp(); @@ -139,19 +139,19 @@ public class WeiBoShareActivity extends Activity implements WbShareCallback { @Override public void onWbShareSuccess() { - Utils.toast(this, getString(R.string.share_success_hint)); + Utils.toast(this, R.string.share_success_hint); finish(); } @Override public void onWbShareCancel() { - Utils.toast(this, getString(R.string.share_cancel_hint)); + Utils.toast(this, R.string.share_cancel_hint); finish(); } @Override public void onWbShareFail() { - Utils.toast(this, getString(R.string.share_fail_hint)); + Utils.toast(this, R.string.share_fail_hint); finish(); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java index 1628d72d4d..2950b90332 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java @@ -89,7 +89,7 @@ public class CommentDetailAdapter extends BaseRecyclerAdapter { mRecyclerView.setVisibility(View.GONE); Utils.toast(mContext, R.string.content_delete_toast); } else { - Utils.toast(mContext, mContext.getString(R.string.comment_failure_hint)); + Utils.toast(mContext, R.string.comment_failure_hint); mIsNetworkError = true; mIsLoading = false; notifyItemChanged(getItemCount() - 1); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java index ad8470fe1b..8a335bcd13 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java @@ -237,7 +237,7 @@ public class GameNewsAdapter extends BaseRecyclerAdapter { StringUtils.buildString(mEntrance, "+(游戏新闻列表[", mNewsType, "])")); mContext.startActivity(intent); } else { - Utils.toast(mContext, mContext.getString(R.string.search_hint)); + Utils.toast(mContext, R.string.search_hint); } } }); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java index 91a4dd567f..aee91e5193 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java @@ -413,7 +413,7 @@ public class PlatformAdapter extends BaseRecyclerAdapter { String path = downloadEntity.getPath(); if (FileUtils.isEmptyFile(path)) { - Utils.toast(mContext, mContext.getString(R.string.install_failure_hint)); + Utils.toast(mContext, R.string.install_failure_hint); mEntryMap.remove(apkEntity.getUrl()); DownloadManager.getInstance(mContext).cancel(apkEntity.getUrl()); notifyItemChanged(position); @@ -435,7 +435,7 @@ public class PlatformAdapter extends BaseRecyclerAdapter { String path = mEntryMap.get(apkEntity.getUrl()).getPath(); if (FileUtils.isEmptyFile(path)) { - Utils.toast(mContext, mContext.getString(R.string.install_failure_hint)); + Utils.toast(mContext, R.string.install_failure_hint); mEntryMap.remove(apkEntity.getUrl()); DownloadManager.getInstance(mContext).cancel(apkEntity.getUrl()); adapter.notifyItemChanged(location); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java index 66675c901f..1725873c4c 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java @@ -23,9 +23,7 @@ import com.gh.gamecenter.entity.ToolBoxEntity; import com.gh.gamecenter.manager.UserManager; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; -import com.google.gson.Gson; import com.lightgame.adapter.BaseRecyclerAdapter; -import com.lightgame.config.CommonDebug; import com.lightgame.utils.Util_System_Keyboard; import com.lightgame.utils.Utils; @@ -235,7 +233,7 @@ public class ToolBoxRvAdapter extends BaseRecyclerAdapter { public void onClick(View v) { if (TextUtils.isEmpty(viewHolder.searchEt.getText().toString())) { - Utils.toast(mContext, mContext.getString(R.string.search_hint)); + Utils.toast(mContext, R.string.search_hint); return; } mSearchListener.search(true, viewHolder.searchEt.getText().toString()); diff --git a/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditFragment.java b/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditFragment.java index 9a94cf5df7..8112865f68 100644 --- a/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditFragment.java +++ b/app/src/main/java/com/gh/gamecenter/ask/QuestionsEditFragment.java @@ -403,7 +403,7 @@ public class QuestionsEditFragment extends NormalFragment { if (actionId == EditorInfo.IME_ACTION_DONE) { String nickname = input.getText().toString().trim(); if (TextUtils.isEmpty(nickname)) { - Utils.toast(getContext(), getString(R.string.vote_empty_hint)); + toast(R.string.vote_empty_hint); return true; } addTag(nickname, true); @@ -430,7 +430,7 @@ public class QuestionsEditFragment extends NormalFragment { public void onClick(View v) { String nickname = input.getText().toString().trim(); if (TextUtils.isEmpty(nickname)) { - Utils.toast(getContext(), getString(R.string.vote_empty_hint)); + toast(R.string.vote_empty_hint); return; } addTag(nickname, true); diff --git a/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java b/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java index ea9b1ddc19..4b4de306df 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java @@ -116,7 +116,7 @@ public class ArticleAdapter extends BaseRecyclerAdapter { mListener.loadError(); } } else { - Utils.toast(mContext, mContext.getString(R.string.loading_failed_hint)); + Utils.toast(mContext, R.string.loading_failed_hint); isNetworkError = true; notifyItemChanged(getItemCount() - 1); } diff --git a/app/src/main/java/com/gh/gamecenter/collection/ToolsAdapter.java b/app/src/main/java/com/gh/gamecenter/collection/ToolsAdapter.java index 44795b1d00..27a278d560 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ToolsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ToolsAdapter.java @@ -97,7 +97,7 @@ public class ToolsAdapter extends BaseRecyclerAdapter { mListener.loadError(); } } else { - Utils.toast(mContext, mContext.getString(R.string.loading_failed_hint)); + Utils.toast(mContext, R.string.loading_failed_hint); isNetworkError = true; notifyItemChanged(getItemCount() - 1); } diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java index 3f55ac9bfb..3df123c7fc 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java @@ -291,7 +291,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { showPluginDialog(downloadEntity.getPath()); } else { if (FileUtils.isEmptyFile(path)) { - Utils.toast(mContext, mContext.getString(R.string.install_failure_hint)); + Utils.toast(mContext, R.string.install_failure_hint); removeDownload(downloadEntity); } else { if (downloadEntity.getName().contains("光环助手")) { @@ -485,7 +485,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { } if (FileUtils.isEmptyFile(path)) { - Utils.toast(mContext, mContext.getString(R.string.install_failure_hint)); + Utils.toast(mContext, R.string.install_failure_hint); } else { mContext.startActivity(PackageUtils.getUninstallIntent(mContext, path)); } diff --git a/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java b/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java index fc8822f470..a89afca305 100644 --- a/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java @@ -155,7 +155,7 @@ class ConcernAdapter extends BaseRecyclerAdapter { listener.loadError(); } } else { - Utils.toast(mContext, mContext.getString(R.string.loading_failed_hint)); + Utils.toast(mContext, R.string.loading_failed_hint); isNetworkError = true; notifyItemChanged(getItemCount() - 1); } diff --git a/app/src/main/java/com/gh/gamecenter/info/InfoAdapter.java b/app/src/main/java/com/gh/gamecenter/info/InfoAdapter.java index a35e190f0c..e6b33f87d8 100644 --- a/app/src/main/java/com/gh/gamecenter/info/InfoAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/InfoAdapter.java @@ -280,7 +280,7 @@ class InfoAdapter extends BaseRecyclerAdapter { listener.loadError(); } } else { - Utils.toast(mContext, mContext.getString(R.string.loading_failed_hint)); + Utils.toast(mContext, R.string.loading_failed_hint); isNetworkError = true; notifyItemChanged(getItemCount() - 1); } diff --git a/app/src/main/java/com/gh/gamecenter/info/OriginalAdapter.java b/app/src/main/java/com/gh/gamecenter/info/OriginalAdapter.java index be83162886..1d12078bb1 100644 --- a/app/src/main/java/com/gh/gamecenter/info/OriginalAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/OriginalAdapter.java @@ -271,7 +271,7 @@ class OriginalAdapter extends BaseRecyclerAdapter { listener.loadError(); } } else { - Utils.toast(mContext, mContext.getString(R.string.loading_failed_hint)); + Utils.toast(mContext, R.string.loading_failed_hint); isNetworkError = true; notifyItemChanged(getItemCount() - 1); } diff --git a/app/src/main/java/com/gh/gamecenter/login/UserRepository.java b/app/src/main/java/com/gh/gamecenter/login/UserRepository.java index 48784b8c69..34ec67c835 100644 --- a/app/src/main/java/com/gh/gamecenter/login/UserRepository.java +++ b/app/src/main/java/com/gh/gamecenter/login/UserRepository.java @@ -223,7 +223,7 @@ class UserRepository { if (LoginTag.qq.equals(loginTag)) { GetLoginDataUtils.getInstance(mContext).QQLogout(); } - Utils.toast(mContext, mContext.getString(R.string.login_failure_hint)); + Utils.toast(mContext, R.string.login_failure_hint); if (CommonDebug.IS_DEBUG) { ResponseBody responseBody = httpException.response().errorBody(); @@ -411,7 +411,7 @@ class UserRepository { public void onResponse(UserInfoEntity response) { super.onResponse(response); if (loginTag != null) { - Utils.toast(mContext, mContext.getString(R.string.login_success)); + Utils.toast(mContext, R.string.login_success); } response.setId(mCachedId); userInfoHandle(response, false); diff --git a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java index 4e825c779e..647af20d61 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -357,13 +357,13 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { concern.setBackgroundResource(R.drawable.border_red_bg); concern.setTextColor(ContextCompat.getColor(mContext, R.color.red)); - Utils.toast(mContext, mContext.getString(R.string.concern_success)); + Utils.toast(mContext, R.string.concern_success); viewHolder.gamedetailConcern.setEnabled(true); } @Override public void onError() { - Utils.toast(mContext, mContext.getString(R.string.concern_failure)); + Utils.toast(mContext, R.string.concern_failure); viewHolder.gamedetailConcern.setEnabled(true); } }); @@ -399,7 +399,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { @Override public void onError() { - Utils.toast(mContext, mContext.getString(R.string.cancel_concern_failure)); + Utils.toast(mContext, R.string.cancel_concern_failure); viewHolder.gamedetailConcern.setEnabled(true); } }); diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java b/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java index f53228cf93..fa0f7ca07b 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java @@ -149,7 +149,7 @@ class SubjectAdapter extends BaseRecyclerAdapter { mOnRequestCallBackListener.loadError(); } } else { - Utils.toast(mContext, mContext.getString(R.string.loading_failed_hint)); + Utils.toast(mContext, R.string.loading_failed_hint); mIsNetworkError = true; notifyDataSetChanged(); } diff --git a/app/src/main/java/com/halo/assistant/fragment/VoteFragment.java b/app/src/main/java/com/halo/assistant/fragment/VoteFragment.java index c1825eb474..dd8a6abe05 100644 --- a/app/src/main/java/com/halo/assistant/fragment/VoteFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/VoteFragment.java @@ -27,7 +27,6 @@ import com.gh.gamecenter.normal.NormalFragment; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.utils.Util_System_Keyboard; -import com.lightgame.utils.Utils; import org.json.JSONException; import org.json.JSONObject; @@ -172,7 +171,7 @@ public class VoteFragment extends NormalFragment implements SwipeRefreshLayout.O if (actionId == EditorInfo.IME_ACTION_DONE) { String nickname = mEdtInput.getText().toString().trim(); if (TextUtils.isEmpty(nickname)) { - Utils.toast(getContext(), getString(R.string.vote_empty_hint)); + toast(R.string.vote_empty_hint); return true; } postVersionVote(nickname, true); @@ -199,7 +198,7 @@ public class VoteFragment extends NormalFragment implements SwipeRefreshLayout.O public void onClick(View v) { String nickname = mEdtInput.getText().toString().trim(); if (TextUtils.isEmpty(nickname)) { - Utils.toast(getContext(), getString(R.string.vote_empty_hint)); + toast(R.string.vote_empty_hint); return; } postVersionVote(nickname, true); @@ -267,12 +266,12 @@ public class VoteFragment extends NormalFragment implements SwipeRefreshLayout.O boolean cast = responseObject.getBoolean("cast"); String id = responseObject.getString("_id"); if (cast) { - Utils.toast(getContext(), getString(R.string.vote_success)); + toast(R.string.vote_success); } else { if (isNewVote) { - Utils.toast(getContext(), "已经存在相同的选项"); + toast("已经存在相同的选项"); } else { - Utils.toast(getContext(), "你已经投过了"); + toast("你已经投过了"); } } @@ -299,7 +298,7 @@ public class VoteFragment extends NormalFragment implements SwipeRefreshLayout.O JSONObject errorJson = new JSONObject(string); String detail = errorJson.getString("detail"); if ("illegal".equals(detail)) { - Utils.toast(getContext(), getString(R.string.vote_illegal_hint)); + toast(R.string.vote_illegal_hint); } } catch (Exception e1) { e1.printStackTrace(); diff --git a/app/src/main/java/com/halo/assistant/fragment/game/GameFragmentAdapter.java b/app/src/main/java/com/halo/assistant/fragment/game/GameFragmentAdapter.java index 14fafc3845..5c70621bfd 100644 --- a/app/src/main/java/com/halo/assistant/fragment/game/GameFragmentAdapter.java +++ b/app/src/main/java/com/halo/assistant/fragment/game/GameFragmentAdapter.java @@ -393,7 +393,7 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { private void showView() { if (mIsSlideError && mIsListError) { mCallBackListener.loadError(); - Utils.toast(mContext, mContext.getString(R.string.loading_failed_hint)); + Utils.toast(mContext, R.string.loading_failed_hint); } else if (mIsSlideError) { notifyItemChanged(0); } else if (mIsListError) { diff --git a/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java b/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java index 36847cf829..7769802fce 100644 --- a/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java @@ -26,7 +26,6 @@ import com.gh.gamecenter.normal.NormalFragment; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.lightgame.utils.Util_System_Keyboard; -import com.lightgame.utils.Utils; import java.util.ArrayList; import java.util.HashMap; @@ -124,7 +123,7 @@ public class GameNewsSearchResultFragment extends NormalFragment { }, 500); } else { - Utils.toast(getContext(), getString(R.string.search_hint)); + toast(R.string.search_hint); } } diff --git a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernAdapter.java b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernAdapter.java index fa0e892d11..e3d5c26462 100644 --- a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernAdapter.java +++ b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernAdapter.java @@ -134,7 +134,7 @@ class MyConcernAdapter extends BaseRecyclerAdapter { @Override public void onError() { - Utils.toast(mContext, mContext.getString(R.string.concern_cancel_failure)); + Utils.toast(mContext, R.string.concern_cancel_failure); holder.concern_item_concern.setClickable(true); holder.itemView.setClickable(true); } diff --git a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernRecommendAdapter.java b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernRecommendAdapter.java index 97be698d78..c8d6eab838 100644 --- a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernRecommendAdapter.java +++ b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernRecommendAdapter.java @@ -180,7 +180,7 @@ class MyConcernRecommendAdapter extends BaseRecyclerAdapter { @Override public void onError() { - Utils.toast(mContext, mContext.getString(R.string.concern_failure)); + Utils.toast(mContext, R.string.concern_failure); holder.concern_item_concern.setClickable(true); holder.itemView.setClickable(true); } diff --git a/libraries/LGLibrary b/libraries/LGLibrary index ba31db0c83..fb24a7a08e 160000 --- a/libraries/LGLibrary +++ b/libraries/LGLibrary @@ -1 +1 @@ -Subproject commit ba31db0c83282e38f4142fa1874a0e442dfc8f6c +Subproject commit fb24a7a08ec9281bebdeb6dd0692a21ca36d0cd1