diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index e498986927..7c10fccc49 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -891,22 +891,10 @@ public class MainActivity extends BaseActivity { } } - // TODO: 30/10/17 整理这个方法 @Subscribe(threadMode = ThreadMode.MAIN) public void onEventMainThread(EBPackage busFour) { final String packageName = busFour.getPackageName(); - if ("安装".equals(busFour.getType())) { // 删除下载完成 弹窗 - NotificationManager nManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); - nManager.cancel(packageName.hashCode()); - } - if ("安装".equals(busFour.getType())) { - // 添加进已安装map中 - PackageManager.addInstalled(packageName); - } else if ("卸载".equals(busFour.getType())) { - // 删除map中数据 - PackageManager.removeInstalled(packageName); - } DownloadEntity mDownloadEntity = null; for (DownloadEntity downloadEntity : DownloadManager.getInstance(getApplicationContext()).getAll()) { if (packageName.equals(downloadEntity.getPackageName())) { @@ -914,88 +902,99 @@ public class MainActivity extends BaseActivity { break; } } - if (mDownloadEntity != null) { - if ("安装".equals(busFour.getType())) { + + if ("安装".equals(busFour.getType())) { + // 删除下载完成 弹窗 + NotificationManager nManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); + nManager.cancel(packageName.hashCode()); + + // 添加进已安装map中 + PackageManager.addInstalled(packageName); + + if (mDownloadEntity != null) { if (mDownloadEntity.isPluggable()) { Map kv6 = new HashMap<>(); kv6.put("安装或卸载", "安装完成"); DataUtils.onEvent(this, "插件化", mDownloadEntity.getName(), kv6); } - -// if (!mDownloadEntity.isPlugin() // 不是插件游戏，自己删除数据库数据和安装包 -// || PackageUtils.isSignature(this, packageName)) {// 是插件游戏，判断签名是否相同，是才删除数据库数据和安装包 DownloadManager.getInstance(getApplicationContext()).cancel( mDownloadEntity.getUrl(), sp.getBoolean("autodelete", true)); -// } - } else if ("卸载".equals(busFour.getType())) { + } + + if (sp.getBoolean("concerngame", true)) { //设置页面控制是否安装后自动关注 + GameManager gameManager = new GameManager(getApplicationContext()); + GameInfo gameInfo = gameManager.findGame(packageName); + if (gameInfo != null) { + mInstallManager.updateByEntity(gameInfo); + } + + // 安装后关注游戏 + RetrofitManager.getInstance(this).getApi().getGameDigestByPackageName(packageName) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Response>() { + @Override + public void onResponse(List response) { + for (GameDigestEntity gameDigestEntity : response) { + GameInfo gameInfo = new GameInfo(); + gameInfo.setId(gameDigestEntity.getId()); + gameInfo.setPackageName(packageName); + gameInfo.setGameName(gameDigestEntity.getName()); + concernGame(gameDigestEntity.getId(), packageName); + + if (PackageUtils.getMetaData(getApplicationContext(), + packageName, "gh_version") != null) { + checkGameUpdate(packageName); + } + + if (!TextUtils.isEmpty(gameDigestEntity.getId())) { // 关注游戏 + ConcernUtils.INSTANCE.postConcernGameId(MainActivity.this, gameDigestEntity.getId(), null); + } + } + // 更新已安装游戏 + JSONArray params = new JSONArray(); + params.put(packageName); + RequestBody body = RequestBody.create( + MediaType.parse("application/json"), params.toString()); + RetrofitManager.getInstance(MainActivity.this).getApi() + .postPackage(body) + .subscribeOn(Schedulers.io()) + .observeOn(Schedulers.io()) + .subscribe(new Response()); + } + }); + } + + } + if ("卸载".equals(busFour.getType())) { + // 删除map中数据 + PackageManager.removeInstalled(packageName); + + if (mDownloadEntity != null) { Map kv6 = new HashMap<>(); kv6.put("安装或卸载", "卸载完成"); DataUtils.onEvent(this, "插件化", mDownloadEntity.getName(), kv6); startActivity(PackageUtils.getInstallIntent(this, mDownloadEntity.getPath())); } - } - if ("安装".equals(busFour.getType()) && sp.getBoolean("concerngame", true)) { - GameManager gameManager = new GameManager(getApplicationContext()); - GameInfo gameInfo = gameManager.findGame(packageName); - if (gameInfo != null) { - mInstallManager.updateByEntity(gameInfo); - } - } else if ("卸载".equals(busFour.getType())) { + FilterManager filterManager = new FilterManager(getApplicationContext()); if (filterManager.isFilter(packageName)) { mInstallManager.updateByPackageName(packageName); } - } - if ("卸载".equals(busFour.getType()) || "安装".equals(busFour.getType())) { - PackageManager.removeUpdate(packageName); - } - if ("安装".equals(busFour.getType()) && sp.getBoolean("concerngame", true)) {//设置页面控制是否安装后自动关注 - // 安装后关注游戏 - RetrofitManager.getInstance(this).getApi().getGameDigestByPackageName(packageName) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Response>() { - @Override - public void onResponse(List response) { - for (GameDigestEntity gameDigestEntity : response) { - GameInfo gameInfo = new GameInfo(); - gameInfo.setId(gameDigestEntity.getId()); - gameInfo.setPackageName(packageName); - gameInfo.setGameName(gameDigestEntity.getName()); - concernGame(gameDigestEntity.getId(), packageName); - if (PackageUtils.getMetaData(getApplicationContext(), - packageName, "gh_version") != null) { - checkGameUpdate(packageName); - } - if (!TextUtils.isEmpty(gameDigestEntity.getId())) { // 关注游戏 - ConcernUtils.INSTANCE.postConcernGameId(MainActivity.this, gameDigestEntity.getId(), null); - } - } - // 更新已安装游戏 - JSONArray params = new JSONArray(); - params.put(packageName); - RequestBody body = RequestBody.create( - MediaType.parse("application/json"), params.toString()); - RetrofitManager.getInstance(MainActivity.this).getApi() - .postPackage(body) - .subscribeOn(Schedulers.io()) - .observeOn(Schedulers.io()) - .subscribe(new Response()); - } - }); - } - - if ("卸载".equals(busFour.getType())) { // 更新已安装游戏 RetrofitManager.getInstance(this).getApi() .deletePackage(packageName) .subscribeOn(Schedulers.io()) .observeOn(Schedulers.io()) .subscribe(new Response()); + } + if ("卸载".equals(busFour.getType()) || "安装".equals(busFour.getType())) { + PackageManager.removeUpdate(packageName); + } DataCollectionUtils.uploadInorunstall(this, busFour.getType(), busFour.getPackageName()); } diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index c919d430f2..9c52eb365f 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -340,7 +340,7 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, adapter.getNewsDetailEntity().getId() + ".html"; if (gameEntity == null) { showShare(url, adapter.getNewsDetailEntity().getTitle(), - "http://image.ghzs666.com/pic/57d604808ab49e467d8b4568.png", + getString(R.string.gh_icon_url), adapter.getNewsDetailEntity().getTitle(), null, false); } else { showShare(url, gameEntity.getName(), gameEntity.getIcon(), @@ -584,13 +584,13 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, newsDetailEntity.getUserData().setArticleFavorite(false); mNewsCollection.setEnabled(true); mNewsCollection.setImageResource(R.drawable.detail_collection_unselect); - toast("取消收藏"); + toast(getString(R.string.collection_cancel)); } @Override public void onError() { mNewsCollection.setEnabled(true); - toast("取消收藏失败"); + toast(getString(R.string.collection_cancel_failure)); } }); @@ -610,13 +610,13 @@ public class NewsDetailActivity extends BaseActivity implements OnClickListener, userData.setArticleFavorite(true); mNewsCollection.setEnabled(true); mNewsCollection.setImageResource(R.drawable.detail_collection_select); - toast("收藏成功"); + toast(getString(R.string.collection_success)); } @Override public void onError() { mNewsCollection.setEnabled(true); - toast("收藏失败"); + toast(getString(R.string.collection_failure)); } }); } diff --git a/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java b/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java index 894819b775..fafe319867 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java @@ -66,9 +66,9 @@ public class ShareGhActivity extends BaseActivity { ButterKnife.bind(this); 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); + QRCodeUtils.setQRCode(this, getString(R.string.gh_website_url_100), mGhQrcode); + ShareUtils.getInstance(this).showShareWindows(mShareRl, getString(R.string.gh_website_url_300), getString(R.string.app_name) + , getString(R.string.gh_icon_url), null, false, false, false); } @OnClick(R.id.wifi_share_btn) @@ -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.ghzs.com/link?source=appshare100"); + cmb.setText(getString(R.string.gh_website_url_100)); Utils.toast(this, "网址复制成功，请到微信/QQ粘贴分享"); } diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index 16b8447c7d..236cc121b1 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -170,7 +170,7 @@ public class SuggestionActivity extends BaseActivity implements SuggestTypeAdapt File file = new File(picturePath); if (file.length() > 8 * 1024 * 1024) { - toast("图片大小不能超过8M"); + toast(getString(R.string.suggestion_pic_hint)); } else { mAdapter.addFileList(picturePath); } diff --git a/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.java b/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.java index 975000a4e0..b4c3a81fcc 100644 --- a/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.java +++ b/app/src/main/java/com/gh/gamecenter/UserInfoEditActivity.java @@ -108,10 +108,10 @@ public class UserInfoEditActivity extends BaseActivity implements LoginUtils.onC switch (mEditType) { case "gender": mUserinfoEditSex.setVisibility(View.VISIBLE); - title = "选择性别"; + title = getString(R.string.gender_select); String gender = mUserInfoEntity.getGender(); if (!TextUtils.isEmpty(gender)) { - if ("男".equals(gender)) { + if (getString(R.string.man).equals(gender)) { mUserinfoSexmanSelect.setVisibility(View.VISIBLE); mUserinfoSexWomanSelect.setVisibility(View.GONE); } else { @@ -124,7 +124,7 @@ public class UserInfoEditActivity extends BaseActivity implements LoginUtils.onC mUserinfoEditNickname.setVisibility(View.VISIBLE); mSaveTv.setVisibility(View.VISIBLE); mUserinfoNicknameEt.addTextChangedListener(new UserInfoEditTextWatcher(mUserinfoNicknameEt)); - title = "修改昵称"; + title = getString(R.string.nickname_change); String name = mUserInfoEntity.getName(); if (!TextUtils.isEmpty(name)) { mUserinfoNicknameEt.setText(name); @@ -134,7 +134,7 @@ public class UserInfoEditActivity extends BaseActivity implements LoginUtils.onC mUserinfoEditContact.setVisibility(View.VISIBLE); mSaveTv.setVisibility(View.VISIBLE); mUserinfoContactEt.addTextChangedListener(new UserInfoEditTextWatcher(mUserinfoContactEt)); - title = "联系方式"; + title = getString(R.string.contact); String contact = mUserInfoEntity.getContact(); if (!TextUtils.isEmpty(contact)) { mUserinfoContactEt.setText(contact); @@ -157,7 +157,7 @@ public class UserInfoEditActivity extends BaseActivity implements LoginUtils.onC LoginUtils.changeUserInfo(this, this, value, mEditType); } } else { - toast("昵称不能为空"); + toast(getString(R.string.nickname_empty_hint)); } } else if ("contact".equals(mEditType)) { String value = mUserinfoContactEt.getText().toString(); @@ -175,10 +175,10 @@ public class UserInfoEditActivity extends BaseActivity implements LoginUtils.onC mUserinfoContactEt.setText(""); break; case R.id.userinfo_sex_man: - LoginUtils.changeUserInfo(this, this, "男", mEditType); + LoginUtils.changeUserInfo(this, this, getString(R.string.man), mEditType); break; case R.id.userinfo_sex_woman: - LoginUtils.changeUserInfo(this, this, "女", mEditType); + LoginUtils.changeUserInfo(this, this, getString(R.string.woman), mEditType); break; } } diff --git a/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java b/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java index d7a542e127..bc4a0b2fa4 100644 --- a/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ViewImageActivity.java @@ -353,7 +353,7 @@ public class ViewImageActivity extends Activity implements OnPageChangeListener final TextView reportTv = new TextView(ViewImageActivity.this); reportTv.setPadding(DisplayUtils.dip2px(ViewImageActivity.this, 20), DisplayUtils.dip2px(ViewImageActivity.this, 12), 0, DisplayUtils.dip2px(ViewImageActivity.this, 12)); - reportTv.setText("保存图片"); + reportTv.setText(R.string.save_pic); reportTv.setTextSize(17); reportTv.setTextColor(ContextCompat.getColor(getApplicationContext(), R.color.title)); reportTv.setBackgroundResource(R.drawable.textview_white_style); diff --git a/app/src/main/java/com/gh/gamecenter/VoteActivity.java b/app/src/main/java/com/gh/gamecenter/VoteActivity.java index 64632215c7..2bca97f25b 100644 --- a/app/src/main/java/com/gh/gamecenter/VoteActivity.java +++ b/app/src/main/java/com/gh/gamecenter/VoteActivity.java @@ -170,7 +170,7 @@ public class VoteActivity extends BaseActivity implements SwipeRefreshLayout.OnR View view = View.inflate(VoteActivity.this, R.layout.dialog_modify_nickname, null); TextView title = (TextView) view.findViewById(R.id.dialog_nickname_title); - title.setText("输入选项名字"); + title.setText(R.string.vote_input_hint); final EditText input = (EditText) view.findViewById(R.id.dialog_nickname_input); input.setHint(""); @@ -182,7 +182,7 @@ public class VoteActivity extends BaseActivity implements SwipeRefreshLayout.OnR if (actionId == EditorInfo.IME_ACTION_DONE) { String nickname = input.getText().toString().trim(); if (TextUtils.isEmpty(nickname)) { - Utils.toast(VoteActivity.this, "请输入名字"); + Utils.toast(VoteActivity.this, getString(R.string.vote_empty_hint)); return true; } postVersionVote(nickname, true); @@ -209,7 +209,7 @@ public class VoteActivity extends BaseActivity implements SwipeRefreshLayout.OnR public void onClick(View v) { String nickname = input.getText().toString().trim(); if (TextUtils.isEmpty(nickname)) { - Utils.toast(VoteActivity.this, "请输入名字"); + Utils.toast(VoteActivity.this, getString(R.string.vote_empty_hint)); return; } postVersionVote(nickname, true); @@ -245,14 +245,14 @@ public class VoteActivity extends BaseActivity implements SwipeRefreshLayout.OnR if (name.equals(voteEntity.getName())) { UserDataEntity userDataEntity = voteEntity.getUserData(); if (userDataEntity != null && userDataEntity.isVersionRequested()) { - Utils.toast(this, "投票成功"); + Utils.toast(this, getString(R.string.vote_success)); return; } } } } - final Dialog waitDialog = DialogUtils.showWaitDialog(VoteActivity.this, "提交中..."); + final Dialog waitDialog = DialogUtils.showWaitDialog(VoteActivity.this, getString(R.string.vote_post)); JSONObject object = new JSONObject(); try { @@ -281,7 +281,7 @@ public class VoteActivity extends BaseActivity implements SwipeRefreshLayout.OnR String id = responseObject.getString("_id"); if (cast) { - Utils.toast(VoteActivity.this, "投票成功"); + Utils.toast(VoteActivity.this, getString(R.string.vote_success)); } else { if (isNewVote) { Utils.toast(VoteActivity.this, "已经存在相同的选项"); diff --git a/app/src/main/java/com/gh/gamecenter/WebActivity.java b/app/src/main/java/com/gh/gamecenter/WebActivity.java index 8d57b4b1ab..77543917de 100644 --- a/app/src/main/java/com/gh/gamecenter/WebActivity.java +++ b/app/src/main/java/com/gh/gamecenter/WebActivity.java @@ -84,8 +84,8 @@ public class WebActivity extends BaseActivity implements View.OnClickListener{ @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/v2d6/disclaimer"); + intent.putExtra(EntranceUtils.KEY_GAMENAME, context.getString(R.string.disclaimer_title)); + intent.putExtra(EntranceUtils.KEY_URL, context.getString(R.string.disclaimer_url)); return intent; } @@ -352,13 +352,13 @@ public class WebActivity extends BaseActivity implements View.OnClickListener{ mToolBoxEntity.getUserData().setToolkitFavorite(false); mCollectionIv.setEnabled(true); mCollectionIv.setImageResource(R.drawable.detail_collection_unselect); - toast("取消收藏"); + toast(getString(R.string.collection_cancel)); } @Override public void onError() { mCollectionIv.setEnabled(true); - toast("取消收藏失败"); + toast(getString(R.string.collection_cancel_failure)); } }); @@ -378,13 +378,13 @@ public class WebActivity extends BaseActivity implements View.OnClickListener{ userData.setToolkitFavorite(true); mCollectionIv.setEnabled(true); mCollectionIv.setImageResource(R.drawable.detail_collection_select); - toast("收藏成功"); + toast(getString(R.string.collection_success)); } @Override public void onError() { mCollectionIv.setEnabled(true); - toast("收藏失败"); + toast(getString(R.string.collection_failure)); } }); } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java index da54f6052c..e5dcf4b286 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/ConcernAdapter.java @@ -135,7 +135,7 @@ public class ConcernAdapter extends BaseRecyclerAdapter { @Override public void onError() { - Utils.toast(mContext, "取消失败，请稍后再试"); + Utils.toast(mContext, mContext.getString(R.string.concern_cancel_failure)); holder.concern_item_concern.setClickable(true); holder.itemView.setClickable(true); } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/FileReceiverAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/FileReceiverAdapter.java index bf6d19fd69..d743ec9e89 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/FileReceiverAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/FileReceiverAdapter.java @@ -70,11 +70,11 @@ public class FileReceiverAdapter extends BaseRecyclerAdapter { isLoading = true; Observable> observable; - if ("全部".equals(mNewsType)) { + if (mContext.getString(R.string.news_all).equals(mNewsType)) { observable = RetrofitManager.getInstance(mContext).getApi().getGameNews(mGameId, 20, offset); } else { observable = RetrofitManager.getInstance(mContext).getApi().getGameNews(mGameId, 20, offset, mNewsType); 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 05fcf46213..1bb9f49925 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/KcSelectGameAdapter.java @@ -185,7 +185,7 @@ public class KcSelectGameAdapter extends BaseRecyclerAdapter { textView.setPadding(DisplayUtils.dip2px(mContext, 20), 0, 0, 0); textView.setTextColor(ContextCompat.getColor(mContext, R.color.title)); textView.setBackgroundColor(Color.WHITE); - textView.setText("已安装的应用（" + mApkList.size() + "）"); + textView.setText(mContext.getString(R.string.kc_installed_app_count, mApkList.size())); return new ReuseViewHolder(textView); default: return null; @@ -210,7 +210,7 @@ public class KcSelectGameAdapter extends BaseRecyclerAdapter { if (position > 0) { viewHolder.loading.setVisibility(View.GONE); viewHolder.hint.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); - viewHolder.hint.setText("查看更多"); + viewHolder.hint.setText(R.string.kc_install_more); holder.itemView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -366,9 +366,9 @@ public class KcSelectGameAdapter extends BaseRecyclerAdapter { } if (count == 0) { - mSelectCount.setText("发送"); + mSelectCount.setText(R.string.kc_send); } else { - mSelectCount.setText("发送（" + count + "）"); + mSelectCount.setText(mContext.getString(R.string.kc_installed_count, count)); } } 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 cace1c02d7..31fc582e6a 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java @@ -243,17 +243,15 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter { holder.mLibaodetailContentLl.setVisibility(View.VISIBLE); holder.mLibaodetailContent.setText(mLibaoEntity.getContent()); } - if (mLibaoDetailEntity != null ) { + if (mLibaoDetailEntity != null) { holder.mLibaodetailTimeLl.setVisibility(View.VISIBLE); if (mLibaoDetailEntity.getInstallRequired()) { Spanned content; if (TextUtils.isEmpty(mLibaoEntity.getPlatform())) { - content = Html.fromHtml(StringUtils.buildString("领取条件：", "安装《", - mLibaoEntity.getGame().getName(), "》")); + content = Html.fromHtml(mContext.getString(R.string.libao_install_hint, mLibaoEntity.getGame().getName())); } else { - content = Html.fromHtml(StringUtils.buildString("领取条件：", "安装《", - mLibaoEntity.getGame().getName(), "》", - PlatformUtils.getInstance(mContext).getPlatformName(mLibaoEntity.getPlatform()), "版")); + content = Html.fromHtml(mContext.getString(R.string.libao_install_hint_platform, mLibaoEntity.getGame().getName(), + PlatformUtils.getInstance(mContext).getPlatformName(mLibaoEntity.getPlatform()))); } holder.mLibaodetailCondition.setVisibility(View.VISIBLE); holder.mLibaodetailCondition.setText(content); 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 971a536617..268f6e5cfb 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java @@ -451,10 +451,10 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { viewHolder.loading.setVisibility(View.GONE); viewHolder.itemView.setLayoutParams(params); viewHolder.itemView.setPadding(0, DisplayUtils.dip2px(mContext, 30), 0, 0); - viewHolder.hint.setText("目前还没有评论"); + viewHolder.hint.setText(R.string.comment_empty); } else { if (mNormalCommentList.size() > 10) { - viewHolder.hint.setText("没有更多评论啦"); + viewHolder.hint.setText(R.string.comment_nomore); } else { viewHolder.hint.setText(""); } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5766114056..a8a4e4b8de 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -324,6 +324,8 @@ 请先安装《%1$s》 %2$s]]> 礼包码：%1$s
淘号礼包不保证可用，请尽快进入游戏尝试兑换]]> 礼包码：%1$s
请尽快使用，礼包码将于60分钟后进入淘号池]]> + 安装《%1$s》]]> + 安装《%1$s》%2$s版]]> 取消关注游戏后，您将无法及时收到游戏攻略、资讯等最新动态提醒。]]> 好友还没安装光环助手？请点这里]]> @@ -376,7 +378,37 @@ 热门 已安装的游戏（%1$d） + 已安装的应用（%1$d） 收到%1$d个赞 已是最新版本 + 取消失败，请稍后再试 + 取消 + 等待中 + 传输失败 + 已取消 + 查看更多 + 发送（%1$d） + 使用条款与免责声明 + http://api.ghzs666.com/v2d6/disclaimer + 取消收藏 + 取消收藏失败 + 收藏成功 + 收藏失败 + 提交中... + 投票成功 + 输入选项名字 + 请输入名字 + 保存图片 + 选择性别 + 修改昵称 + 联系方式 + 昵称不能为空 + 男 + 女 + 图片大小不能超过8M + http://www.ghzs.com/link?source=appshare100 + http://www.ghzs.com/link?source=appshare300 + http://image.ghzs666.com/pic/57d604808ab49e467d8b4568.png +