diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index e8503eee6e..a7778cec19 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -120,7 +120,7 @@ public abstract class BaseActivity extends BaseAppCompatToolBarActivity implemen @Override public void onConfirm() { if (FileUtils.isEmptyFile(showDialog.getPath())) { - Utils.toast(BaseActivity.this, "解析包出错（可能被误删了），请重新下载"); + Utils.toast(BaseActivity.this, getString(R.string.install_failure_hint)); } else { startActivity(PackageUtils.getUninstallIntent(BaseActivity.this, showDialog.getPath())); } 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 1b1bc59d82..603325fbf4 100644 --- a/app/src/main/java/com/gh/common/constant/Config.java +++ b/app/src/main/java/com/gh/common/constant/Config.java @@ -38,7 +38,7 @@ public class Config { public static final String USERSEA_APP_SECRET = BuildConfig.USERSEA_APP_SECRET; //　登录验证 public static final String BUGLY_APPID = BuildConfig.BUGLY_APPID; // http://www.ghzs666.com/article/${articleId}.html - public static final String URL_ARTICLE = "http://www.ghzs.com/article/"; // TODO ghzs/ghzs666 统一 + public static final String URL_ARTICLE = "http://www.ghzs666.com/article/"; // TODO ghzs/ghzs666 统一 public static boolean isShow(Context context) { SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context); 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 41f94c7d16..20d7c83fe2 100644 --- a/app/src/main/java/com/gh/common/util/CommentUtils.java +++ b/app/src/main/java/com/gh/common/util/CommentUtils.java @@ -3,7 +3,6 @@ package com.gh.common.util; import android.app.Dialog; import android.content.Context; import android.graphics.Color; -import android.net.Uri; import android.support.v4.content.ContextCompat; import android.text.TextUtils; import android.view.View; @@ -291,7 +290,7 @@ public class CommentUtils { } else { holder.commentUserNameTv.setText(entity.getUser().getName()); if (TextUtils.isEmpty(entity.getUser().getIcon())) { - holder.commentUserIconDv.setImageURI(Uri.parse("res:///" + R.drawable.user_default_icon_comment)); + ImageUtils.Companion.display(holder.commentUserIconDv, R.drawable.user_default_icon_comment); } else { ImageUtils.Companion.display(holder.commentUserIconDv, entity.getUser().getIcon()); } diff --git a/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java b/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java index 0eb59a1ba7..0ed700cdea 100644 --- a/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java +++ b/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java @@ -57,7 +57,7 @@ public class DetailDownloadUtils { if (isInstalled) { if (PackageManager.isCanUpdate(viewHolder.gameEntity.getId(), viewHolder.gameEntity.getApk().get(0).getPackageName())) { if (viewHolder.isNewsDetail) { - viewHolder.downloadTv.setText("更新"); + viewHolder.downloadTv.setText(R.string.update); } else if (TextUtils.isEmpty(viewHolder.downloadAddWord)) { viewHolder.downloadTv.setText(String.format("更新《%s》", viewHolder.gameEntity.getName())); @@ -72,7 +72,7 @@ public class DetailDownloadUtils { && !TextUtils.isEmpty(viewHolder.gameEntity.getApk().get(0).getGhVersion()) && !PackageUtils.isSignature(viewHolder.context, viewHolder.gameEntity.getApk().get(0).getPackageName())) { if (viewHolder.isNewsDetail) { - viewHolder.downloadTv.setText("插件化"); + viewHolder.downloadTv.setText(R.string.pluggable); } else if (TextUtils.isEmpty(viewHolder.downloadAddWord)) { viewHolder.downloadTv.setText(String.format("插件化《%s》", viewHolder.gameEntity.getName())); @@ -84,7 +84,7 @@ public class DetailDownloadUtils { R.drawable.game_item_btn_plugin_style); } else { if (viewHolder.isNewsDetail) { - viewHolder.downloadTv.setText("启动"); + viewHolder.downloadTv.setText(R.string.launch); } else if (TextUtils.isEmpty(viewHolder.downloadAddWord)) { viewHolder.downloadTv.setText(String.format("启动《%s》", viewHolder.gameEntity.getName())); @@ -145,7 +145,7 @@ public class DetailDownloadUtils { case timeout: case neterror: case waiting: - viewHolder.downloadPer.setText("下载中"); + viewHolder.downloadPer.setText(R.string.downloading); break; case done: viewHolder.downloadPer.setText("安装"); @@ -230,7 +230,7 @@ public class DetailDownloadUtils { } else if (str.contains("插件化")) { method = "插件化"; } else { - method = "下载"; + method = mViewHolder.context.getString(R.string.download); } ApkEntity apkEntity = mGameEntity.getApk().get(0); String msg = FileUtils.isCanDownload(mViewHolder.context, apkEntity.getSize()); 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 7e79ef9185..fc5335cda3 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java @@ -147,25 +147,25 @@ public class DownloadItemUtils { final String packageName = apkEntity.getPackageName(); if (gameEntity.isPluggable()) { - holder.gameDownloadBtn.setText("插件化"); + holder.gameDownloadBtn.setText(R.string.pluggable); setwhat(context, holder, apkEntity, packageName); } else if (PackageManager.isInstalled(packageName)) { if (PackageManager.isCanUpdate(gameEntity.getId(), packageName)) { - holder.gameDownloadBtn.setText("更新"); + holder.gameDownloadBtn.setText(R.string.update); holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_download_style); } else { if (gameEntity.getTag() != null && gameEntity.getTag().size() != 0 && !TextUtils.isEmpty(apkEntity.getGhVersion()) && !PackageUtils.isSignature(context, packageName)) { - holder.gameDownloadBtn.setText("插件化"); + holder.gameDownloadBtn.setText(R.string.pluggable); setwhat(context, holder, apkEntity, packageName); } else { - holder.gameDownloadBtn.setText("启动"); + holder.gameDownloadBtn.setText(R.string.launch); holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_launch_style); } } } else { - holder.gameDownloadBtn.setText("下载"); + holder.gameDownloadBtn.setText(R.string.download); holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_download_style); } } @@ -244,7 +244,7 @@ public class DownloadItemUtils { } if (isNormal) { - holder.gameDownloadBtn.setText("下载中"); + holder.gameDownloadBtn.setText(R.string.downloading); holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style); holder.gameDownloadBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style)); } @@ -258,7 +258,7 @@ public class DownloadItemUtils { holder.gameDownloadPercentage.setText(downloadEntity.getPercent() + "%"); if (isNormal) { - holder.gameDownloadBtn.setText("下载中"); + holder.gameDownloadBtn.setText(R.string.downloading); holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style); holder.gameDownloadBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style)); } @@ -274,7 +274,7 @@ public class DownloadItemUtils { holder.gameDownloadPercentage.setText(downloadEntity.getPercent() + "%"); if (isNormal) { - holder.gameDownloadBtn.setText("下载中"); + holder.gameDownloadBtn.setText(R.string.downloading); holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style); holder.gameDownloadBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style)); } @@ -397,10 +397,10 @@ public class DownloadItemUtils { if (TextUtils.isEmpty(msg)) { DataUtils.onGameDownloadEvent(context, gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), entrance, "下载开始"); - DownloadManager.createDownload(context, gameEntity, "下载", entrance, location); + DownloadManager.createDownload(context, gameEntity, context.getString(R.string.download), entrance, location); Utils.toast(context, gameEntity.getName() + "已加入下载队列"); - downloadBtn.setText("下载中"); + downloadBtn.setText(R.string.downloading); downloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style); downloadBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style)); @@ -420,7 +420,7 @@ public class DownloadItemUtils { DownloadManager.createDownload(context, gameEntity, "插件化", entrance, location); Utils.toast(context, gameEntity.getName() + "已加入下载队列"); - downloadBtn.setText("下载中"); + downloadBtn.setText(R.string.downloading); downloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style); downloadBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style)); @@ -438,7 +438,7 @@ public class DownloadItemUtils { if (downloadEntity != null) { final String path = downloadEntity.getPath(); if (FileUtils.isEmptyFile(path)) { - Utils.toast(context, "解析包出错（可能被误删了），请重新下载"); + Utils.toast(context, context.getString(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/ImageUtils.kt b/app/src/main/java/com/gh/common/util/ImageUtils.kt index 852ca5ae91..663d6ea1d6 100644 --- a/app/src/main/java/com/gh/common/util/ImageUtils.kt +++ b/app/src/main/java/com/gh/common/util/ImageUtils.kt @@ -5,6 +5,7 @@ import android.content.res.Resources import android.graphics.drawable.Animatable import android.graphics.drawable.ColorDrawable import android.net.Uri +import android.support.annotation.DrawableRes import android.support.v4.content.ContextCompat import com.facebook.common.executors.CallerThreadExecutor import com.facebook.drawee.backends.pipeline.Fresco @@ -19,7 +20,7 @@ import com.facebook.imagepipeline.request.ImageRequest import com.facebook.imagepipeline.request.ImageRequestBuilder import com.gh.gamecenter.R -class ImageUtils { +class ImageUtils private constructor() { // 自适应图片宽高 fun display(simpleDraweeView: SimpleDraweeView, url: String, width: Int) { @@ -106,6 +107,10 @@ class ImageUtils { // } simpleDraweeView.setImageURI(url) } + + fun display(draweeView: SimpleDraweeView, @DrawableRes res: Int) { + draweeView.setImageURI("res:///" + res) + } } } diff --git a/app/src/main/java/com/gh/common/util/IntentUtils.java b/app/src/main/java/com/gh/common/util/IntentUtils.java index fab9e494e9..ecec106e3a 100644 --- a/app/src/main/java/com/gh/common/util/IntentUtils.java +++ b/app/src/main/java/com/gh/common/util/IntentUtils.java @@ -50,7 +50,7 @@ public class IntentUtils { "\n" + "光环助手官网地址：\n" + "\n" + - "http://www.ghzs666.com/link?source=appshare333"); + "http://www.ghzs.com/link?source=appshare333"); return data; } } 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 cd8ebbc8ef..41ab473c9d 100644 --- a/app/src/main/java/com/gh/common/util/LibaoUtils.java +++ b/app/src/main/java/com/gh/common/util/LibaoUtils.java @@ -158,59 +158,59 @@ public class LibaoUtils { if (TextUtils.isEmpty(status)) return; switch (status) { case "coming": - libaoBtn.setText("未开抢"); + libaoBtn.setText(R.string.libao_coming); libaoBtn.setBackgroundResource(R.drawable.textview_blue_style); break; case "ling": - libaoBtn.setText("领取"); + libaoBtn.setText(R.string.libao_ling); libaoBtn.setBackgroundResource(R.drawable.textview_green_style); break; case "tao": - libaoBtn.setText("淘号"); + libaoBtn.setText(R.string.libao_tao); libaoBtn.setBackgroundResource(R.drawable.textview_orange_style); break; case "used_up": - libaoBtn.setText("已领光"); + libaoBtn.setText(R.string.libao_used_up); libaoBtn.setBackgroundResource(R.drawable.textview_cancel_up); break; case "finish": - libaoBtn.setText("已结束"); + libaoBtn.setText(R.string.libao_finish); libaoBtn.setBackgroundResource(R.drawable.textview_cancel_up); break; case "linged": - libaoBtn.setText("已领取"); + libaoBtn.setText(R.string.libao_linged); libaoBtn.setBackgroundResource(R.drawable.libao_linged_style); libaoBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.libao_linged_selector)); break; case "taoed": - libaoBtn.setText("已淘号"); + libaoBtn.setText(R.string.libao_taoed); libaoBtn.setBackgroundResource(R.drawable.libao_taoed_style); libaoBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.libao_taoed_selector)); break; case "copy": - libaoBtn.setText("复制"); + libaoBtn.setText(R.string.libao_copy); libaoBtn.setBackgroundResource(R.drawable.textview_blue_style); break; case "repeatLing": - libaoBtn.setText("再领一个"); + libaoBtn.setText(R.string.libao_repeat_ling); libaoBtn.setBackgroundResource(R.drawable.textview_cancel_up); break; case "repeatLinged": - libaoBtn.setText("再领一个"); + libaoBtn.setText(R.string.libao_repeat_ling); libaoBtn.setBackgroundResource(R.drawable.textview_green_style); break; case "repeatTao": - libaoBtn.setText("再淘一个"); + libaoBtn.setText(R.string.libao_repeat_tao); libaoBtn.setBackgroundResource(R.drawable.textview_cancel_up); break; case "repeatTaoed": - libaoBtn.setText("再淘一个"); + libaoBtn.setText(R.string.libao_repeat_tao); libaoBtn.setBackgroundResource(R.drawable.textview_orange_style); break; case "unshelve": libaoBtn.setBackgroundResource(R.drawable.textview_cancel_style); - libaoBtn.setText("已下架"); + libaoBtn.setText(R.string.libao_unshelve); break; default: libaoBtn.setBackgroundResource(R.drawable.textview_cancel_style); @@ -480,7 +480,7 @@ public class LibaoUtils { EventBus.getDefault().post(new EBUISwitch(REFRESH_LIBAO_TIME, countdown)); } - libaoBtn.setText("已领取"); + libaoBtn.setText(R.string.libao_linged); libaoBtn.setBackgroundResource(R.drawable.libao_linged_style); libaoBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.libao_linged_selector)); diff --git a/app/src/main/java/com/gh/common/util/NewsUtils.java b/app/src/main/java/com/gh/common/util/NewsUtils.java index c3f39d807b..c680397b5b 100644 --- a/app/src/main/java/com/gh/common/util/NewsUtils.java +++ b/app/src/main/java/com/gh/common/util/NewsUtils.java @@ -80,9 +80,9 @@ public class NewsUtils { public static void setNewsType(TextView textView, String type, int priority, int position) { if (priority != 0) { if (position == 0) { - textView.setText("置顶"); + textView.setText(R.string.article_top); } else { - textView.setText("热门"); + textView.setText(R.string.article_hot); } textView.setBackgroundResource(R.drawable.textview_all_red_style); return; diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java index b6e66c30dd..7c4aa7cd84 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java @@ -559,7 +559,7 @@ public class GameDetailActivity extends BaseActivity { @Override public void onError() { mGameConcern.setEnabled(true); - toast("关注失败"); + toast(R.string.concern_failure); } }); } else { @@ -591,7 +591,7 @@ public class GameDetailActivity extends BaseActivity { @Override public void onError() { mGameConcern.setEnabled(true); - toast("取消关注失败"); + toast(R.string.cancel_concern_failure); } }); } diff --git a/app/src/main/java/com/gh/gamecenter/LibaoActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoActivity.java index bfecee0cc5..2fa579571f 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoActivity.java @@ -40,7 +40,7 @@ import butterknife.OnClick; public class LibaoActivity extends BaseActivity implements View.OnClickListener, ViewPager.OnPageChangeListener { - public final static String EB_LIBAOACTIVITY_TAG = "LibaoActivity"; + @BindView(R.id.libao_vp_content) NoScrollableViewPager mLibaoVp; @BindView(R.id.libao_ll_top) @@ -57,9 +57,15 @@ public class LibaoActivity extends BaseActivity implements View.OnClickListener, TextView mGuanzhuTv; @BindView(R.id.libao_chunhaoxiang_tv) TextView mChunhaoxiangTv; + + private LinearLayout.LayoutParams lparams; + + public static final String EB_LIBAOACTIVITY_TAG = "LibaoActivity"; + public static final String LIBAO_OPENPAGE = "openPage"; + public static final String LIBAO_CLOSEPAGE = "closePage"; + private int currentItem; private int width; - private LinearLayout.LayoutParams lparams; @NonNull public static Intent getIntent(Context context, String entrance) { @@ -157,13 +163,13 @@ public class LibaoActivity extends BaseActivity implements View.OnClickListener, // 页面切换事件（查看历史礼包的页面） @Subscribe(threadMode = ThreadMode.MAIN) public void onEventMainThread(EBReuse reuse) { - if ("openPage".equals(reuse.getType())) { + if (LIBAO_OPENPAGE.equals(reuse.getType())) { mLibaoTopLl.setVisibility(View.GONE); mLibaoLine.setVisibility(View.GONE); mHistoryTitle.setVisibility(View.VISIBLE); mHistoryTitle.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.hint)); mLibaoVp.setScrollable(false); - } else if ("closePage".equals(reuse.getType())) { + } else if (LIBAO_CLOSEPAGE.equals(reuse.getType())) { mLibaoTopLl.setVisibility(View.VISIBLE); mLibaoLine.setVisibility(View.VISIBLE); mHistoryTitle.setVisibility(View.GONE); diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 450c5d7dde..65bdba6131 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -181,7 +181,7 @@ public class MainActivity extends BaseActivity { // 是否是自动安装 if (sp.getBoolean("autoinstall", true)) { if (FileUtils.isEmptyFile(downloadEntity.getPath())) { - toast("解析包出错（可能被误删了），请重新下载"); + toast(R.string.install_failure_hint); DownloadManager.getInstance(MainActivity.this).cancel(downloadEntity.getUrl()); } else { if (PackageUtils.isCanLaunchSetup(getApplicationContext(), downloadEntity.getPath())) { diff --git a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java index 43c7115f13..d9c64def2a 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsSearchActivity.java @@ -138,7 +138,7 @@ public class NewsSearchActivity extends BaseActivity { }, 500); } else { - Utils.toast(NewsSearchActivity.this, "请输入关键字"); + Utils.toast(NewsSearchActivity.this, getString(R.string.search_hint)); } } diff --git a/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java b/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java index 8ae53d5c71..dfaea66694 100644 --- a/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SelectUserIconActivity.java @@ -25,6 +25,7 @@ import org.json.JSONObject; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.Locale; import butterknife.BindView; import butterknife.OnClick; @@ -131,7 +132,7 @@ public class SelectUserIconActivity extends BaseActivity implements LoginUtils.o String iconCount = sp.getString("updateIconCount", null); if (!TextUtils.isEmpty(iconCount)) { long l = System.currentTimeMillis(); - SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd"); + SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd", Locale.CHINA); String time = format.format(new Date(l)); JSONObject json; diff --git a/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java b/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java index 8f01a128ea..894819b775 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java @@ -65,9 +65,9 @@ public class ShareGhActivity extends BaseActivity { initTitle(getString(R.string.title_share_gh)); ButterKnife.bind(this); - mGhAddress.setText(Html.fromHtml("" + "www.ghzs666.com" + "")); - QRCodeUtils.setQRCode(this, "http://www.ghzs666.com/link?source=appshare100", mGhQrcode); - ShareUtils.getInstance(this).showShareWindows(mShareRl, "http://www.ghzs666.com/link?source=appshare300", "光环助手" + mGhAddress.setText(Html.fromHtml("" + "www.ghzs.com" + "")); + QRCodeUtils.setQRCode(this, "http://www.ghzs.com/link?source=appshare100", mGhQrcode); + ShareUtils.getInstance(this).showShareWindows(mShareRl, "http://www.ghzs.com/link?source=appshare300", "光环助手" , "http://image.ghzs666.com/pic/57d604808ab49e467d8b4568.png", null, false, false, false); } @@ -79,7 +79,7 @@ public class ShareGhActivity extends BaseActivity { @OnClick(R.id.gh_address_tv) public void copyAddress() { ClipboardManager cmb = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE); - cmb.setText("http://www.ghzs666.com/link?source=appshare100"); + cmb.setText("http://www.ghzs.com/link?source=appshare100"); Utils.toast(this, "网址复制成功，请到微信/QQ粘贴分享"); } diff --git a/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java b/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java index 63d97f6a8d..d7a542e127 100644 --- a/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java @@ -38,16 +38,16 @@ import com.facebook.imagepipeline.image.ImageInfo; import com.facebook.imagepipeline.request.ImageRequest; import com.facebook.imagepipeline.request.ImageRequestBuilder; import com.gc.materialdesign.views.ProgressBarCircularIndeterminate; -import com.halo.assistant.HaloApp; import com.gh.common.util.DisplayUtils; import com.gh.common.util.EntranceUtils; import com.gh.common.util.ImageUtils; import com.gh.common.util.MessageShareUtils; -import com.lightgame.utils.Utils; import com.gh.common.view.Gh_RelativeLayout; import com.gh.common.view.Gh_RelativeLayout.OnSingleTapListener; import com.gh.common.view.Gh_ViewPager; import com.gh.common.view.ZoomSimpleDraweeView; +import com.halo.assistant.HaloApp; +import com.lightgame.utils.Utils; import java.io.File; import java.io.FileOutputStream; @@ -71,9 +71,16 @@ public class ViewImageActivity extends Activity implements OnPageChangeListener private Gh_ViewPager mViewimageVp; private View mViewimageLine; - private ViewImageAdapter adapter; private RelativeLayout.LayoutParams rparams; + private ViewImageAdapter adapter; + + private ImagePipeline imagePipeline; + + private static final String KEY_URLS = "urls"; + private static final String KEY_CURRENT = "current"; + private static final String KEY_SCALETYPE = "ScaleType"; + private ArrayList urls; private Map newUrls; @@ -83,8 +90,6 @@ public class ViewImageActivity extends Activity implements OnPageChangeListener private boolean isOrientation; - private ImagePipeline imagePipeline; - private Handler handler = new Handler() { @Override public void handleMessage(Message msg) { @@ -94,9 +99,9 @@ public class ViewImageActivity extends Activity implements OnPageChangeListener public static Intent getViewImageIntent(Context context, ArrayList list, int position, String entrance) { Intent checkIntent = new Intent(context, ViewImageActivity.class); - checkIntent.putExtra("urls", list); - checkIntent.putExtra("current", position); - checkIntent.putExtra("ScaleType", "FIT_CENTER"); + checkIntent.putExtra(KEY_URLS, list); + checkIntent.putExtra(KEY_CURRENT, position); + checkIntent.putExtra(KEY_SCALETYPE, "FIT_CENTER"); checkIntent.putExtra(EntranceUtils.KEY_ENTRANCE, entrance); return checkIntent; } @@ -136,13 +141,15 @@ public class ViewImageActivity extends Activity implements OnPageChangeListener protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - urls = getIntent().getStringArrayListExtra("urls"); - int current = getIntent().getIntExtra("current", 0); - scaleType = getIntent().getStringExtra("ScaleType"); - if (getIntent().getBundleExtra(EntranceUtils.KEY_DATA) != null) { - urls = getIntent().getBundleExtra(EntranceUtils.KEY_DATA).getStringArrayList("urls"); - current = getIntent().getBundleExtra(EntranceUtils.KEY_DATA).getInt("current", 0); - scaleType = getIntent().getBundleExtra(EntranceUtils.KEY_DATA).getString("ScaleType"); + Bundle extras = getIntent().getExtras(); + urls = extras.getStringArrayList(KEY_URLS); + int current = extras.getInt(KEY_CURRENT, 0); + scaleType = extras.getString(KEY_SCALETYPE); + Bundle data = getIntent().getBundleExtra(EntranceUtils.KEY_DATA); + if (data != null) { + urls = data.getStringArrayList(KEY_URLS); + current = data.getInt(KEY_CURRENT, 0); + scaleType = data.getString(KEY_SCALETYPE); } if (savedInstanceState != null) { diff --git a/app/src/main/java/com/gh/gamecenter/WebActivity.java b/app/src/main/java/com/gh/gamecenter/WebActivity.java index 4a2c775d78..8d57b4b1ab 100644 --- a/app/src/main/java/com/gh/gamecenter/WebActivity.java +++ b/app/src/main/java/com/gh/gamecenter/WebActivity.java @@ -68,20 +68,24 @@ public class WebActivity extends BaseActivity implements View.OnClickListener{ View mShareIv; ImageView mCollectionIv; - private final static int WEB_COMMENT_REQUEST = 9; // 刷新文章web页面评论数 + private static final int WEB_COMMENT_REQUEST = 9; // 刷新文章web页面评论数 + private static final String KEY_ISTOOLS = "isTools"; + private static final String KEY_ISCOLLECTIONTOOLS = "isCollectionTools"; + + private ToolBoxEntity mToolBoxEntity; private String newsId; + private int commentNum; private boolean mIsTools; private boolean mIsCollectionTools; - private ToolBoxEntity mToolBoxEntity; @NonNull public static Intent getWebIntent(Context context) { Intent intent = new Intent(context, WebActivity.class); intent.putExtra(EntranceUtils.KEY_GAMENAME, "使用条款与免责声明"); - intent.putExtra(EntranceUtils.KEY_URL, "http://api.ghzs666.com/disclaimer"); + intent.putExtra(EntranceUtils.KEY_URL, "http://api.ghzs666.com/v2d6/disclaimer"); return intent; } @@ -89,10 +93,10 @@ public class WebActivity extends BaseActivity implements View.OnClickListener{ public static void startWebByCollectionTools(Context context, ToolBoxEntity toolBoxEntity, boolean isCollectionTools) { Intent intent = new Intent(context, WebActivity.class); intent.putExtra(EntranceUtils.KEY_URL, toolBoxEntity.getUrl()); - intent.putExtra("isTools", true); + intent.putExtra(KEY_ISTOOLS, true); // intent.putExtra("gameName", toolBoxEntity.getName()); - intent.putExtra("ToolBoxEntity", toolBoxEntity); - intent.putExtra("isCollectionTools", isCollectionTools); + intent.putExtra(ToolBoxEntity.class.getSimpleName(), toolBoxEntity); + intent.putExtra(KEY_ISCOLLECTIONTOOLS, isCollectionTools); context.startActivity(intent); } @@ -146,7 +150,7 @@ public class WebActivity extends BaseActivity implements View.OnClickListener{ String webUrl; String webTitle; - mIsTools = getIntent().getBooleanExtra("isTools", false); + mIsTools = getIntent().getBooleanExtra(KEY_ISTOOLS, false); if (getIntent().getBundleExtra(EntranceUtils.KEY_DATA) != null) { Bundle data = getIntent().getBundleExtra(EntranceUtils.KEY_DATA); webUrl = data.getString(EntranceUtils.KEY_URL); @@ -174,8 +178,8 @@ public class WebActivity extends BaseActivity implements View.OnClickListener{ if (mIsTools) { - mToolBoxEntity = getIntent().getParcelableExtra("ToolBoxEntity"); - mIsCollectionTools = getIntent().getBooleanExtra("isCollectionTools", false); + mToolBoxEntity = getIntent().getParcelableExtra(ToolBoxEntity.class.getSimpleName()); + mIsCollectionTools = getIntent().getBooleanExtra(KEY_ISCOLLECTIONTOOLS, false); mShareIv.setVisibility(View.VISIBLE); mCollectionIv.setVisibility(View.VISIBLE); initCollection(); 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 6bb3b79bfb..667771bb24 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java @@ -219,10 +219,10 @@ public class CleanApkAdapter extends BaseRecyclerAdapter holder.gameThumb.setImageBitmap(gameEntity.getGameBm()); if (gameEntity.getInstallStatus() == INSTALLED) { - holder.gameSize.setText("已安装"); + holder.gameSize.setText(R.string.installed); holder.gameSize.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); } else { - holder.gameSize.setText("未安装"); + holder.gameSize.setText(R.string.installed_not); holder.gameSize.setTextColor(ContextCompat.getColor(mContext, R.color.red)); } 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 a3c2208b90..f1d89396be 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/CommentDetailAdapter.java @@ -121,7 +121,7 @@ public class CommentDetailAdapter extends BaseRecyclerAdapter { CommentUtils.setCommentTime(holder.commentTimeTv, commentEntity.getTime()); if (commentEntity.getParent() != null) { - holder.commentContentTv.setText("@" + commentEntity.getParent().getUser().getName() + ": " + commentEntity.getContent()); + holder.commentContentTv.setText("@dsdasd" + commentEntity.getParent().getUser().getName() + ": " + commentEntity.getContent()); } else { holder.commentContentTv.setText(commentEntity.getContent()); } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java index ded340b7a7..d3888e9ae5 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ConcernRecommendAdapter.java @@ -178,7 +178,7 @@ public class ConcernRecommendAdapter extends BaseRecyclerAdapter { StringUtils.buildString(mEntrance, "+(游戏新闻列表[", mNewsType, "])")); mContext.startActivity(intent); } else { - Utils.toast(mContext, "请输入关键字"); + Utils.toast(mContext, mContext.getString(R.string.search_hint)); } } }); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java index 4098ad2109..7f3484a7f1 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java @@ -157,7 +157,7 @@ public class KcSelectGameAdapter extends BaseRecyclerAdapter { public void onCompleted() { super.onCompleted(); mSelectPb.setVisibility(View.GONE); - mInstallCount.setText("已安装的游戏（" + mGameList.size() + "）"); + mInstallCount.setText(mContext.getString(R.string.kc_installed_count, mGameList.size())); notifyItemChanged(1, getItemCount() - 1); } }); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java index b2e996c481..cace1c02d7 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java @@ -119,7 +119,7 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter { FooterViewHolder viewHolder = (FooterViewHolder) holder; viewHolder.initItemPadding(); viewHolder.loading.setVisibility(View.GONE); - viewHolder.hint.setText("此礼包有问题？点击反馈"); + viewHolder.hint.setText(R.string.libao_suggestion_hint); viewHolder.itemView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java index a8f3be2770..a2c024b389 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java @@ -197,9 +197,9 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { initFooterViewHolder((FooterViewHolder) holder); } else if (holder instanceof CommentHeadViewHolder) { if (mHotCommentList.size() != 0 && position == 1) { - ((CommentHeadViewHolder) holder).commentHeadTitleTv.setText("热门评论"); + ((CommentHeadViewHolder) holder).commentHeadTitleTv.setText(R.string.comment_hot); } else { - ((CommentHeadViewHolder) holder).commentHeadTitleTv.setText("最新评论"); + ((CommentHeadViewHolder) holder).commentHeadTitleTv.setText(R.string.comment_new); } } } 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 5c50369dac..2be90c2e1d 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java @@ -112,7 +112,7 @@ public class PlatformAdapter extends BaseRecyclerAdapter { viewHolder.mDownloadItemProgressbar.setVisibility(View.GONE); viewHolder.mDownloadItemTvName.setVisibility(View.GONE); viewHolder.mDownloadItemTvStatus.setVisibility(View.GONE); - viewHolder.mDownloadItemIvPic.setImageURI(Uri.parse("res:///" + R.drawable.platform_vote)); + ImageUtils.Companion.display(viewHolder.mDownloadItemIvPic, R.drawable.platform_vote); viewHolder.itemView.setBackgroundDrawable(new ColorDrawable(0)); viewHolder.itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -220,7 +220,7 @@ public class PlatformAdapter extends BaseRecyclerAdapter { if (mGameEntity.getTag() != null && mGameEntity.getTag().size() != 0 && !TextUtils.isEmpty(apkEntity.getGhVersion()) && !PackageUtils.isSignature(mContext, apkEntity.getPackageName())) { - viewHolder.mDownloadItemTvStatus.setText("插件化"); + viewHolder.mDownloadItemTvStatus.setText(R.string.pluggable); downloadEntity = DownloadManager.getInstance(mContext).getDownloadEntityByPackageName(apkEntity.getPackageName()); if (downloadEntity == null || downloadEntity.getUrl().equals(apkEntity.getUrl())) { @@ -231,9 +231,9 @@ public class PlatformAdapter extends BaseRecyclerAdapter { viewHolder.mDownloadItemProgressbar.setProgress(0); } } else if (PackageManager.isCanUpdate(mGameEntity.getId(), apkEntity.getPackageName())) { - viewHolder.mDownloadItemTvStatus.setText("更新"); + viewHolder.mDownloadItemTvStatus.setText(R.string.update); } else { - viewHolder.mDownloadItemTvStatus.setText("启动"); + viewHolder.mDownloadItemTvStatus.setText(R.string.launch); } } else { viewHolder.mDownloadItemProgressbar.setProgress((int) (downloadEntity.getPercent() * 10)); @@ -273,7 +273,7 @@ public class PlatformAdapter extends BaseRecyclerAdapter { apkEntity.getPlatform()); if (id != 0) { viewHolder.mDownloadItemIvPic.setVisibility(View.VISIBLE); - viewHolder.mDownloadItemIvPic.setImageURI(Uri.parse("res:///" + id)); + ImageUtils.Companion.display(viewHolder.mDownloadItemIvPic, id); viewHolder.mDownloadItemTvHint.setVisibility(View.GONE); viewHolder.mDownloadItemProgressbar.setVisibility(View.GONE); viewHolder.mDownloadItemTvName.setVisibility(View.GONE); @@ -314,9 +314,9 @@ public class PlatformAdapter extends BaseRecyclerAdapter { || status.equals(DownloadStatus.neterror) || status.equals(DownloadStatus.downloading) || status.equals(DownloadStatus.waiting)) { - viewHolder.mDownloadItemTvStatus.setText("下载中"); + viewHolder.mDownloadItemTvStatus.setText(R.string.downloading); } else if (status.equals(DownloadStatus.done)) { - viewHolder.mDownloadItemTvStatus.setText("安装"); + viewHolder.mDownloadItemTvStatus.setText(R.string.install); } } } @@ -428,7 +428,7 @@ public class PlatformAdapter extends BaseRecyclerAdapter { String path = downloadEntity.getPath(); if (FileUtils.isEmptyFile(path)) { - Utils.toast(mContext, "解析包出错（可能被误删了），请重新下载"); + Utils.toast(mContext, mContext.getString(R.string.install_failure_hint)); mEntryMap.remove(apkEntity.getUrl()); DownloadManager.getInstance(mContext).cancel(apkEntity.getUrl()); notifyItemChanged(position); @@ -450,7 +450,7 @@ public class PlatformAdapter extends BaseRecyclerAdapter { String path = mEntryMap.get(apkEntity.getUrl()).getPath(); if (FileUtils.isEmptyFile(path)) { - Utils.toast(mContext, "解析包出错（可能被误删了），请重新下载"); + Utils.toast(mContext, mContext.getString(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 6761e35a93..6fe3e8d49f 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ToolBoxRvAdapter.java @@ -233,7 +233,7 @@ public class ToolBoxRvAdapter extends BaseRecyclerAdapter { public void onClick(View v) { if (TextUtils.isEmpty(viewHolder.searchEt.getText().toString())) { - Utils.toast(mContext, "请输入关键字"); + Utils.toast(mContext, mContext.getString(R.string.search_hint)); return; } mSearchListener.search(true, viewHolder.searchEt.getText().toString()); @@ -271,7 +271,7 @@ public class ToolBoxRvAdapter extends BaseRecyclerAdapter { viewHolder.lineLeft.setVisibility(View.VISIBLE); viewHolder.lineRight.setVisibility(View.VISIBLE); viewHolder.loading.setVisibility(View.GONE); - viewHolder.hint.setText("需要什么工具，点击这里反馈"); + viewHolder.hint.setText(R.string.tools_suggestion_hint); viewHolder.itemView.setClickable(true); viewHolder.itemView.setOnClickListener(new View.OnClickListener() { @Override 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 72eb6c3b59..ea9b1ddc19 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java @@ -201,7 +201,7 @@ public class ArticleAdapter extends BaseRecyclerAdapter { view = mLayoutInflater.inflate(R.layout.news_image1_item, parent, false); return new NewsImage1ViewHolder(view, mNewsList, mListListener); case ItemViewType.NEWS_IMAGE2: - view =mLayoutInflater.inflate(R.layout.news_image2_item, parent, false); + view = mLayoutInflater.inflate(R.layout.news_image2_item, parent, false); return new NewsImage2ViewHolder(view, mNewsList, mListListener); case ItemViewType.NEWS_IMAGE3: view = mLayoutInflater.inflate(R.layout.news_image3_item, parent, false); @@ -245,7 +245,7 @@ public class ArticleAdapter extends BaseRecyclerAdapter { if (newsEntity.getThumbnail() != null && newsEntity.getThumbnail().getUrl() != null) { ImageUtils.Companion.display(viewHolder.thumb, newsEntity.getThumbnail().getUrl().get(0)); } else { - ImageUtils.Companion.display(viewHolder.thumb, "res:///" + R.drawable.collection_default_icon); + ImageUtils.Companion.display(viewHolder.thumb, R.drawable.collection_default_icon); } viewHolder.title.setText(newsEntity.getTitle()); int views = newsEntity.getViews(); 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 ebc7c625b3..c78eb02fde 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java @@ -228,7 +228,7 @@ public class GameDownloadFragment extends BaseFragment implements View.OnClickLi if (adapter.getDoneList().isEmpty()) { if (position >= 0) { mDownloadmanagerHeadRl.setVisibility(View.VISIBLE); - mDownloadmanagerTaskTv.setText("下载中"); + mDownloadmanagerTaskTv.setText(R.string.downloading); mDownloadmanagerAllstartTv.setVisibility(View.VISIBLE); } else { mDownloadmanagerHeadRl.setVisibility(View.GONE); @@ -240,7 +240,7 @@ public class GameDownloadFragment extends BaseFragment implements View.OnClickLi mDownloadmanagerAllstartTv.setVisibility(View.GONE); } else if (position >= adapter.getDoneList().size() + 1) { mDownloadmanagerHeadRl.setVisibility(View.VISIBLE); - mDownloadmanagerTaskTv.setText("下载中"); + mDownloadmanagerTaskTv.setText(R.string.downloading); mDownloadmanagerAllstartTv.setVisibility(View.VISIBLE); } else { mDownloadmanagerHeadRl.setVisibility(View.GONE); 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 f523334838..6e2b60a1e0 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java @@ -4,7 +4,6 @@ import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.graphics.Bitmap; -import android.net.Uri; import android.support.v4.content.ContextCompat; import android.support.v4.util.ArrayMap; import android.support.v7.widget.RecyclerView; @@ -145,7 +144,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { // viewHolder.dmIcon.setImageURI(icon); ImageUtils.Companion.display(viewHolder.dmIcon, icon); } else { - viewHolder.dmIcon.setImageURI(Uri.parse("res:///" + R.drawable.logo)); + ImageUtils.Companion.display(viewHolder.dmIcon, R.drawable.logo); } if (downloadEntity.getName().contains("光环助手") @@ -290,7 +289,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { showPluginDialog(downloadEntity.getPath()); } else { if (FileUtils.isEmptyFile(path)) { - Utils.toast(mContext, "解析包出错（可能被误删了），请重新下载"); + Utils.toast(mContext, mContext.getString(R.string.install_failure_hint)); removeDownload(downloadEntity); } else { if (downloadEntity.getName().contains("光环助手")) { @@ -373,7 +372,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { viewHolder.dm_item_head_tv_task.setText("已完成"); viewHolder.dm_item_head_tv_allstart.setVisibility(View.GONE); } else { - viewHolder.dm_item_head_tv_task.setText("下载中"); + viewHolder.dm_item_head_tv_task.setText(R.string.downloading); viewHolder.dm_item_head_tv_allstart.setVisibility(View.VISIBLE); int dlNumber = 0; @@ -386,10 +385,10 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { } } if ((dlNumber + wtNumber) == downloadingList.size()) { - viewHolder.dm_item_head_tv_allstart.setText("全部暂停"); + viewHolder.dm_item_head_tv_allstart.setText(R.string.download_all_push); viewHolder.dm_item_head_tv_allstart.setTextColor(ContextCompat.getColor(mContext, R.color.btn_gray)); } else { - viewHolder.dm_item_head_tv_allstart.setText("全部开始"); + viewHolder.dm_item_head_tv_allstart.setText(R.string.download_all_start); viewHolder.dm_item_head_tv_allstart.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); } @@ -397,7 +396,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { @Override public void onClick(View v) { String str = ((TextView) v).getText().toString(); - if ("全部开始".equals(str)) { + if (mContext.getString(R.string.download_all_start).equals(str)) { if (NetworkUtils.isWifiConnected(mContext)) { startAll(viewHolder); } else { @@ -419,7 +418,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { // DownloadManager.getInstance(mContext).pause(downloadEntity); // } DownloadManager.getInstance(mContext).pauseAll(); - viewHolder.dm_item_head_tv_allstart.setText("全部开始"); + viewHolder.dm_item_head_tv_allstart.setText(R.string.download_all_start); viewHolder.dm_item_head_tv_allstart.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); } } @@ -442,7 +441,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { // DownloadManager.getInstance(mContext).startAll(); - viewHolder.dm_item_head_tv_allstart.setText("全部暂停"); + viewHolder.dm_item_head_tv_allstart.setText(R.string.download_all_push); viewHolder.dm_item_head_tv_allstart.setTextColor(ContextCompat.getColor(mContext, R.color.btn_gray)); } @@ -484,7 +483,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { } if (FileUtils.isEmptyFile(path)) { - Utils.toast(mContext, "解析包出错（可能被误删了），请重新下载"); + Utils.toast(mContext, mContext.getString(R.string.install_failure_hint)); } else { mContext.startActivity(PackageUtils.getUninstallIntent(mContext, path)); } 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 d1ec3ef3db..91ad8979cf 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java @@ -2,7 +2,6 @@ package com.gh.gamecenter.download; import android.app.Activity; import android.graphics.Color; -import android.net.Uri; import android.support.v4.content.ContextCompat; import android.support.v4.util.ArrayMap; import android.support.v7.widget.RecyclerView; @@ -316,7 +315,7 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { viewHolder.dm_item_head_tv_allstart.setText("更新完成"); } else { if (count == updateList.size()) { - viewHolder.dm_item_head_tv_allstart.setText("更新中"); + viewHolder.dm_item_head_tv_allstart.setText(R.string.updating); } else { viewHolder.dm_item_head_tv_allstart.setText("全部更新"); } @@ -328,7 +327,7 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { String str = viewHolder.dm_item_head_tv_allstart.getText().toString(); if ("全部更新".equals(str)) { if (NetworkUtils.isWifiConnected(mContext)) { - viewHolder.dm_item_head_tv_allstart.setText("更新中"); + viewHolder.dm_item_head_tv_allstart.setText(R.string.updating); for (int i = 0; i < updateList.size(); i++) { if (DownloadManager.getInstance(mContext).getDownloadEntityByUrl(updateList.get(i).getUrl()) == null) { addUpdateDownload(i); @@ -345,7 +344,7 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { DialogUtils.showDownloadDialog(mContext, new DialogUtils.ConfirmListener() { @Override public void onConfirm() { - viewHolder.dm_item_head_tv_allstart.setText("更新中"); + viewHolder.dm_item_head_tv_allstart.setText(R.string.updating); for (int i = 0; i < updateList.size(); i++) { if (DownloadManager.getInstance(mContext).getDownloadEntityByUrl(updateList.get(i).getUrl()) == null) { addUpdateDownload(i); @@ -371,7 +370,7 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { final GameUpdateEntity updateEntity = updateList.get(position - 1); if (updateEntity.getName().contains("光环助手")) { - viewHolder.guIcon.setImageURI(Uri.parse("res:///" + R.drawable.logo)); + ImageUtils.Companion.display(viewHolder.guIcon, R.drawable.logo); } else { ImageUtils.Companion.display(viewHolder.guIcon, updateEntity.getIcon()); } @@ -405,7 +404,7 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { viewHolder.guUpdate.setTextColor(ContextCompat.getColorStateList(mContext, R.color.text_plugining_style)); viewHolder.guUpdate.setBackgroundResource(R.drawable.game_item_btn_plugining_style); } else { - viewHolder.guUpdate.setText("更新中"); + viewHolder.guUpdate.setText(R.string.updating); viewHolder.guUpdate.setTextColor(ContextCompat.getColorStateList(mContext, R.color.text_downloading_style)); viewHolder.guUpdate.setBackgroundResource(R.drawable.game_item_btn_downloading_style); } @@ -422,7 +421,7 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { viewHolder.guUpdate.setTextColor(0xFF06D0A8); viewHolder.guUpdate.setBackgroundResource(R.drawable.game_item_btn_plugining_style); } else { - viewHolder.guUpdate.setText("更新中"); + viewHolder.guUpdate.setText(R.string.updating); viewHolder.guUpdate.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); viewHolder.guUpdate.setBackgroundResource(R.drawable.game_item_btn_downloading_style); } @@ -433,14 +432,14 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { } }); } - } else if ("启动".equals(str)) { + } else if (mContext.getString(R.string.launch).equals(str)) { Map kv = new HashMap<>(); kv.put("版本", updateEntity.getPlatform()); DataUtils.onEvent(mContext, "游戏启动", updateEntity.getName(), kv); PackageUtils.launchApplicationByPackageName(mContext, updateEntity.getPackageName()); - } else if ("更新中".equals(str) || "插件化中".equals(str)) { + } else if (mContext.getString(R.string.updating).equals(str) || "插件化中".equals(str)) { notifyItemChanged(0); EventBus.getDefault().post(new EBSkip(DownloadManagerActivity.TAG, DownloadManagerActivity.INDEX_UPDATE)); } @@ -450,11 +449,11 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { DownloadEntity downloadEntity = DownloadManager.getInstance(mContext).getDownloadEntityByUrl(updateEntity.getUrl()); if (downloadEntity == null) { if (PackageManager.isCanUpdate(updateEntity.getId(), updateEntity.getPackageName())) { - viewHolder.guUpdate.setText("更新"); + viewHolder.guUpdate.setText(R.string.update); viewHolder.guUpdate.setTextColor(Color.WHITE); viewHolder.guUpdate.setBackgroundResource(R.drawable.game_item_btn_download_style); } else if (updateEntity.isPluggable()) { - viewHolder.guUpdate.setText("插件化"); + viewHolder.guUpdate.setText(R.string.pluggable); viewHolder.guUpdate.setTextColor(Color.WHITE); downloadEntity = DownloadManager.getInstance(mContext).getDownloadEntityByPackageName( updateEntity.getPackageName()); @@ -467,7 +466,7 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { viewHolder.guUpdate.setBackgroundResource(R.drawable.game_item_btn_pause_up); } } else { - viewHolder.guUpdate.setText("启动"); + viewHolder.guUpdate.setText(R.string.launch); viewHolder.guUpdate.setTextColor(Color.WHITE); viewHolder.guUpdate.setBackgroundResource(R.drawable.game_item_btn_launch_style); } @@ -478,7 +477,7 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { ContextCompat.getColorStateList(mContext, R.color.text_plugining_style)); viewHolder.guUpdate.setBackgroundResource(R.drawable.game_item_btn_plugining_style); } else { - viewHolder.guUpdate.setText("更新中"); + viewHolder.guUpdate.setText(R.string.updating); viewHolder.guUpdate.setTextColor( ContextCompat.getColorStateList(mContext, R.color.text_downloading_style)); viewHolder.guUpdate.setBackgroundResource(R.drawable.game_item_btn_downloading_style); 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 187f65561b..da61b27d11 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.java @@ -2,7 +2,6 @@ package com.gh.gamecenter.game; import android.content.Intent; import android.graphics.Color; -import android.net.Uri; import android.support.v4.content.ContextCompat; import android.support.v4.util.ArrayMap; import android.support.v4.view.ViewPager; @@ -515,12 +514,6 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { if (position == 1) { return ItemViewType.GAME_PULGIN; } -// if (position == 2) { -// return ItemViewType.COLUMN_HEADER; -// } -// if (position > 2 && position <= 2 + mPluginList.size()) { -// return ItemViewType.GAME_NORMAL; -// } } int offset = 1; @@ -705,12 +698,12 @@ public class GameFragmentAdapter extends BaseRecyclerAdapter { } if (i == 3) { - subjectIcon.setImageURI(Uri.parse("res:///" + R.drawable.home_entrance_tool)); - subjectName.setText("工具箱"); + ImageUtils.Companion.display(subjectIcon, R.drawable.home_entrance_tool); + subjectName.setText(R.string.toolkit); } if (i == 4) { - subjectName.setText("开服表"); - subjectIcon.setImageURI(Uri.parse("res:///" + R.drawable.home_entrance_kaifu)); + subjectName.setText(R.string.title_kaifu); + ImageUtils.Companion.display(subjectIcon, R.drawable.home_entrance_kaifu); } final int finalI = i; diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java index 5b531abb79..9aeb6efaa3 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java @@ -367,7 +367,7 @@ public class FuLiAdapter extends BaseRecyclerAdapter { layout.setLayoutParams(new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, DisplayUtils.dip2px(mContext, 35))); layout.setGravity(Gravity.CENTER_HORIZONTAL); TextView textView = new TextView(mContext); - textView.setText("此游戏有问题？点击反馈"); + textView.setText(R.string.game_suggestion_hint); textView.setTextColor(ContextCompat.getColor(mContext, R.color.content)); textView.setPadding(0, DisplayUtils.dip2px(mContext, 8), 0, 0); layout.addView(textView); diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameLibaoGalleryAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameLibaoGalleryAdapter.java index 15c995bd10..7b1e86b859 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameLibaoGalleryAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameLibaoGalleryAdapter.java @@ -50,39 +50,43 @@ class GameLibaoGalleryAdapter extends BaseRecyclerAdapter { //领取状态 if (!TextUtils.isEmpty(libaoEntity.getStatus())) { if ("linged".equals(libaoEntity.getStatus())) { - viewHolder.libaoBtnStatus.setText("已领取"); + viewHolder.libaoBtnStatus.setText(R.string.libao_linged); viewHolder.libaoBtnStatus.setBackgroundResource(R.drawable.libao_linged_style); viewHolder.libaoBtnStatus.setTextColor(ContextCompat.getColorStateList(mContext, R.color.libao_linged_selector)); } else { - viewHolder.libaoBtnStatus.setText("已淘号"); + viewHolder.libaoBtnStatus.setText(R.string.libao_taoed); viewHolder.libaoBtnStatus.setBackgroundResource(R.drawable.libao_taoed_style); viewHolder.libaoBtnStatus.setTextColor(ContextCompat.getColorStateList(mContext, R.color.libao_taoed_selector)); } } else { viewHolder.libaoBtnStatus.setTextColor(Color.WHITE); - viewHolder.libaoBtnStatus.setText("已下架"); + viewHolder.libaoBtnStatus.setText(R.string.libao_unshelve); viewHolder.libaoBtnStatus.setBackgroundResource(R.drawable.textview_cancel_up); } 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 10a8ebee90..dc3e2dfeb1 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java @@ -27,6 +27,9 @@ import java.util.List; import butterknife.BindView; import butterknife.OnClick; +import static com.gh.gamecenter.LibaoActivity.LIBAO_CLOSEPAGE; +import static com.gh.gamecenter.LibaoActivity.LIBAO_OPENPAGE; + /** * Created by khy on 5/09/17. */ @@ -140,7 +143,7 @@ public class LibaoNewFragment extends BaseFragment implements SwipeRefreshLayout @Override public void onOpen(SwipeLayout layout) { swipeLayout.setSwipeEnabled(true); - EventBus.getDefault().post(new EBReuse("openPage")); + EventBus.getDefault().post(new EBReuse(LIBAO_OPENPAGE)); if (mFooterHint != null) { mFooterHint.setText("下拉回到最新礼包"); } @@ -153,7 +156,7 @@ public class LibaoNewFragment extends BaseFragment implements SwipeRefreshLayout @Override public void onClose(SwipeLayout layout) { - EventBus.getDefault().post(new EBReuse("closePage")); + EventBus.getDefault().post(new EBReuse(LIBAO_CLOSEPAGE)); swipeLayout.setSwipeEnabled(false); mAdapter.notifyItemChanged(mAdapter.getItemCount() - 1); } diff --git a/app/src/main/java/com/gh/gamecenter/manager/ConcernManager.java b/app/src/main/java/com/gh/gamecenter/manager/ConcernManager.java index c8e6e4439d..f987d98836 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/ConcernManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/ConcernManager.java @@ -5,6 +5,7 @@ import android.text.TextUtils; import com.gh.common.util.PackageUtils; import com.gh.common.util.TrafficUtils; +import com.gh.gamecenter.R; import com.gh.gamecenter.db.ConcernDao; import com.gh.gamecenter.db.info.ConcernInfo; import com.gh.gamecenter.entity.ApkEntity; @@ -140,7 +141,7 @@ public class ConcernManager { concernEntity.setPackageNames(packageNames); concernEntity.setInstalled(true); concernEntity.setConcern(false); - concernEntity.setTag("已安装"); + concernEntity.setTag(context.getString(R.string.installed)); concernEntity.setWeight(1); concernEntity.setInstalledQuantity(1); if (gameEntity.getGameName() != null) { @@ -213,7 +214,7 @@ public class ConcernManager { concernEntity.setTime(System.currentTimeMillis()); concernEntity.setConcern(false); concernEntity.setWeight(concernEntity.getWeight() - 1); - concernEntity.setTag("已安装"); + concernEntity.setTag(context.getString(R.string.installed)); updateByConcern(concernEntity); } else { dao.delete(id); diff --git a/app/src/main/java/com/gh/gamecenter/message/CommentFragment.java b/app/src/main/java/com/gh/gamecenter/message/CommentFragment.java index 5f260f0a74..2f0b384c9b 100644 --- a/app/src/main/java/com/gh/gamecenter/message/CommentFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/CommentFragment.java @@ -23,6 +23,8 @@ import org.greenrobot.eventbus.ThreadMode; import butterknife.BindView; import butterknife.OnClick; +import static com.gh.gamecenter.message.MessageFragment.EB_COMMENTMARKREAD; + /** * Created by khy on 2017/4/5. * 消息-评论 @@ -65,7 +67,7 @@ public class CommentFragment extends BaseFragment implements SwipeRefreshLayout. public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - mNoneDataTv.setText("暂无评论消息"); + mNoneDataTv.setText(R.string.message_comment_empty_hint); mRefresh.setColorSchemeResources(R.color.theme); mRefresh.setOnRefreshListener(this); @@ -91,7 +93,7 @@ public class CommentFragment extends BaseFragment implements SwipeRefreshLayout. @Override public boolean onTouch(View v, MotionEvent event) { if (event.getAction() == MotionEvent.ACTION_UP) { - EventBus.getDefault().post(new EBUISwitch("commentMarkRead", 0)); + EventBus.getDefault().post(new EBUISwitch(EB_COMMENTMARKREAD, 0)); } return false; } diff --git a/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java index 52f42b7f5e..4a8d8bea6f 100644 --- a/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java @@ -30,6 +30,8 @@ import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; +import static com.gh.gamecenter.message.MessageFragment.EB_COMMENTMARKREAD; + /** * Created by khy on 2017/4/10. * 消息-评论适配器 @@ -189,7 +191,7 @@ public class CommentFragmentAdapter extends BaseRecyclerAdapter { ImageUtils.Companion.display(viewHolder.userIcon, userEntity.getIcon()); } - viewHolder.requestControl.setText("回复了你的评论"); + viewHolder.requestControl.setText(R.string.message_comment_reply); viewHolder.commentContent.setText(commentEntity.getParentContent()); viewHolder.commentAnswer.setText(commentEntity.getContent()); CommentUtils.setCommentTime(viewHolder.commentTime, commentEntity.getTime()); @@ -200,7 +202,7 @@ public class CommentFragmentAdapter extends BaseRecyclerAdapter { Intent intent = new Intent(mContext, CommentDetailActivity.class); intent.putExtra(EntranceUtils.KEY_COMMENTID, commentEntity.getId()); mContext.startActivity(intent); - EventBus.getDefault().post(new EBUISwitch("commentMarkRead", 0)); + EventBus.getDefault().post(new EBUISwitch(EB_COMMENTMARKREAD, 0)); } }); @@ -208,8 +210,8 @@ public class CommentFragmentAdapter extends BaseRecyclerAdapter { private void initVoteViewHolder(CommentVoteViewHolder viewHolder, final MessageCommentEntity commentEntity) { viewHolder.commentContent.setText(commentEntity.getContent()); - viewHolder.likeCountTv.setText("收到" + commentEntity.getNum() + "个赞"); - viewHolder.userIcon.setImageURI("res:///" + R.drawable.message_vote_icon); + viewHolder.likeCountTv.setText(mContext.getString(R.string.message_comment_vote_count, commentEntity.getNum())); + ImageUtils.Companion.display(viewHolder.userIcon, R.drawable.message_vote_icon); CommentUtils.setCommentTime(viewHolder.commentTime, commentEntity.getTime()); viewHolder.itemView.setOnClickListener(new View.OnClickListener() { @@ -217,7 +219,7 @@ public class CommentFragmentAdapter extends BaseRecyclerAdapter { public void onClick(View v) { Intent intent = MessageDetailActivity.getIntentById(mContext, commentEntity.getArticleId(), null, null, "收藏-评论"); mContext.startActivity(intent); - EventBus.getDefault().post(new EBUISwitch("commentMarkRead", 0)); + EventBus.getDefault().post(new EBUISwitch(EB_COMMENTMARKREAD, 0)); } }); } diff --git a/app/src/main/java/com/gh/gamecenter/message/KeFuFragment.java b/app/src/main/java/com/gh/gamecenter/message/KeFuFragment.java index 6ad7d35f68..b5e028e52e 100644 --- a/app/src/main/java/com/gh/gamecenter/message/KeFuFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/KeFuFragment.java @@ -62,7 +62,7 @@ public class KeFuFragment extends BaseFragment implements SwipeRefreshLayout.OnR public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - mNoneDataTv.setText("暂无客服消息"); + mNoneDataTv.setText(R.string.message_kefu_empty_hint); mRefresh.setColorSchemeResources(R.color.theme); mRefresh.setOnRefreshListener(this); diff --git a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java index 56fc345a01..84145d9472 100644 --- a/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/message/KeFuFragmentAdapter.java @@ -40,6 +40,8 @@ import retrofit2.HttpException; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; +import static com.gh.gamecenter.message.MessageFragment.EB_KEFUMARKREADCOUNT; + /** * Created by khy on 2017/4/10. * 消息-客服适配器 @@ -325,7 +327,7 @@ public class KeFuFragmentAdapter extends BaseRecyclerAdapter { postMarkRead(body); } - EventBus.getDefault().post(new EBUISwitch("kefuMarkReadCount", mCurMarkCount)); + EventBus.getDefault().post(new EBUISwitch(EB_KEFUMARKREADCOUNT, mCurMarkCount)); } private void postMarkRead(final RequestBody body) { diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java b/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java index 507b908fc0..59fad5a86d 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageFragment.java @@ -38,25 +38,24 @@ import rx.schedulers.Schedulers; */ public class MessageFragment extends BaseFragment_ViewPager_Checkable { - public static final String MESSAGE_READ_OVER = "messageReadOver"; - public static final String EB_MESSAGEFRAGMENT_TAG = "MessageFragment"; - @BindView(R.id.message_comment_hint) TextView mMessageCommentHint; - @BindView(R.id.message_kefu_hint) View mMessageKefuHint; - @BindView(R.id.message_slide_line) View mMessageSlideLine; - @BindView(R.id.message_comment_tv) CheckedTextView mMessageCommentTv; - @BindView(R.id.message_kefu_tv) CheckedTextView mMessageKefuTv; private LinearLayout.LayoutParams mLayoutParams; + + public static final String MESSAGE_READ_OVER = "messageReadOver"; + public static final String EB_MESSAGEFRAGMENT_TAG = "MessageFragment"; + public static final String EB_KEFUMARKREADCOUNT = "kefuMarkReadCount"; + public static final String EB_COMMENTMARKREAD = "commentMarkRead"; + private int mWidth; private int mKeFuUnreadCount; @@ -151,12 +150,12 @@ public class MessageFragment extends BaseFragment_ViewPager_Checkable { // 隐藏未读提示 @Subscribe(threadMode = ThreadMode.MAIN) public void onEventMainThread(EBUISwitch reuse) { - if ("kefuMarkReadCount".equals(reuse.getFrom()) && reuse.getPosition() == mKeFuUnreadCount) { + if (EB_KEFUMARKREADCOUNT.equals(reuse.getFrom()) && reuse.getPosition() == mKeFuUnreadCount) { mMessageKefuHint.setVisibility(View.GONE); if (mMessageKefuHint.getVisibility() == View.GONE && mMessageCommentHint.getVisibility() == View.GONE) { EventBus.getDefault().post(new EBReuse(MESSAGE_READ_OVER)); } - } else if ("commentMarkRead".equals(reuse.getFrom()) && mMessageCommentHint.getVisibility() == View.VISIBLE) { + } else if (EB_COMMENTMARKREAD.equals(reuse.getFrom()) && mMessageCommentHint.getVisibility() == View.VISIBLE) { mMessageCommentHint.setVisibility(View.GONE); postMarkCommentRead(getContext()); if (mMessageKefuHint.getVisibility() == View.GONE && mMessageCommentHint.getVisibility() == View.GONE) { 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 d2783cdde1..94eb7450ba 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News2FragmentAdapter.java @@ -383,7 +383,7 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { if (libaoStatusEntity.getId().equals(concernEntity.getId())) { if ("finish".equals(libaoStatusEntity.getStatus())) { - viewHolder.read.setText("已结束"); + viewHolder.read.setText(R.string.libao_finish); } else { viewHolder.read.setText("点击查看"); } @@ -394,10 +394,10 @@ public class News2FragmentAdapter extends BaseRecyclerAdapter { libaoStatusEntity.setBeforeStatus(libaoStatusEntity.getStatus()); if ("ling".equals(userDataLibaoEntity.getType())) { // 拿最后一次领取的状态判断 libaoStatusEntity.setStatus("linged"); - viewHolder.read.setText("已领取"); + viewHolder.read.setText(R.string.libao_linged); } else { libaoStatusEntity.setStatus("taoed"); - viewHolder.read.setText("已淘号"); + viewHolder.read.setText(R.string.libao_taoed); } libaoStatusEntity.setCode(userDataLibaoEntity.getCode()); } diff --git a/app/src/main/java/com/gh/gamecenter/news/News3FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/news/News3FragmentAdapter.java index 4bf833e11d..bcca74cc13 100644 --- a/app/src/main/java/com/gh/gamecenter/news/News3FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/news/News3FragmentAdapter.java @@ -71,11 +71,11 @@ public class News3FragmentAdapter extends BaseRecyclerAdapter { if (!TextUtils.isEmpty(newsEntity.getType())) { if (position == 0 && newsEntity.getPriority() != 0) { - viewHolder.type.setText("置顶"); - newsEntity.setType("置顶"); + viewHolder.type.setText(R.string.article_top); + newsEntity.setType(mContext.getString(R.string.article_top)); } else if (newsEntity.getPriority() != 0) { - viewHolder.type.setText("热门"); - newsEntity.setType("热门"); + viewHolder.type.setText(R.string.article_hot); + newsEntity.setType(mContext.getString(R.string.article_hot)); } else { viewHolder.type.setText(newsEntity.getType()); } 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 238b74eaa4..7af983e38c 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -361,7 +361,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { @Override public void onError() { - Utils.toast(mContext, "关注失败"); + Utils.toast(mContext, mContext.getString(R.string.concern_failure)); viewHolder.gamedetailConcern.setEnabled(true); } }); @@ -397,7 +397,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { @Override public void onError() { - Utils.toast(mContext, "取消关注失败"); + Utils.toast(mContext, mContext.getString(R.string.cancel_concern_failure)); viewHolder.gamedetailConcern.setEnabled(true); } }); @@ -464,9 +464,9 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { holder.list.removeAllViews(); if (mIsHotComment) { - holder.title.setText("热门评论"); + holder.title.setText(R.string.comment_hot); } else { - holder.title.setText("最新评论"); + holder.title.setText(R.string.comment_new); } for (final CommentEntity commentEntity : mCommentEntityList) { diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java index 8503528605..3178446dae 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragment.java @@ -83,7 +83,7 @@ public class SearchGameDetailFragment extends BaseFragment implements OnRequestC params.setMargins(0, DisplayUtils.dip2px(getContext(), 20), 0, 0); skip_tv.setLayoutParams(params); skip_tv.setGravity(Gravity.CENTER); - skip_tv.setText("告诉小编"); + skip_tv.setText(R.string.search_empty_skip_hint); skip_tv.setTextColor(Color.WHITE); skip_tv.setBackgroundResource(R.drawable.textview_blue_style); reuse_none_data.addView(skip_tv); @@ -97,7 +97,7 @@ public class SearchGameDetailFragment extends BaseFragment implements OnRequestC TextView reuse_tv_none_data = (TextView) view.findViewById(R.id.reuse_tv_none_data); - reuse_tv_none_data.setText("搜索结果为空"); + reuse_tv_none_data.setText(R.string.search_empty_hint); search_detail.setHasFixedSize(true); search_detail.addItemDecoration(new VerticalItemDecoration(getContext(), 8, true)); diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java index 70e9a9d397..59389464fd 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameDetailFragmentAdapter.java @@ -148,6 +148,7 @@ class SearchGameDetailFragmentAdapter extends BaseRecyclerAdapter { if (TextUtils.isEmpty(serverType)) { viewHolder.gameServerType.setVisibility(View.GONE); } else { + // TODO 这个重复出现多次--抽离 viewHolder.gameServerType.setVisibility(View.VISIBLE); viewHolder.gameServerType.setText(serverType); if ("删档内测".equals(serverType) || "不删档内测".equals(serverType)) { diff --git a/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java b/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java index eeec2f5333..03dda7ac4f 100644 --- a/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/suggest/SuggestPicAdapter.java @@ -6,6 +6,7 @@ import android.view.View; import android.view.ViewGroup; import com.gh.base.OnListClickListener; +import com.gh.common.util.ImageUtils; import com.gh.gamecenter.R; import com.gh.gamecenter.SuggestionActivity; import com.lightgame.adapter.BaseRecyclerAdapter; @@ -40,7 +41,7 @@ public class SuggestPicAdapter extends BaseRecyclerAdapter { SuggestPicViewHolder viewHolder = (SuggestPicViewHolder) holder; if (position == getItemCount() - 1 && picList.size() < 5) { viewHolder.delate.setVisibility(View.GONE); - viewHolder.icon.setImageURI("res:///" + R.drawable.suggest_add_pic_icon); + ImageUtils.Companion.display(viewHolder.icon, R.drawable.suggest_add_pic_icon); } else { viewHolder.icon.setImageURI("file:///" + picList.get(position)); viewHolder.delate.setVisibility(View.VISIBLE); diff --git a/app/src/main/res/layout/activity_kc_select_game.xml b/app/src/main/res/layout/activity_kc_select_game.xml index 90589b60d7..b5f9d0d870 100644 --- a/app/src/main/res/layout/activity_kc_select_game.xml +++ b/app/src/main/res/layout/activity_kc_select_game.xml @@ -29,7 +29,7 @@ android:layout_height = "match_parent" android:layout_marginLeft = "20dp" android:gravity = "center" - android:text = "@string/kc_intalled" + android:text = "@string/kc_installed" android:textColor = "@color/title" /> 介绍 请输入搜索关键字 搜索 - 已安装的游戏 + 已安装的游戏 发送 历史礼包 最新 @@ -305,6 +305,8 @@ 取消关注 关注 关注成功 + 关注失败 + 取消关注失败 下载 下载中 @@ -312,6 +314,7 @@ 安装 启动 更新 + 更新中 已淘号：%1$s]]> 已领取：%1$s]]> @@ -336,8 +339,43 @@ 礼包详情 加载失败，请检查网络状态 - 5618b86e8ab49e17088b4575 + 5618b86e8ab49e17088b4575 - 版本：V%1$s | %2$s + 版本：V%1$s | %2$s + + 请输入关键字 + 此礼包有问题？点击反馈 + 需要什么工具，点击这里反馈 + 此游戏有问题？点击反馈 + 热门评论 + 最新评论 + 全部暂停 + 全部开始 + 解析包出错（可能被误删了），请重新下载 + + 未开抢 + 领取 + 淘号 + 已领光 + 已结束 + 已领取 + 已淘号 + 已下架 + 再领一个 + 再淘一个 + + 已安装 + 未安装 + 回复了你的评论 + 暂无评论消息 + 暂无客服消息 + 工具箱 + 告诉小编 + 搜索结果为空 + 置顶 + 热门 + + 已安装的游戏（%1$d） + 收到%1$d个赞