From 5d0ccb9a347a709b3493ffcc4a0599a8a73e52b6 Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Wed, 21 Mar 2018 11:58:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV3.2=20CTA?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96=E6=96=B9?= =?UTF-8?q?=E6=A1=88(=E5=AE=8C=E6=88=90)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/common/util/DownloadItemUtils.java | 6 ++++-- .../java/com/gh/common/util/GameUtils.java | 4 +++- .../java/com/gh/common/util/LibaoUtils.java | 5 ++++- .../java/com/gh/gamecenter/SearchActivity.java | 1 - .../download/GameDownloadFragmentAdapter.java | 15 ++++++++++----- .../download/GameUpdateFragmentAdapter.java | 4 ++-- .../gamecenter/libao/LibaoHistoryAdapter.java | 18 ++---------------- .../assistant/fragment/ApkCleanerFragment.java | 4 +++- .../fragment/myconcern/MyConcernAdapter.java | 6 ++++-- .../myconcern/MyConcernRecommendAdapter.java | 6 ++++-- .../main/res/drawable/game_detail_fuli_btn.xml | 9 +++++++++ app/src/main/res/layout/concern_item.xml | 1 - .../main/res/layout/fragment_apk_cleaner.xml | 4 ++-- .../main/res/layout/gamedetail_item_fuli.xml | 2 +- app/src/main/res/values/colors.xml | 2 +- 15 files changed, 49 insertions(+), 38 deletions(-) create mode 100644 app/src/main/res/drawable/game_detail_fuli_btn.xml 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 fcf62573ae..d2e611173a 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java @@ -112,8 +112,9 @@ public class DownloadItemUtils { holder.gameDes.setVisibility(View.VISIBLE); holder.gameProgressbar.setVisibility(View.GONE); holder.gameInfo.setVisibility(View.GONE); - holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_pause_style); + holder.gameDownloadBtn.setBackgroundResource(R.drawable.news_detail_comment); holder.gameDownloadBtn.setText("暂无"); + holder.gameDownloadBtn.setTextColor(ContextCompat.getColor(context, R.color.button_gray)); holder.gameDownloadBtn.setClickable(false); } else if (gameEntity.getApk().size() == 1) { updateNormalItem(context, holder, gameEntity, isShowPlatform); @@ -163,7 +164,8 @@ public class DownloadItemUtils { setwhat(context, holder, apkEntity, packageName); } else { holder.gameDownloadBtn.setText(R.string.launch); - holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_launch_style); + holder.gameDownloadBtn.setTextColor(ContextCompat.getColor(context, R.color.theme)); + holder.gameDownloadBtn.setBackgroundResource(R.drawable.detail_downloading_normal_style); } } } else { diff --git a/app/src/main/java/com/gh/common/util/GameUtils.java b/app/src/main/java/com/gh/common/util/GameUtils.java index b8e28082df..52dd20876d 100644 --- a/app/src/main/java/com/gh/common/util/GameUtils.java +++ b/app/src/main/java/com/gh/common/util/GameUtils.java @@ -2,6 +2,7 @@ package com.gh.common.util; import android.content.Context; import android.graphics.Color; +import android.support.v4.content.ContextCompat; import android.text.TextUtils; import android.widget.TextView; @@ -51,7 +52,8 @@ public class GameUtils { if ("插件化".equals(status)) { downloadBtn.setBackgroundResource(R.drawable.game_item_btn_plugin_style); } else if ("打开".equals(status)) { - downloadBtn.setBackgroundResource(R.drawable.game_item_btn_launch_style); + downloadBtn.setBackgroundResource(R.drawable.detail_downloading_normal_style); + downloadBtn.setTextColor(ContextCompat.getColor(context, R.color.theme)); } else { downloadBtn.setBackgroundResource(R.drawable.game_item_btn_download_style); } 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 478239d7d8..d63288e54a 100644 --- a/app/src/main/java/com/gh/common/util/LibaoUtils.java +++ b/app/src/main/java/com/gh/common/util/LibaoUtils.java @@ -175,7 +175,8 @@ public class LibaoUtils { break; case "finish": libaoBtn.setText(R.string.libao_finish); - libaoBtn.setBackgroundResource(R.drawable.textview_cancel_up); + libaoBtn.setBackgroundResource(R.drawable.button_border_gray); + libaoBtn.setTextColor(context.getResources().getColor(R.color.button_gray)); break; case "linged": libaoBtn.setText(R.string.libao_linged); @@ -212,10 +213,12 @@ public class LibaoUtils { case "unshelve": libaoBtn.setBackgroundResource(R.drawable.button_border_gray); libaoBtn.setText(R.string.libao_unshelve); + libaoBtn.setTextColor(context.getResources().getColor(R.color.button_gray)); break; default: libaoBtn.setBackgroundResource(R.drawable.button_border_gray); libaoBtn.setText("异常"); + libaoBtn.setTextColor(context.getResources().getColor(R.color.button_gray)); break; } } diff --git a/app/src/main/java/com/gh/gamecenter/SearchActivity.java b/app/src/main/java/com/gh/gamecenter/SearchActivity.java index 7c0fe2f2ba..f2e0d6f923 100644 --- a/app/src/main/java/com/gh/gamecenter/SearchActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SearchActivity.java @@ -206,7 +206,6 @@ public class SearchActivity extends BaseActivity { //热门搜索 isSearchDetail = true; searchKey = key; - Utils.log("=======key::" + key); searchInput.setText(key); searchInput.setSelection(searchInput.getText().length()); setResultPresentModel(2); 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 3df123c7fc..98107291e2 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.graphics.Bitmap; +import android.graphics.Color; import android.os.Message; import android.support.v4.content.ContextCompat; import android.support.v4.util.ArrayMap; @@ -191,8 +192,9 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { SpeedUtils.getSpeed(downloadEntity.getSpeed()), SpeedUtils.getRemainTime(downloadEntity.getSize(), downloadEntity.getProgress(), downloadEntity.getSpeed() * 1024))); viewHolder.dmDelete.setVisibility(View.GONE); - viewHolder.dmStartorpause.setBackgroundResource(R.drawable.game_item_btn_pause_style); + viewHolder.dmStartorpause.setBackgroundResource(R.drawable.detail_downloading_normal_style); viewHolder.dmStartorpause.setText("暂停"); + viewHolder.dmStartorpause.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); viewHolder.dmSpeed.setText(downloadEntity.getPercent() + "%"); } } else if (status.equals(DownloadStatus.waiting)) { @@ -202,8 +204,9 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { viewHolder.dmDownloads.setTextColor(0xFF9A9A9A); viewHolder.dmDownloads.setText("等待中"); viewHolder.dmDelete.setVisibility(View.VISIBLE); - viewHolder.dmStartorpause.setBackgroundResource(R.drawable.game_item_btn_pause_style); + viewHolder.dmStartorpause.setBackgroundResource(R.drawable.news_detail_comment); viewHolder.dmStartorpause.setText("等待"); + viewHolder.dmStartorpause.setTextColor(ContextCompat.getColor(mContext, R.color.button_gray)); viewHolder.dmSpeed.setText(downloadEntity.getPercent() + "%"); } else if (status.equals(DownloadStatus.pause) || status.equals(DownloadStatus.timeout) @@ -242,8 +245,9 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { downloadEntity.getProgress(), downloadEntity.getSpeed() * 1024))); viewHolder.dmDelete.setVisibility(View.GONE); - viewHolder.dmStartorpause.setBackgroundResource(R.drawable.game_item_btn_pause_style); + viewHolder.dmStartorpause.setBackgroundResource(R.drawable.detail_downloading_normal_style); viewHolder.dmStartorpause.setText("暂停"); + viewHolder.dmStartorpause.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); statusMap.put(url, "downloading"); notifyItemChanged(doneList.isEmpty() ? 0 : 1 + doneList.size()); @@ -268,9 +272,9 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { downloadEntity.getProgress(), downloadEntity.getSpeed() * 1024))); viewHolder.dmDelete.setVisibility(View.GONE); - viewHolder.dmStartorpause.setBackgroundResource(R.drawable.game_item_btn_pause_style); + viewHolder.dmStartorpause.setBackgroundResource(R.drawable.detail_downloading_normal_style); viewHolder.dmStartorpause.setText("暂停"); - + viewHolder.dmStartorpause.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); statusMap.put(url, "downloading"); notifyItemChanged(doneList.isEmpty() ? 0 : 1 + doneList.size()); @@ -305,6 +309,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { case "暂停": viewHolder.dmStartorpause.setBackgroundResource(R.drawable.game_item_btn_download_style); viewHolder.dmStartorpause.setText("继续"); + viewHolder.dmStartorpause.setTextColor(Color.WHITE); LinearLayout.LayoutParams lparams = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT); viewHolder.dmDownloads.setLayoutParams(lparams); 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 ece2e3eb78..4db44b647b 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java @@ -467,8 +467,8 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter { } } else { viewHolder.guUpdate.setText(R.string.launch); - viewHolder.guUpdate.setTextColor(Color.WHITE); - viewHolder.guUpdate.setBackgroundResource(R.drawable.game_item_btn_launch_style); + viewHolder.guUpdate.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); + viewHolder.guUpdate.setBackgroundResource(R.drawable.detail_downloading_normal_style); } } else { if (updateEntity.isPluggable()) { diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java index 1b3414707e..c3ff239728 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java @@ -1,7 +1,6 @@ package com.gh.gamecenter.libao; import android.content.Context; -import android.graphics.Color; import android.support.v4.content.ContextCompat; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView.ViewHolder; @@ -155,21 +154,8 @@ public class LibaoHistoryAdapter extends BaseRecyclerAdapter { viewHolder.libaoGameName.setText(libaoEntity.getGame().getName()); //领取状态 - if (!TextUtils.isEmpty(libaoEntity.getStatus())) { - if ("linged".equals(libaoEntity.getStatus())) { - 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(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(R.string.libao_unshelve); - viewHolder.libaoBtnStatus.setBackgroundResource(R.drawable.textview_cancel_up); - } + LibaoUtils.setLiBaoBtnStatus(viewHolder.libaoBtnStatus + , !TextUtils.isEmpty(libaoEntity.getStatus()) ? libaoEntity.getStatus() : "unshelve", mContext); } else { FooterViewHolder viewHolder = (FooterViewHolder) holder; diff --git a/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java b/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java index febbf33f55..4639c39b01 100644 --- a/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java @@ -2,6 +2,7 @@ package com.halo.assistant.fragment; import android.arch.lifecycle.Lifecycle; import android.content.Intent; +import android.graphics.Color; import android.os.Bundle; import android.support.v4.util.ArrayMap; import android.support.v7.widget.LinearLayoutManager; @@ -217,7 +218,8 @@ public class ApkCleanerFragment extends NormalFragment implements CleanApkAdapte public void onScanOver() { if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) { mApkDeleteBtn.setText("立即删除"); - mApkDeleteBtn.setBackgroundResource(R.drawable.game_item_btn_red_style); + mApkDeleteBtn.setTextColor(Color.WHITE); + mApkDeleteBtn.setBackgroundResource(R.drawable.game_item_btn_download_style); updateScanData(); diff --git a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernAdapter.java b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernAdapter.java index e3d5c26462..48561e7279 100644 --- a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernAdapter.java +++ b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernAdapter.java @@ -1,6 +1,7 @@ package com.halo.assistant.fragment.myconcern; import android.app.Activity; +import android.support.v4.content.ContextCompat; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; @@ -61,7 +62,7 @@ class MyConcernAdapter extends BaseRecyclerAdapter { .getConcern() .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new Response>(){ + .subscribe(new Response>() { @Override public void onResponse(List response) { super.onResponse(response); @@ -102,7 +103,8 @@ class MyConcernAdapter extends BaseRecyclerAdapter { holder.concern_item_icon.setImageURI(gameEntity.getIcon()); holder.concern_item_name.setText(gameEntity.getName()); holder.concern_item_concern.setText(R.string.cancel_concern); - holder.concern_item_concern.setBackgroundResource(R.drawable.textview_cancel_style); + holder.concern_item_concern.setTextColor(ContextCompat.getColor(mContext, R.color.theme)); + holder.concern_item_concern.setBackgroundResource(R.drawable.button_normal_border); holder.concern_item_concern.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernRecommendAdapter.java b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernRecommendAdapter.java index c8d6eab838..4a481f7a05 100644 --- a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernRecommendAdapter.java +++ b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernRecommendAdapter.java @@ -1,6 +1,7 @@ package com.halo.assistant.fragment.myconcern; import android.content.Context; +import android.graphics.Color; import android.view.View; import android.view.ViewGroup; import android.widget.Toast; @@ -35,7 +36,7 @@ import rx.schedulers.Schedulers; /** * Created by LGT on 2016/9/20. - * + *

* 我的关注，推荐关注 */ class MyConcernRecommendAdapter extends BaseRecyclerAdapter { @@ -149,6 +150,7 @@ class MyConcernRecommendAdapter extends BaseRecyclerAdapter { holder.concern_item_icon.setImageURI(gameEntity.getIcon()); holder.concern_item_name.setText(gameEntity.getName()); holder.concern_item_concern.setText(R.string.concern); + holder.concern_item_concern.setTextColor(Color.WHITE); holder.concern_item_concern.setBackgroundResource(R.drawable.textview_blue_style); holder.concern_item_concern.setOnClickListener(new View.OnClickListener() { @Override @@ -165,7 +167,7 @@ class MyConcernRecommendAdapter extends BaseRecyclerAdapter { // 更新界面->concernGame() Map kv = new HashMap<>(); - kv.put("状态",R.string.concern); + kv.put("状态", R.string.concern); DataUtils.onEvent(mContext, "游戏关注", gameEntity.getName(), kv); DataCollectionUtils.uploadConcern(mContext, diff --git a/app/src/main/res/drawable/game_detail_fuli_btn.xml b/app/src/main/res/drawable/game_detail_fuli_btn.xml new file mode 100644 index 0000000000..c7483acf73 --- /dev/null +++ b/app/src/main/res/drawable/game_detail_fuli_btn.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/concern_item.xml b/app/src/main/res/layout/concern_item.xml index 7b9947a7bc..92c3a6bf62 100644 --- a/app/src/main/res/layout/concern_item.xml +++ b/app/src/main/res/layout/concern_item.xml @@ -60,7 +60,6 @@ android:paddingRight = "8dp" android:paddingTop = "2dp" android:singleLine = "true" - android:textColor = "@android:color/white" android:textSize = "14sp" /> diff --git a/app/src/main/res/layout/fragment_apk_cleaner.xml b/app/src/main/res/layout/fragment_apk_cleaner.xml index c67d2a32a1..4f19bb9cfc 100644 --- a/app/src/main/res/layout/fragment_apk_cleaner.xml +++ b/app/src/main/res/layout/fragment_apk_cleaner.xml @@ -77,10 +77,10 @@ android:id = "@+id/delete_btn" android:layout_width = "match_parent" android:layout_height = "match_parent" - android:background = "@drawable/game_item_btn_download_style" + android:background = "@drawable/detail_downloading_normal_style" android:gravity = "center" android:text = "@string/clean_scan_stop" - android:textColor = "@android:color/white" + android:textColor = "@color/theme" android:textSize = "14sp" /> diff --git a/app/src/main/res/layout/gamedetail_item_fuli.xml b/app/src/main/res/layout/gamedetail_item_fuli.xml index 0ed3aec6d5..3ea618c3a7 100644 --- a/app/src/main/res/layout/gamedetail_item_fuli.xml +++ b/app/src/main/res/layout/gamedetail_item_fuli.xml @@ -122,7 +122,7 @@ android:layout_height = "23dp" android:layout_alignParentRight = "true" android:layout_centerVertical = "true" - android:background = "@drawable/button_normal_style" + android:background = "@drawable/game_detail_fuli_btn" android:gravity = "center" android:paddingBottom = "4dp" android:paddingLeft = "5dp" diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 6cac993489..739bef65a9 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -69,7 +69,7 @@ #e9e9e9 - #ff8814 + #ff6a28 #ecfaff