From 52433ba347271dc9cd6e413cc1cdbd5c12178dda Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Sat, 14 Oct 2017 15:52:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E7=A6=BB=E9=83=A8=E5=88=86java?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=B8=AD=E7=9A=84=E5=AD=97=E7=AC=A6=E4=B8=B2?= =?UTF-8?q?,equals=E5=88=A4=E6=96=AD=E5=B8=B8=E9=87=8F=E6=94=BE=E5=9C=A8?= =?UTF-8?q?=E5=89=8D=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 - .../java/com/gh/common/util/CommentUtils.java | 2 +- .../java/com/gh/common/util/DeviceUtils.java | 2 +- .../com/gh/common/util/GameViewUtils.java | 2 +- .../java/com/gh/common/util/LibaoUtils.java | 6 ++-- .../com/gh/common/util/MessageShareUtils.java | 2 +- .../java/com/gh/common/util/ShareUtils.java | 2 +- .../java/com/gh/download/DownloadManager.java | 4 +-- .../gh/gamecenter/ChooseReceiverActivity.java | 2 +- .../com/gh/gamecenter/CleanApkActivity.java | 2 +- .../gh/gamecenter/LibaoDetailActivity.java | 4 +-- .../com/gh/gamecenter/NewsSearchActivity.java | 2 +- .../com/gh/gamecenter/SuggestionActivity.java | 10 +++---- .../gh/gamecenter/UserInfoEditActivity.java | 2 +- .../gamecenter/adapter/CleanApkAdapter.java | 13 +++++---- .../gh/gamecenter/adapter/ConcernAdapter.java | 2 +- .../gamecenter/collection/ArticleAdapter.java | 2 +- .../gamecenter/collection/ToolsAdapter.java | 2 +- .../gh/gamecenter/fragment/GameFragment.java | 2 +- .../gamecenter/game/GameFragmentAdapter.java | 6 ++-- .../gh/gamecenter/kaifu/KaiFuVpFragment.java | 3 +- .../gh/gamecenter/libao/Libao3Fragment.java | 2 +- .../gamecenter/libao/LibaoHistoryAdapter.java | 4 +-- .../gh/gamecenter/libao/LibaoNewFragment.java | 2 +- .../manager/DataCollectionManager.java | 2 +- .../gh/gamecenter/manager/PackageManager.java | 4 +-- .../gh/gamecenter/manager/UpdateManager.java | 2 +- .../gamecenter/news/News1FragmentAdapter.java | 2 +- .../com/gh/gamecenter/news/News2Fragment.java | 4 +-- .../gamecenter/news/News2FragmentAdapter.java | 2 +- .../com/gh/gamecenter/news/News3Fragment.java | 2 +- .../news/News3FragmentDialogAdapter.java | 2 +- .../gamecenter/news/News4FragmentAdapter.java | 2 +- .../gh/gamecenter/subject/SubjectAdapter.java | 2 +- .../gamecenter/subject/SubjectFragment.java | 2 +- app/src/main/res/values/strings.xml | 28 +++++++++++++------ 36 files changed, 75 insertions(+), 60 deletions(-) diff --git a/README.md b/README.md index e74faeef57..79cd0aaa7e 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,6 @@ * GSON 序列化用统一的一个, GsonUtil fromJson * CleanApkAdapter 转化字符串size工具函数 比如SpeedUtils * getString 解决 字符串hardcode问题 -* equals 写法，常量.equals(xxx val) * Adapter 里面clicklistener 用接口传参将点击操作委托给controller * Adapter ViewHolder的功能，部分重写到ViewHolder类本身 diff --git a/app/src/main/java/com/gh/common/util/CommentUtils.java b/app/src/main/java/com/gh/common/util/CommentUtils.java index 3181d1722d..41f94c7d16 100644 --- a/app/src/main/java/com/gh/common/util/CommentUtils.java +++ b/app/src/main/java/com/gh/common/util/CommentUtils.java @@ -249,7 +249,7 @@ public class CommentUtils { if (exception.code() == 403) { try { String detail = new JSONObject(exception.response().errorBody().string()).getString("detail"); - if (detail.equals("voted")) { + if ("voted".equals(detail)) { Utils.toast(context, "已经点过赞啦！"); } } catch (Exception ex) { diff --git a/app/src/main/java/com/gh/common/util/DeviceUtils.java b/app/src/main/java/com/gh/common/util/DeviceUtils.java index b085636042..2b5a361028 100644 --- a/app/src/main/java/com/gh/common/util/DeviceUtils.java +++ b/app/src/main/java/com/gh/common/util/DeviceUtils.java @@ -89,7 +89,7 @@ public class DeviceUtils { } catch (Exception ex) { ex.printStackTrace(); } - if (macSerial == null || "".equals(macSerial)) { + if ("".equals(macSerial)) { try { return loadFileAsString("/sys/class/net/eth0/address") .toUpperCase().substring(0, 17); diff --git a/app/src/main/java/com/gh/common/util/GameViewUtils.java b/app/src/main/java/com/gh/common/util/GameViewUtils.java index 850a5536a9..f8160532b2 100644 --- a/app/src/main/java/com/gh/common/util/GameViewUtils.java +++ b/app/src/main/java/com/gh/common/util/GameViewUtils.java @@ -65,7 +65,7 @@ public class GameViewUtils { tag.setTextColor(ContextCompat.getColor(context, R.color.tag_green)); } else { String colorStr; - if (!TextUtils.isEmpty(tagType) && tagType.equals("type")) { // 游戏标签 + if (!TextUtils.isEmpty(tagType) && "type".equals(tagType)) { // 游戏标签 colorStr = "#ff6a28"; } else { colorStr = TagUtils.getInstance(context).getColor(tagStr); diff --git a/app/src/main/java/com/gh/common/util/LibaoUtils.java b/app/src/main/java/com/gh/common/util/LibaoUtils.java index 56461ec563..cd8ebbc8ef 100644 --- a/app/src/main/java/com/gh/common/util/LibaoUtils.java +++ b/app/src/main/java/com/gh/common/util/LibaoUtils.java @@ -258,7 +258,7 @@ public class LibaoUtils { break; case "再领一个": case "领取": - if (status.equals("repeatLing")) { + if ("repeatLing".equals(status)) { DialogUtils.showWarningDialog(context, "礼包刷新提醒" , "礼包每天0点刷新，换新区或者换新角色需要继续领取礼包的童鞋，请于明天0点之后回来即可[再领一个]" , null, "知道了", null, null); @@ -268,7 +268,7 @@ public class LibaoUtils { break; case "再淘一个": case "淘号": - if (status.equals("repeatTao")) { + if ("repeatTao".equals(status)) { Utils.toast(context, "没到重复淘号时间, 礼包每天0点刷新"); return; } @@ -575,7 +575,7 @@ public class LibaoUtils { if (userData != null && userData.getUserDataLibaoList() != null && userData.getUserDataLibaoList().size() > 0) { List userDataLibaoList = userData.getUserDataLibaoList(); UserDataLibaoEntity userDataLibaoEntity = userDataLibaoList.get(userDataLibaoList.size() - 1); - if (userDataLibaoEntity.getType().equals("ling")) { // 拿最后一次领取的状态判断 + if ("ling".equals(userDataLibaoEntity.getType())) { // 拿最后一次领取的状态判断 libaoEntity.setStatus("linged"); } else { libaoEntity.setStatus("taoed"); 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 042c19e0ec..22243adf92 100644 --- a/app/src/main/java/com/gh/common/util/MessageShareUtils.java +++ b/app/src/main/java/com/gh/common/util/MessageShareUtils.java @@ -123,7 +123,7 @@ public class MessageShareUtils { if (pinfo != null) { for (int i = 0; i < pinfo.size(); i++) { String pn = pinfo.get(i).packageName; - if (pn.equals("com.tencent.mobileqq")) { + if ("com.tencent.mobileqq".equals(pn)) { return true; } } 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 03b918b25f..4858846954 100644 --- a/app/src/main/java/com/gh/common/util/ShareUtils.java +++ b/app/src/main/java/com/gh/common/util/ShareUtils.java @@ -123,7 +123,7 @@ public class ShareUtils { if (pinfo != null) { for (int i = 0; i < pinfo.size(); i++) { String pn = pinfo.get(i).packageName; - if (pn.equals("com.tencent.mobileqq")) { + if ("com.tencent.mobileqq".equals(pn)) { return true; } } diff --git a/app/src/main/java/com/gh/download/DownloadManager.java b/app/src/main/java/com/gh/download/DownloadManager.java index 8f22d2712f..c876a7b37e 100644 --- a/app/src/main/java/com/gh/download/DownloadManager.java +++ b/app/src/main/java/com/gh/download/DownloadManager.java @@ -228,9 +228,9 @@ public class DownloadManager implements DownloadStatusListener { } } downloadEntity.setInstalled(installed); - if (method.equals("更新")) { + if ("更新".equals(method)) { downloadEntity.setUpdate(true); - } else if (method.equals("插件化")) { + } else if ("插件化".equals(method)) { downloadEntity.setPluggable(true); } downloadEntity.setPlugin(gameEntity.getTag() != null && gameEntity.getTag().size() != 0); diff --git a/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java b/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java index 9791001694..b276ad537d 100644 --- a/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ChooseReceiverActivity.java @@ -450,7 +450,7 @@ public class ChooseReceiverActivity extends BaseActivity implements View.OnClick byte[] receiveData = new byte[1024]; byte[] sendData; Utils.log("=====ip::" + ipAddress); - if (!ipAddress.equals("192.168.43.1")) { + if (!"192.168.43.1".equals(ipAddress)) { // 连接失败，可能是连接的热点已经关闭， 关闭动画，开启扫描 isStopScan = false; handler.sendEmptyMessage(0); diff --git a/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java b/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java index fd0892631a..5edbd7605d 100644 --- a/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CleanApkActivity.java @@ -131,7 +131,7 @@ public class CleanApkActivity extends BaseActivity implements CleanApkAdapter.On if ("停止扫描".equals(s)) { mAdapter.isStopScan(); } else { - if (s.equals("一键删除")) { + if ("一键删除".equals(s)) { Utils.toast(CleanApkActivity.this, "请选择需要删除的安装包"); return; } diff --git a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java index d06b7387ff..cafad30a71 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java @@ -171,9 +171,9 @@ public class LibaoDetailActivity extends BaseActivity implements LibaoDetailAdap @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - initTitle("礼包详情"); + mName = getString(R.string.libao_detail); + initTitle(mName); mLibaoEntity = (LibaoEntity) HaloApp.get(LibaoDetailActivity.class.getSimpleName(), true); - mName = "礼包详情"; mIsScroll = true; diff --git a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java index 2a65f0b407..17a0216d39 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java @@ -224,7 +224,7 @@ public class NewsSearchActivity extends BaseActivity { mLoading.setVisibility(View.GONE); } isLoadOver = true; - toast("加载失败，请检查网络状态"); + toast(R.string.loading_failed_hint); isNetworkError = true; searchAdapter.notifyItemChanged(searchAdapter.getItemCount() - 1); } diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index 960f5b1f07..19669a3d5b 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -119,7 +119,7 @@ public class SuggestionActivity extends BaseActivity implements SuggestTypeAdapt private Dialog selectGameDialog; private WaitingDialogFragment postDialog; - private String[] arrType = {"普通反馈", "功能建议", "发生闪退", "游戏问题", "游戏收录", "文章投稿"}; + private String[] arrType; private int curType = -1; @@ -182,6 +182,7 @@ public class SuggestionActivity extends BaseActivity implements SuggestTypeAdapt super.onCreate(savedInstanceState); initTitle(getString(R.string.title_suggestion)); + arrType = getResources().getStringArray(R.array.suggestion_type); curType = getIntent().getExtras().getInt("suggestType"); String suggestContent = getIntent().getExtras().getString("content"); String suggestHintType = getIntent().getExtras().getString("suggestHintType"); @@ -472,7 +473,7 @@ public class SuggestionActivity extends BaseActivity implements SuggestTypeAdapt .subscribe(new Observer() { @Override public void onCompleted() { - Utils.log("=========完成"); + Utils.log("意见反馈:图片上传完成"); initPostData(email, picArray); } @@ -482,14 +483,13 @@ public class SuggestionActivity extends BaseActivity implements SuggestTypeAdapt postDialog.dismissAllowingStateLoss(); } Utils.toast(SuggestionActivity.this, "上传失败"); - Utils.log("=========上传失败" + e.toString()); + Utils.log("意见反馈:图片上传失败" + e.toString()); } @Override public void onNext(JSONObject result) { if (result != null) { try { - Utils.log("===========" + result); int statusCode = result.getInt("statusCode"); if (statusCode == HttpURLConnection.HTTP_OK) { picArray.put(result.getString("icon")); @@ -511,7 +511,7 @@ public class SuggestionActivity extends BaseActivity implements SuggestTypeAdapt params.put("type", android.os.Build.MODEL); params.put("sdk", String.valueOf(android.os.Build.VERSION.SDK_INT)); params.put("version", android.os.Build.VERSION.RELEASE); - params.put("source", "光环助手"); + params.put("source", getString(R.string.app_name)); params.put("imei", Util_System_Phone_State.getDeviceId(this)); if ((curType == 6 || curType == 5) && !TextUtils.isEmpty(mSuggestNewsLinkEt.getText().toString())) { diff --git a/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.java b/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.java index 33947f1177..0f164c6177 100644 --- a/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.java +++ b/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.java @@ -108,7 +108,7 @@ public class UserInfoEditActivity extends BaseActivity implements LoginUtils.onC title = "选择性别"; String gender = mUserInfoEntity.getGender(); if (!TextUtils.isEmpty(gender)) { - if (gender.equals("男")) { + if ("男".equals(gender)) { mUserinfoSexmanSelect.setVisibility(View.VISIBLE); mUserinfoSexWomanSelect.setVisibility(View.GONE); } else { diff --git a/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java index 0cd26ef0b7..d745938c9f 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java @@ -40,14 +40,17 @@ public class CleanApkAdapter extends BaseRecyclerAdapter private static int INSTALLED = 0; // 表示已经安装 private static int UNINSTALLED = 1; // 表示未安装 + private CheckBox mApkSelectAll; private TextView mApkDeleteBtn; - private List mApkList; - private OnScanListener mScanListener; - private ArrayMap mSelectPosition; - private List mApkPath; - private boolean mIsStopScan; + private OnScanListener mScanListener; + + private List mApkPath; + private List mApkList; + private ArrayMap mSelectPosition; + + private boolean mIsStopScan; private boolean mIsScanOver; public CleanApkAdapter(Context context, OnScanListener listener, TextView apkDeleteBtn, CheckBox apkSelectAll) { diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java index d82ed63d0f..da54f6052c 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java @@ -186,7 +186,7 @@ public class ConcernAdapter extends BaseRecyclerAdapter { public GameEntity cancelConcern(String gameId) { for (int i = 0; i < mConcernGameList.size(); i++) { GameEntity gameEntity = mConcernGameList.get(i); - if (gameEntity.getId().equals(gameId)) { + if (gameId.equals(gameEntity.getId())) { mConcernGameList.remove(i); notifyItemRemoved(i); if (mConcernGameList.size() == 0) mListener.loadEmpty(); 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 591434aa66..72eb6c3b59 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, "加载失败，请检查网络状态"); + Utils.toast(mContext, mContext.getString(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 c078f30308..44795b1d00 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, "加载失败，请检查网络状态"); + Utils.toast(mContext, mContext.getString(R.string.loading_failed_hint)); isNetworkError = true; notifyItemChanged(getItemCount() - 1); } diff --git a/app/src/main/java/com/gh/gamecenter/fragment/GameFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/GameFragment.java index 06acde7b55..254114df7f 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/GameFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/GameFragment.java @@ -202,7 +202,7 @@ public class GameFragment extends BaseFragment implements SwipeRefreshLayout.OnR @Override public void loadDone(Object obj) { - if (obj.equals("scrollTop")) { + if ("scrollTop".equals(obj)) { mLayoutManager.smoothScrollToPosition(mGameRv, null, 0); } } 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 21a7ff24ad..511d368be9 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java @@ -382,7 +382,7 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { } else if (mIsListError) { notifyItemChanged(getItemCount() - 1); } - Utils.toast(mContext, "加载失败，请检查网络状态"); + Utils.toast(mContext, mContext.getString(R.string.loading_failed_hint)); } public void initLocationMap() { @@ -548,7 +548,7 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { return ItemViewType.GAME_IMAGE; } if (gameEntity.getTest() != null - && subjectEntity.getTag() != null && subjectEntity.getTag().equals("test")) { + && subjectEntity.getTag() != null && "test".equals(subjectEntity.getTag())) { return ItemViewType.GAME_TEST; } return ItemViewType.GAME_NORMAL; @@ -951,7 +951,7 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { holder.more.setVisibility(View.GONE); } else { holder.more.setVisibility(View.VISIBLE); - if (mSubjectList.get(i).getHome().equals("change")) { + if ("change".equals(mSubjectList.get(i).getHome())) { holder.more.setText("换一批"); holder.more.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); } else { diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java index dc51a35a06..2c8c713ba4 100644 --- a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java +++ b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuVpFragment.java @@ -23,6 +23,7 @@ import com.gh.gamecenter.entity.KaiFuServerEntity; import com.gh.gamecenter.eventbus.EBDownloadStatus; import com.lightgame.download.DataWatcher; import com.lightgame.download.DownloadEntity; +import com.lightgame.utils.Utils; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; @@ -255,7 +256,7 @@ public class KaiFuVpFragment extends BaseFragment { @Override public void loadError() { super.loadError(); - toast("加载失败，请检查网络状态"); + Utils.toast(getContext(), getContext().getString(R.string.loading_failed_hint)); mNoConn.setVisibility(View.VISIBLE); mNoneData.setVisibility(View.GONE); mLoading.setVisibility(View.GONE); diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java index 51f3f3ec07..cc23cdc69e 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java @@ -164,7 +164,7 @@ public class Libao3Fragment extends BaseFragment implements SwipeRefreshLayout.O public void onEventMainThread(EBReuse changed) { if ("libaoChanged".equals(changed.getType())) { adapter.loadData(0); - } else if (changed.getType().equals(LOGIN_TAG)) { // 登入 + } else if (LOGIN_TAG.equals(changed.getType())) { // 登入 postRunnable(runnable); } } diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java index 952dcb1325..feab503ed6 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java @@ -107,7 +107,7 @@ public class LibaoHistoryAdapter extends BaseRecyclerAdapter { List userDataLibaoList = userData.getUserDataLibaoList(); UserDataLibaoEntity userDataLibaoEntity = userDataLibaoList.get(userDataLibaoList.size() - 1); String status = userDataLibaoEntity.getType(); - if (status.equals("ling")) { + if ("ling".equals(status)) { entity.setStatus("linged"); } else { entity.setStatus("taoed"); @@ -156,7 +156,7 @@ public class LibaoHistoryAdapter extends BaseRecyclerAdapter { //领取状态 if (!TextUtils.isEmpty(libaoEntity.getStatus())) { - if (libaoEntity.getStatus().equals("linged")) { + if ("linged".equals(libaoEntity.getStatus())) { viewHolder.libaoBtnStatus.setText("已领取"); viewHolder.libaoBtnStatus.setBackgroundResource(R.drawable.libao_linged_style); viewHolder.libaoBtnStatus.setTextColor(ContextCompat.getColorStateList(mContext, R.color.libao_linged_selector)); diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java index 8d7a667045..10a8ebee90 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java @@ -209,7 +209,7 @@ public class LibaoNewFragment extends BaseFragment implements SwipeRefreshLayout @Override public void loadDone(Object obj) { super.loadDone(obj); - if (obj.toString().equals("NULL")) { + if ("NULL".equals(obj.toString())) { mHistoryIsEmpty = true; return; } diff --git a/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java b/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java index 2c54f28eda..91108066fb 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java @@ -149,7 +149,7 @@ public class DataCollectionManager { for (int i = 0, size = list.size(); i < size; i++) { dataCollectionEntity = list.get(i); type = dataCollectionEntity.getType(); - if (type.equals("click-item")) { + if ("click-item".equals(type)) { continue; } jsonArray = map.get(type); diff --git a/app/src/main/java/com/gh/gamecenter/manager/PackageManager.java b/app/src/main/java/com/gh/gamecenter/manager/PackageManager.java index 9ae59bb42d..50661ba14f 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/PackageManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/PackageManager.java @@ -208,8 +208,8 @@ public class PackageManager { if (updateList.size() != 0) { for (GameUpdateEntity entity : updateList) { if (entity.isPluggable() - && entity.getId().equals(gameId) - && entity.getPackageName().equals(packageName)) { + && gameId.equals(entity.getId()) + && packageName.equals(entity.getPackageName())) { return true; } } diff --git a/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java b/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java index cfb1727907..bd79ff58d1 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java @@ -134,7 +134,7 @@ public class UpdateManager { gameUpdateEntity.setVersion(appEntity.getVersion()); gameUpdateEntity.setUrl(appEntity.getUrl()); gameUpdateEntity.setPlatform("官方版"); - gameUpdateEntity.setId("5618b86e8ab49e17088b4575"); + gameUpdateEntity.setId(mContext.getString(R.string.ghzs_id)); PackageManager.addUpdate(0, gameUpdateEntity); if (isCheck) { diff --git a/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java index 0aa82c4037..ca329b47ef 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java @@ -280,7 +280,7 @@ public class News1FragmentAdapter extends BaseRecyclerAdapter { listener.loadError(); } } else { - Utils.toast(mContext, "加载失败，请检查网络状态"); + Utils.toast(mContext, mContext.getString(R.string.loading_failed_hint)); isNetworkError = true; notifyItemChanged(getItemCount() - 1); } diff --git a/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java b/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java index 6cc2bd1a23..047ed4cb2d 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/news/News2Fragment.java @@ -219,7 +219,7 @@ public class News2Fragment extends BaseFragment implements SwipeRefreshLayout.On 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("5618b86e8ab49e17088b4575"));// 光环助手ID + sequences.add(RetrofitManager.getInstance(getContext()).getApi().getGameDigest(getContext().getString(R.string.ghzs_id)));// 光环助手ID } else { sequences.add(RetrofitManager.getInstance(getContext()).getApi().getGameDigest(installedList.get(i).getId())); } @@ -235,7 +235,7 @@ public class News2Fragment extends BaseFragment implements SwipeRefreshLayout.On @Override public void onNext(GameEntity response) { - if (response.getId().equals("5618b86e8ab49e17088b4575")) { + if (getContext().getString(R.string.ghzs_id).equals(response.getId())) { recommendGameList.add(response); } else { ApkActiveUtils.filterHideApk(response); diff --git a/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java index 4eb12da6b9..d2783cdde1 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java @@ -154,7 +154,7 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { listener.loadError(); } } else { - Utils.toast(mContext, "加载失败，请检查网络状态"); + Utils.toast(mContext, mContext.getString(R.string.loading_failed_hint)); isNetworkError = true; notifyItemChanged(getItemCount() - 1); } diff --git a/app/src/main/java/com/gh/gamecenter/news/News3Fragment.java b/app/src/main/java/com/gh/gamecenter/news/News3Fragment.java index 751d96d465..f47c7e80e5 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News3Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/news/News3Fragment.java @@ -121,7 +121,7 @@ public class News3Fragment extends BaseFragment implements SwipeRefreshLayout.On @Override public void call(Void aVoid) { if (mConcernGame.size() > 1 || (mConcernGame.size() == 1 - && !"5618b86e8ab49e17088b4575".equals(mConcernGame.get(0).getId()))) { // 5618b86e8ab49e17088b4575 : 光环助手 id + && !getContext().getString(R.string.ghzs_id).equals(mConcernGame.get(0).getId()))) { OnSelectGameClickListener(); } else { Intent intent = ConcernActivity.getIntent(getContext(), "资讯(攻略-我关注的游戏)"); diff --git a/app/src/main/java/com/gh/gamecenter/news/News3FragmentDialogAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News3FragmentDialogAdapter.java index 06f7fa6711..2e8f0bc530 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News3FragmentDialogAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News3FragmentDialogAdapter.java @@ -27,7 +27,7 @@ public class News3FragmentDialogAdapter extends BaseRecyclerAdapter { listener.loadError(); } } else { - Utils.toast(mContext, "加载失败，请检查网络状态"); + Utils.toast(mContext, mContext.getString(R.string.loading_failed_hint)); isNetworkError = true; notifyItemChanged(getItemCount() - 1); } 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 90659de095..8b27c242c9 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectAdapter.java @@ -150,7 +150,7 @@ public class SubjectAdapter extends BaseRecyclerAdapter { mOnRequestCallBackListener.loadError(); } } else { - Utils.toast(mContext, "加载失败，请检查网络状态"); + Utils.toast(mContext, mContext.getString(R.string.loading_failed_hint)); mIsNetworkError = true; notifyDataSetChanged(); } diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectFragment.java b/app/src/main/java/com/gh/gamecenter/subject/SubjectFragment.java index f99b06fd6f..d74ccea431 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectFragment.java +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectFragment.java @@ -208,7 +208,7 @@ public class SubjectFragment extends BaseFragment { if (subject_pb_loading != null && subject_pb_loading.getVisibility() == View.VISIBLE) { subject_pb_loading.setVisibility(View.GONE); } - toast("加载失败，请检查网络状态"); + toast(getContext().getString(R.string.loading_failed_hint)); subject_list.setVisibility(View.GONE); reuse_no_connection.setVisibility(View.VISIBLE); mNoData.setVisibility(View.GONE); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b6422dea0b..eae38b29ec 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -263,6 +263,14 @@ 六 日 + + 普通反馈 + 功能建议 + 发生闪退 + 游戏问题 + 游戏收录 + 文章投稿 + 起一个难忘的名字吧 登录异常，请稍后重试 选择地区 @@ -314,16 +322,20 @@ 礼包码：%1$s
淘号礼包不保证可用，请尽快进入游戏尝试兑换]]> 礼包码：%1$s
请尽快使用，礼包码将于60分钟后进入淘号池]]> - 取消关注游戏后，您将无法及时收到游戏攻略、资讯等最新动态提醒。]]> + 取消关注游戏后，您将无法及时收到游戏攻略、资讯等最新动态提醒。]]> 好友还没安装光环助手？请点这里]]> 未安装 的应用，确定删除吗？]]> 找到%1$d个安装包，占用%2$s空间]]> - %1$s]]> - %1$s]]> - %1$s]]> - %1$s]]> - "版本：V%1$s - 好友还没安装光环助手？请点这里]]> - 安装包清理]]> + %1$s]]> + %1$s]]> + %1$s]]> + %1$s]]> + "版本：V%1$s + 好友还没安装光环助手？请点这里]]> + 安装包清理]]> + + 礼包详情 + 加载失败，请检查网络状态 + 5618b86e8ab49e17088b4575