From cb95204fac9d1da5ab7b920522b4b9ae74aab5f0 Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Tue, 21 Nov 2017 09:23:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=80=E4=BA=9Bhardcode?= =?UTF-8?q?=E5=92=8C=E5=91=BD=E5=90=8D=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/common/util/LoginUtils.java | 5 -- .../com/gh/common/util/PostCommentUtils.java | 3 +- .../java/com/gh/gamecenter/AboutActivity.java | 7 +-- .../com/gh/gamecenter/CollectionActivity.java | 2 +- .../gh/gamecenter/CommentDetailActivity.java | 20 +++---- .../gh/gamecenter/MessageDetailActivity.java | 20 +++---- .../gh/gamecenter/SuggestSelectActivity.java | 2 +- .../com/gh/gamecenter/SuggestionActivity.java | 2 +- .../com/gh/gamecenter/UserInfoActivity.java | 6 +- .../com/gh/gamecenter/ViewImageActivity.java | 4 +- .../java/com/gh/gamecenter/VoteActivity.java | 4 +- .../com/gh/gamecenter/db/DatabaseHelper.java | 2 +- .../download/GameDownloadFragment.java | 6 -- .../download/GameDownloadFragmentAdapter.java | 12 ++-- .../download/GameUpdateFragment.java | 60 ++++++++++--------- .../download/GameUpdateFragmentAdapter.java | 36 +++++------ .../gh/gamecenter/fragment/GameFragment.java | 1 - .../manager/RefreshTokenManager.java | 9 +-- .../main/java/com/halo/assistant/HaloApp.java | 2 +- app/src/main/res/layout/gameupdate.xml | 2 +- app/src/main/res/values/strings.xml | 17 ++++++ 21 files changed, 114 insertions(+), 108 deletions(-) diff --git a/app/src/main/java/com/gh/common/util/LoginUtils.java b/app/src/main/java/com/gh/common/util/LoginUtils.java index b0cceece81..1ebfa4c91e 100644 --- a/app/src/main/java/com/gh/common/util/LoginUtils.java +++ b/app/src/main/java/com/gh/common/util/LoginUtils.java @@ -3,16 +3,13 @@ package com.gh.common.util; import android.app.Dialog; import android.content.Context; import android.content.SharedPreferences; -import android.os.Looper; import android.preference.PreferenceManager; import android.text.TextUtils; -import com.gh.common.constant.Constants; import com.gh.gamecenter.R; import com.gh.gamecenter.entity.LoginResponseEntity; import com.gh.gamecenter.entity.UserInfoEntity; import com.gh.gamecenter.eventbus.EBReuse; -import com.gh.gamecenter.kuaichuan.Constant; import com.gh.gamecenter.manager.RefreshTokenManager; import com.gh.gamecenter.personal.PersonalFragment; import com.gh.gamecenter.retrofit.JSONObjectResponse; @@ -26,7 +23,6 @@ import org.greenrobot.eventbus.EventBus; import org.json.JSONException; import org.json.JSONObject; -import java.io.IOException; import java.lang.reflect.Type; import java.util.HashMap; import java.util.Map; @@ -36,7 +32,6 @@ import okhttp3.RequestBody; import okhttp3.ResponseBody; import retrofit2.HttpException; import rx.Observable; -import rx.Scheduler; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; 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 84700a557d..580f06de05 100644 --- a/app/src/main/java/com/gh/common/util/PostCommentUtils.java +++ b/app/src/main/java/com/gh/common/util/PostCommentUtils.java @@ -2,6 +2,7 @@ package com.gh.common.util; import android.content.Context; +import com.gh.gamecenter.R; import com.gh.gamecenter.entity.CommentEntity; import com.gh.gamecenter.retrofit.JSONObjectResponse; import com.gh.gamecenter.retrofit.Response; @@ -43,7 +44,7 @@ public class PostCommentUtils { listener.postSuccess(response); } } else { - Utils.toast(context, "提交失败，请检查网络设置"); + Utils.toast(context, context.getString(R.string.post_failure_hint)); } } diff --git a/app/src/main/java/com/gh/gamecenter/AboutActivity.java b/app/src/main/java/com/gh/gamecenter/AboutActivity.java index 9a383f01c8..05df0694ae 100644 --- a/app/src/main/java/com/gh/gamecenter/AboutActivity.java +++ b/app/src/main/java/com/gh/gamecenter/AboutActivity.java @@ -43,8 +43,7 @@ public class AboutActivity extends BaseActivity { @NonNull public static Intent getIntent(Context context) { - Intent intent = new Intent(context, AboutActivity.class); - return intent; + return new Intent(context, AboutActivity.class); } @Override @@ -58,7 +57,7 @@ public class AboutActivity extends BaseActivity { initTitle(getString(R.string.title_about)); // ((TextView) findViewById(R.id.about_tv_version)).setText("V" + PackageUtils.getVersionName(this)); - mVersionName.setText("V" + PackageUtils.getPatchVersionName()); // TODO 版本号暂时与gradle versionName不一致 + mVersionName.setText(getString(R.string.about_version_name, PackageUtils.getPatchVersionName())); // 版本号暂时与gradle versionName不一致 } @Override @@ -82,7 +81,7 @@ public class AboutActivity extends BaseActivity { if (view.getId() == R.id.about_tv_version) { String tinkerId = TinkerManager.getNewTinkerId(); if (!TextUtils.isEmpty(tinkerId)) { - mVersionName.setText("V" + PackageUtils.getPatchVersionName() + "." + tinkerId); + mVersionName.setText(getString(R.string.about_version_name_and_tinerid, PackageUtils.getPatchVersionName(), tinkerId)); } else { Toast.makeText(getApplicationContext(), R.string.toast_upload_latest, Toast.LENGTH_SHORT).show(); } diff --git a/app/src/main/java/com/gh/gamecenter/CollectionActivity.java b/app/src/main/java/com/gh/gamecenter/CollectionActivity.java index 30d8075d39..3850896a4a 100644 --- a/app/src/main/java/com/gh/gamecenter/CollectionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CollectionActivity.java @@ -27,7 +27,7 @@ public class CollectionActivity extends BaseActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - initTitle("我的收藏"); + initTitle(getString(R.string.collection_title)); getSupportFragmentManager().beginTransaction().replace( R.id.layout_fragment_content, CollectionFragment.newInstance(0)).commitAllowingStateLoss(); diff --git a/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java b/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java index 6b9750e168..9802b7263e 100644 --- a/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CommentDetailActivity.java @@ -135,7 +135,7 @@ public class CommentDetailActivity extends BaseActivity implements OnCommentCall return; } - mSendingDialog = DialogUtils.showWaitDialog(this, "正在提交"); + mSendingDialog = DialogUtils.showWaitDialog(this, getString(R.string.post_dialog_hint)); JSONObject jsonObject = new JSONObject(); try { @@ -173,20 +173,20 @@ public class CommentDetailActivity extends BaseActivity implements OnCommentCall String detail = errorJson.getString("detail"); switch (detail) { case "too frequent": - toast("别话痨哦~休息一会再来评论吧~"); + toast(getString(R.string.comment_failed_toofrequent)); break; case "user blocked": - toast("账号状态异常，暂时无法发表评论"); + toast(getString(R.string.comment_failed_userblocked)); break; case "article blocked": - toast("文章异常，无法发表评论"); + toast(getString(R.string.comment_failed_articleblocked)); setSoftInput(false); break; case "illegal": - toast("评论内容可能包括敏感信息，请修改后再发表"); + toast(getString(R.string.comment_failed_illegal)); break; default: - toast("评论失败，未知原因"); + toast(getString(R.string.comment_failed_unknown)); break; } } catch (Exception ex) { @@ -197,7 +197,7 @@ public class CommentDetailActivity extends BaseActivity implements OnCommentCall } } - toast("提交失败，请检查网络设置"); + toast(getString(R.string.post_failure_hint)); } }); } @@ -218,9 +218,9 @@ public class CommentDetailActivity extends BaseActivity implements OnCommentCall mCommentDetailCloseComment.setVisibility(View.VISIBLE); if (mCommentEntity != null && mCommentEntity.getUser() != null) { - mCommentDetailCommentEt.setHint("回复" + mCommentEntity.getUser().getName() + "："); + mCommentDetailCommentEt.setHint(getString(R.string.comment_repty_hint, mCommentEntity.getUser().getName())); } else { - mCommentDetailCommentEt.setHint("优质评论会被优先展示"); + mCommentDetailCommentEt.setHint(getString(R.string.message_detail_comment_hint)); } } }); @@ -232,7 +232,7 @@ public class CommentDetailActivity extends BaseActivity implements OnCommentCall mCommentDetailCommentRl.setVisibility(View.GONE); if (mCommentEntity != null) { mCommentEntity = null; // 清空当前评论实体 - mCommentDetailCommentEt.setHint("优质评论会被优先展示"); + mCommentDetailCommentEt.setHint(getString(R.string.message_detail_comment_hint)); mCommentDetailCommentEt.setText(""); } } diff --git a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java index 0f17c934d0..03af8b2f86 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java @@ -320,9 +320,9 @@ public class MessageDetailActivity extends BaseActivity implements OnCommentCall mColseCommentV.setVisibility(View.VISIBLE); if (mCommentEntity != null && mCommentEntity.getUser() != null) { - mMessageDetailEt.setHint("回复" + mCommentEntity.getUser().getName() + "："); + mMessageDetailEt.setHint(getString(R.string.comment_repty_hint, mCommentEntity.getUser().getName())); } else { - mMessageDetailEt.setHint("优质评论会被优先展示"); + mMessageDetailEt.setHint(getString(R.string.message_detail_comment_hint)); } } }); @@ -336,7 +336,7 @@ public class MessageDetailActivity extends BaseActivity implements OnCommentCall if (mCommentEntity != null) { mCommentEntity = null; // 清空当前评论实体 - mMessageDetailEt.setHint("优质评论会被优先展示"); + mMessageDetailEt.setHint(getString(R.string.message_detail_comment_hint)); mMessageDetailEt.setText(""); } } @@ -369,7 +369,7 @@ public class MessageDetailActivity extends BaseActivity implements OnCommentCall return; } - mSendingDialog = DialogUtils.showWaitDialog(this, "正在提交"); + mSendingDialog = DialogUtils.showWaitDialog(this, getString(R.string.post_dialog_hint)); JSONObject jsonObject = new JSONObject(); try { @@ -456,20 +456,20 @@ public class MessageDetailActivity extends BaseActivity implements OnCommentCall String detail = errorJson.getString("detail"); switch (detail) { case "too frequent": - toast("别话痨哦~休息一会再来评论吧~"); + toast(getString(R.string.comment_failed_toofrequent)); break; case "user blocked": - toast("账号状态异常，暂时无法发表评论"); + toast(getString(R.string.comment_failed_userblocked)); break; case "article blocked": - toast("文章异常，无法发表评论"); + toast(getString(R.string.comment_failed_articleblocked)); setSoftInput(false); break; case "illegal": - toast("评论内容可能包括敏感信息，请修改后再发表"); + toast(getString(R.string.comment_failed_illegal)); break; default: - toast("评论失败，未知原因"); + toast(getString(R.string.comment_failed_unknown)); break; } } catch (Exception ex) { @@ -480,7 +480,7 @@ public class MessageDetailActivity extends BaseActivity implements OnCommentCall } } - toast("提交失败，请检查网络设置"); + toast(getString(R.string.post_failure_hint)); } }); } diff --git a/app/src/main/java/com/gh/gamecenter/SuggestSelectActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestSelectActivity.java index 79b1c0261a..2a2e788f6e 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestSelectActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestSelectActivity.java @@ -67,7 +67,7 @@ public class SuggestSelectActivity extends BaseActivity { type = 6; break; case R.id.suggest_qqun_rl: - QQUtils.joinQQGroup(SuggestSelectActivity.this, "vd754P2_uNUJqDcgX4V-pyXEGZZVH0DE"); + QQUtils.joinQQGroup(SuggestSelectActivity.this, "vd754P2_uNUJqDcgX4V-pyXEGZZVH0DE"); // Q群：367541038 KEY return; } diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index 236cc121b1..53f4e46837 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -388,7 +388,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, "请输入正确的链接"); + Utils.toast(SuggestionActivity.this, getString(R.string.suggestion_url_error_hint)); return; } diff --git a/app/src/main/java/com/gh/gamecenter/UserInfoActivity.java b/app/src/main/java/com/gh/gamecenter/UserInfoActivity.java index c5b2b9c390..2a92eaea25 100644 --- a/app/src/main/java/com/gh/gamecenter/UserInfoActivity.java +++ b/app/src/main/java/com/gh/gamecenter/UserInfoActivity.java @@ -82,21 +82,21 @@ public class UserInfoActivity extends BaseActivity { if (!TextUtils.isEmpty(region)) { mUserinfoAreaTv.setText(region); } else { - mUserinfoAreaTv.setText("未选择"); + mUserinfoAreaTv.setText(R.string.userinfo_region_empty); } String gender = userInfo.getGender(); if (!TextUtils.isEmpty(gender)) { mUserinfoSexTv.setText(gender); } else { - mUserinfoSexTv.setText("未选择"); + mUserinfoSexTv.setText(R.string.userinfo_gender_empty); } String contact = userInfo.getContact(); if (!TextUtils.isEmpty(contact)) { mUserinfoContactTv.setText(contact); } else { - mUserinfoContactTv.setText("未填写"); + mUserinfoContactTv.setText(R.string.userinfo_contact_empty); } } } diff --git a/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java b/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java index bc4a0b2fa4..1c5a39063e 100644 --- a/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java @@ -436,11 +436,11 @@ public class ViewImageActivity extends Activity implements OnPageChangeListener bitmap.compress(Bitmap.CompressFormat.PNG, 90, out); out.flush(); out.close(); - Utils.log("========保存成功"); + Utils.log("图片保存成功"); Utils.toast(ViewImageActivity.this, "图片已保存到/Pictures/ghzhushou/"); MessageShareUtils.refreshImage(new File(savePath), ViewImageActivity.this); } catch (IOException e) { - Utils.log("========保存失败" + e.toString()); + Utils.log("图片保存失败：" + e.toString()); System.out.println(e); } } diff --git a/app/src/main/java/com/gh/gamecenter/VoteActivity.java b/app/src/main/java/com/gh/gamecenter/VoteActivity.java index e89a0b9057..c66134900c 100644 --- a/app/src/main/java/com/gh/gamecenter/VoteActivity.java +++ b/app/src/main/java/com/gh/gamecenter/VoteActivity.java @@ -312,13 +312,13 @@ public class VoteActivity extends BaseActivity implements SwipeRefreshLayout.OnR JSONObject errorJson = new JSONObject(string); String detail = errorJson.getString("detail"); if ("illegal".equals(detail)) { - Utils.toast(VoteActivity.this, "包含非法内容，请修改后重试"); + Utils.toast(VoteActivity.this, getString(R.string.vote_illegal_hint)); } } catch (Exception e1) { e1.printStackTrace(); } } else { - Utils.toast(VoteActivity.this, "提交失败"); + toast(getString(R.string.post_failure_hint)); } waitDialog.dismiss(); diff --git a/app/src/main/java/com/gh/gamecenter/db/DatabaseHelper.java b/app/src/main/java/com/gh/gamecenter/db/DatabaseHelper.java index 12d7fa8e76..4dc7e0cab8 100644 --- a/app/src/main/java/com/gh/gamecenter/db/DatabaseHelper.java +++ b/app/src/main/java/com/gh/gamecenter/db/DatabaseHelper.java @@ -23,7 +23,7 @@ import java.sql.SQLException; public class DatabaseHelper extends OrmLiteSqliteOpenHelper { private static final String DATABASE_NAME = "gh_assist.db"; - private static final int DATABASE_VERSION = 8; + private static final int DATABASE_VERSION = 9; private static DatabaseHelper instance; private ArrayMap daos = new ArrayMap<>(); diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java index 6bf064da3c..b9d5aa9d4d 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java @@ -54,22 +54,16 @@ public class GameDownloadFragment extends BaseFragment implements View.OnClickLi @BindView(R.id.downloadmanager_rv_show) RecyclerViewExtended mDownloadmanagerRv; - @BindView(R.id.reuse_nodata_skip) LinearLayout mNoDataSkip; - @BindView(R.id.downloadmanager_rl_head) RelativeLayout mDownloadmanagerHeadRl; - @BindView(R.id.downloadmanager_tv_task) TextView mDownloadmanagerTaskTv; - @BindView(R.id.reuse_nodata_skip_tv_hint) TextView mNoDataSkipHintTv; - @BindView(R.id.reuse_nodata_skip_tv_btn) TextView mNoDataSkipBtn; - @BindView(R.id.downloadmanager_tv_allstart) TextView mDownloadmanagerAllstartTv; 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 8a987609d8..a2e4f799bd 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java @@ -53,7 +53,7 @@ import java.util.Map; */ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { - private LinearLayout downloadmanager_tv_none; + private LinearLayout mNoDataSkip; private List downloadingList; private List doneList; @@ -74,7 +74,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { this.url = url; - downloadmanager_tv_none = textView; + mNoDataSkip = textView; // statusMap = DownloadManager.getInstance(mContext).getStatusMap(); // downloadingList = new ArrayList<>(DownloadManager.getInstance(mContext).getDownloadingMap().values()); @@ -511,8 +511,8 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { locationMap.clear(); notifyDataSetChanged(); EventBus.getDefault().post(new EBDownloadChanged("download", View.GONE, 0)); - if (downloadmanager_tv_none.getVisibility() == View.GONE) { - downloadmanager_tv_none.setVisibility(View.VISIBLE); + if (mNoDataSkip.getVisibility() == View.GONE) { + mNoDataSkip.setVisibility(View.VISIBLE); } } else if (doneList.size() == 1) { doneList.remove(location.intValue()); @@ -533,8 +533,8 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { locationMap.clear(); notifyDataSetChanged(); EventBus.getDefault().post(new EBDownloadChanged("download", View.GONE, 0)); - if (downloadmanager_tv_none.getVisibility() == View.GONE) { - downloadmanager_tv_none.setVisibility(View.VISIBLE); + if (mNoDataSkip.getVisibility() == View.GONE) { + mNoDataSkip.setVisibility(View.VISIBLE); } } else if (downloadingList.size() == 1) { downloadingList.remove(location.intValue()); diff --git a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java index 2f265fc3be..b7329b4213 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragment.java @@ -24,6 +24,7 @@ import org.greenrobot.eventbus.ThreadMode; import java.util.ArrayList; +import butterknife.BindView; /** * 游戏更新管理fragment @@ -32,10 +33,15 @@ import java.util.ArrayList; */ public class GameUpdateFragment extends BaseFragment { - private RecyclerView gameupdate_rv_show; - private GameUpdateFragmentAdapter adapter; - private LinearLayout gameupdate_ll_loading; - private LinearLayout reuse_nodata_skip; + @BindView(R.id.gameupdate_rv_show) + RecyclerView mGameUpdateRv; + @BindView(R.id.gameupdate_ll_loading) + LinearLayout mGameUpdateLoading; + @BindView(R.id.reuse_nodata_skip) + LinearLayout mGameUpdateNodataSkip; + + + private GameUpdateFragmentAdapter mAdapter; @Override protected int getLayoutId() { @@ -54,10 +60,10 @@ public class GameUpdateFragment extends BaseFragment { } String entrance = intent.getStringExtra(EntranceUtils.KEY_ENTRANCE); - gameupdate_ll_loading = (LinearLayout) view.findViewById(R.id.gameupdate_ll_loading); + mGameUpdateLoading = (LinearLayout) view.findViewById(R.id.gameupdate_ll_loading); - reuse_nodata_skip = (LinearLayout) view.findViewById(R.id.reuse_nodata_skip); - reuse_nodata_skip.setVisibility(View.GONE); + mGameUpdateNodataSkip = (LinearLayout) view.findViewById(R.id.reuse_nodata_skip); + mGameUpdateNodataSkip.setVisibility(View.GONE); TextView reuse_nodata_skip_tv_hint = (TextView) view.findViewById(R.id.reuse_nodata_skip_tv_hint); reuse_nodata_skip_tv_hint.setText("暂无更新"); final TextView reuse_nodata_skip_tv_btn = (TextView) view.findViewById(R.id.reuse_nodata_skip_tv_btn); @@ -77,62 +83,62 @@ public class GameUpdateFragment extends BaseFragment { } }); - gameupdate_rv_show = (RecyclerView) view.findViewById(R.id.gameupdate_rv_show); - gameupdate_rv_show.setHasFixedSize(true); - gameupdate_rv_show.setLayoutManager(new LinearLayoutManager(getActivity())); - adapter = new GameUpdateFragmentAdapter(getActivity(), gameupdate_ll_loading, - reuse_nodata_skip, packageName, isUpdate, entrance); - gameupdate_rv_show.setAdapter(adapter); + + mGameUpdateRv.setHasFixedSize(true); + mGameUpdateRv.setLayoutManager(new LinearLayoutManager(getActivity())); + mAdapter = new GameUpdateFragmentAdapter(getActivity(), mGameUpdateLoading, + mGameUpdateNodataSkip, packageName, isUpdate, entrance); + mGameUpdateRv.setAdapter(mAdapter); } @Subscribe(threadMode = ThreadMode.MAIN) public void onEventMainThread(EBDownloadStatus status) { if ("delete".equals(status.getStatus())) { - ArrayList locationList = adapter.getLocationMap().get(status.getPackageName()); + ArrayList locationList = mAdapter.getLocationMap().get(status.getPackageName()); if (locationList != null) { for (int location : locationList) { - gameupdate_rv_show.getAdapter().notifyItemChanged(location); + mGameUpdateRv.getAdapter().notifyItemChanged(location); } - gameupdate_rv_show.getAdapter().notifyItemChanged(0); + mGameUpdateRv.getAdapter().notifyItemChanged(0); } } else if ("update".equals(status.getStatus()) || "plugin".equals(status.getStatus())) { - adapter.init(); + mAdapter.init(); } } @Subscribe(threadMode = ThreadMode.MAIN) public void onEventMainThread(EBPackage busFour) { - ArrayList locationList = adapter.getLocationMap().get(busFour.getPackageName()); + ArrayList locationList = mAdapter.getLocationMap().get(busFour.getPackageName()); if (locationList != null) { for (int location : locationList) { if ("安装".equals(busFour.getType())) { - gameupdate_rv_show.getAdapter().notifyItemChanged(location + 1); - gameupdate_rv_show.getAdapter().notifyItemChanged(0); + mGameUpdateRv.getAdapter().notifyItemChanged(location + 1); + mGameUpdateRv.getAdapter().notifyItemChanged(0); } else if ("卸载".equals(busFour.getType())) { - adapter.removeUpdate(busFour.getPackageName()); - if (adapter.getUpdateList().isEmpty()) { - reuse_nodata_skip.setVisibility(View.VISIBLE); + mAdapter.removeUpdate(busFour.getPackageName()); + if (mAdapter.getUpdateList().isEmpty()) { + mGameUpdateNodataSkip.setVisibility(View.VISIBLE); } } EventBus.getDefault().post(new EBDownloadChanged("update", View.VISIBLE, -1)); } - adapter.initLocationMap(); + mAdapter.initLocationMap(); } } @Subscribe(threadMode = ThreadMode.MAIN) public void onEventMainThread(EBMiPush miPush) { if ("mipush_plugin".equals(miPush.getFrom())) { - adapter.getUpdateListFromServer(); + mAdapter.getUpdateListFromServer(); } } //更新平台信息 @Subscribe(threadMode = ThreadMode.MAIN) public void onEventMainThread(EBReuse reuse) { - if ("PlatformChanged".equals(reuse.getType()) && adapter != null) { - adapter.notifyItemRangeChanged(0, adapter.getItemCount()); + if ("PlatformChanged".equals(reuse.getType()) && mAdapter != null) { + mAdapter.notifyItemRangeChanged(0, mAdapter.getItemCount()); } } } diff --git a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java index ec60c37ddf..0f886b25d6 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java @@ -58,8 +58,8 @@ import rx.schedulers.Schedulers; */ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { - private LinearLayout gameupdate_ll_loading; - private LinearLayout gameupdate_tv_none; + private LinearLayout mGameUpdateLoading; + private LinearLayout mGameUpdateNodataSkip; private ArrayMap> locationMap; @@ -72,8 +72,8 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { boolean isUpdate, String entrance) { super(activity); - gameupdate_ll_loading = loading; - gameupdate_tv_none = none; + mGameUpdateLoading = loading; + mGameUpdateNodataSkip = none; this.mPackageName = packageName; this.entrance = entrance; @@ -90,11 +90,11 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { // 根据包名获取更新（单个） private void getUpdateByPackageName(String packageName) { - gameupdate_ll_loading.setVisibility(View.VISIBLE); + mGameUpdateLoading.setVisibility(View.VISIBLE); if (PackageUtils.getMetaData(mContext, packageName, "gh_version") == null) { - gameupdate_ll_loading.setVisibility(View.GONE); + mGameUpdateLoading.setVisibility(View.GONE); if (updateList.isEmpty()) { - gameupdate_tv_none.setVisibility(View.VISIBLE); + mGameUpdateNodataSkip.setVisibility(View.VISIBLE); } return; } @@ -120,17 +120,17 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { } if (updateList.isEmpty()) { - gameupdate_tv_none.setVisibility(View.VISIBLE); + mGameUpdateNodataSkip.setVisibility(View.VISIBLE); } else { - gameupdate_tv_none.setVisibility(View.GONE); + mGameUpdateNodataSkip.setVisibility(View.GONE); } - gameupdate_ll_loading.setVisibility(View.GONE); + mGameUpdateLoading.setVisibility(View.GONE); } @Override public void onFailure(HttpException e) { - gameupdate_ll_loading.setVisibility(View.GONE); + mGameUpdateLoading.setVisibility(View.GONE); mPackageName = null; } }); @@ -138,7 +138,7 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { // 从服务器中获取更新（多个） public void getUpdateListFromServer() { - gameupdate_ll_loading.setVisibility(View.VISIBLE); + mGameUpdateLoading.setVisibility(View.VISIBLE); List packages = getInstalledList(); if (packages.size() != 0) { @@ -169,7 +169,7 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { } }); } else { - gameupdate_ll_loading.setVisibility(View.GONE); + mGameUpdateLoading.setVisibility(View.GONE); } } @@ -183,9 +183,9 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { initLocationMap(); if (updateList.isEmpty()) { - gameupdate_tv_none.setVisibility(View.VISIBLE); + mGameUpdateNodataSkip.setVisibility(View.VISIBLE); } else { - gameupdate_tv_none.setVisibility(View.GONE); + mGameUpdateNodataSkip.setVisibility(View.GONE); EventBus.getDefault().post( new EBDownloadChanged("update", View.VISIBLE, updateList.size())); } @@ -246,11 +246,11 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { initLocationMap(); if (updateList.isEmpty()) { - gameupdate_tv_none.setVisibility(View.VISIBLE); + mGameUpdateNodataSkip.setVisibility(View.VISIBLE); } else { - gameupdate_tv_none.setVisibility(View.GONE); + mGameUpdateNodataSkip.setVisibility(View.GONE); } - gameupdate_ll_loading.setVisibility(View.GONE); + mGameUpdateLoading.setVisibility(View.GONE); } // 对更新列表进行排序 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 254114df7f..9120a50c85 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/GameFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/GameFragment.java @@ -160,7 +160,6 @@ public class GameFragment extends BaseFragment implements SwipeRefreshLayout.OnR //下载被删除事件 @Subscribe(threadMode = ThreadMode.MAIN) public void onEventMainThread(EBDownloadStatus status) { -// super.onEventMainThread(status); if ("delete".equals(status.getStatus())) { DownloadManager.getInstance(getActivity()).removePlatform(status.getName(), status.getPlatform()); diff --git a/app/src/main/java/com/gh/gamecenter/manager/RefreshTokenManager.java b/app/src/main/java/com/gh/gamecenter/manager/RefreshTokenManager.java index a1b5a262d5..841494d8bb 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/RefreshTokenManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/RefreshTokenManager.java @@ -1,7 +1,6 @@ package com.gh.gamecenter.manager; import android.content.Context; -import android.os.Looper; import com.gh.common.constant.Constants; import com.gh.common.util.DeviceUtils; @@ -21,13 +20,9 @@ import okhttp3.MediaType; import okhttp3.RequestBody; import retrofit2.HttpException; import rx.Observable; -import rx.Scheduler; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; -import static com.gh.common.util.LoginUtils.cleanUserData; -import static com.gh.common.util.LoginUtils.saveLoginToken; - /** * Created by khy on 8/11/17. */ @@ -90,7 +85,7 @@ public class RefreshTokenManager { response.setLoginType(loginToken.getLoginType()); response.setUserToken(loginToken.getUserToken()); } - saveLoginToken(context, response); + LoginUtils.saveLoginToken(context, response); LoginUtils.getUserData(context, isRunMainThread, listener, LoginUtils.LoginTag.refresh); @@ -119,7 +114,7 @@ public class RefreshTokenManager { } if (e == null || e.code() != Constants.NOT_NETWORK_CODE) { - cleanUserData(context); + LoginUtils.cleanUserData(context); } isRefreshing = false; } diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java index 0d7d1215f2..d508d9bebe 100644 --- a/app/src/main/java/com/halo/assistant/HaloApp.java +++ b/app/src/main/java/com/halo/assistant/HaloApp.java @@ -150,7 +150,7 @@ public class HaloApp extends TinkerAppLike { } }); - //设置别名 + //设置别名 用户id和device_token的一对多的映射关系 pushAgent.addAlias(TokenUtils.getDeviceId(getApplication()), "GHDID", new UTrack.ICallBack() { @Override diff --git a/app/src/main/res/layout/gameupdate.xml b/app/src/main/res/layout/gameupdate.xml index af6b3a8790..d9231bfec5 100644 --- a/app/src/main/res/layout/gameupdate.xml +++ b/app/src/main/res/layout/gameupdate.xml @@ -6,7 +6,7 @@ + android:layout_height = "match_parent" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6a8d070270..6d7bb69551 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -413,5 +413,22 @@ http://www.ghzs.com/link?source=appshare100 http://www.ghzs.com/link?source=appshare300 http://image.ghzs666.com/pic/57d604808ab49e467d8b4568.png + 我的收藏 + 别话痨哦~休息一会再来评论吧~ + 账号状态异常，暂时无法发表评论 + 文章异常，无法发表评论 + 评论内容可能包括敏感信息，请修改后再发表 + 评论失败，未知原因 + 提交失败，请检查网络设置 + + 回复%1$s： + 正在提交 + V%1$s + V%1$s.%2$s + 包含非法内容，请修改后重试 + 未选择 + 未选择 + 未填写 + 请输入正确的链接