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 54ec3996da..cedd9fbe47 100644 --- a/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java +++ b/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java @@ -13,6 +13,7 @@ import com.gh.gamecenter.entity.LinkEntity; import com.gh.gamecenter.entity.PluginLocation; import com.gh.gamecenter.manager.PackagesManager; import com.lightgame.download.DownloadEntity; +import com.lightgame.utils.Utils; /** * Created by khy on 27/06/17. @@ -93,7 +94,7 @@ public class DetailDownloadUtils { } viewHolder.mDownloadPb.setText(downloadText); } else { - viewHolder.mDownloadPb.setText("选择下载你的版本" + (TextUtils.isEmpty(downloadAddWord) ? "" : "-" + downloadAddWord)); + viewHolder.mDownloadPb.setText("选择下载你的版本" + (TextUtils.isEmpty(downloadAddWord) ? "" : "-" + downloadAddWord) + " >"); viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.NORMAL); } if (isCheck && viewHolder.gameEntity.getApk().size() == 1) { @@ -138,7 +139,7 @@ public class DetailDownloadUtils { case done: viewHolder.mDownloadPb.setText(R.string.install); if (downloadEntity.isPluggable() - && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) { + && PackagesManager.isInstalled(downloadEntity.getPackageName())) { viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.INSTALL_PLUGIN); } else { viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.INSTALL_NORMAL); 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 2ef1c44d04..5188f2a655 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java @@ -338,10 +338,10 @@ public class DownloadItemUtils { holder.gameDownloadBtn.setText(R.string.install); holder.gameDownloadBtn.setTextColor(Color.WHITE); if (downloadEntity.isPluggable() - && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) { - holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_plugin_style); + && PackagesManager.isInstalled(downloadEntity.getPackageName())) { + holder.gameDownloadBtn.setBackgroundResource(R.drawable.download_button_pluggable_style); } else { - holder.gameDownloadBtn.setBackgroundResource(R.drawable.game_item_btn_download_style); + holder.gameDownloadBtn.setBackgroundResource(R.drawable.download_button_normal_style); } } } diff --git a/app/src/main/java/com/gh/common/util/Extensions.kt b/app/src/main/java/com/gh/common/util/Extensions.kt index c100105c07..dca00d803d 100644 --- a/app/src/main/java/com/gh/common/util/Extensions.kt +++ b/app/src/main/java/com/gh/common/util/Extensions.kt @@ -240,7 +240,7 @@ inline fun tryCatchInRelease(action: (() -> Unit)) { /** * 在 debug 状态下抛出异常 */ -fun throwExceptionInDebug(message: String, predicate: Boolean = true) { +fun throwExceptionInDebug(message: String = "", predicate: Boolean = true) { if (predicate && BuildConfig.DEBUG) { throw RuntimeException(message) } 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 dc1e5afe91..df9d9c1abc 100644 --- a/app/src/main/java/com/gh/common/util/GameUtils.java +++ b/app/src/main/java/com/gh/common/util/GameUtils.java @@ -57,15 +57,12 @@ public class GameUtils { downloadBtn.setTextColor(Color.WHITE); downloadBtn.setText(status); if (context.getString(R.string.pluggable).equals(status)) { - downloadBtn.setBackgroundResource(R.drawable.game_item_btn_plugin_style); + downloadBtn.setBackgroundResource(R.drawable.download_button_pluggable_style); String pluginDesc = gameEntity.getPluginDesc(); if (pluginDesc.length() > 3) pluginDesc = pluginDesc.substring(0, 3); downloadBtn.setText((pluginDesc + "化")); - } else if (context.getString(R.string.launch).equals(status) || context.getString(R.string.expand).equals(status)) { - downloadBtn.setBackgroundResource(R.drawable.detail_download_open_style); - downloadBtn.setTextColor(ContextCompat.getColor(context, R.color.theme_font)); } else { - downloadBtn.setBackgroundResource(R.drawable.game_item_btn_download_style); + downloadBtn.setBackgroundResource(R.drawable.download_button_normal_style); } } @@ -73,6 +70,10 @@ public class GameUtils { * 获取下载按钮文案 */ public static String getDownloadBtnText(Context context, GameEntity gameEntity, PluginLocation pluginLocation) { + if (gameEntity.getApk().size() > 1) { + return context.getString(R.string.expand); + } + int doneCount = 0; // 下载完成数量 int pluginCount = 0; // 可插件化数量 int updateCount = 0; // 可更新数量 @@ -124,11 +125,7 @@ public class GameUtils { } else if (updateCount != 0) { return context.getString(R.string.update); } else if (installCount != 0) { - if (gameEntity.getApk().size() == 1) { - return context.getString(R.string.launch); - } else { - return context.getString(R.string.expand); - } + return context.getString(R.string.launch); } else if (gameEntity.getVersionNumber().contains("无版号")) { return context.getString(R.string.attempt); } else { diff --git a/app/src/main/java/com/gh/common/view/DownloadProgressBar.java b/app/src/main/java/com/gh/common/view/DownloadProgressBar.java index e80add42a7..7267dcfce8 100644 --- a/app/src/main/java/com/gh/common/view/DownloadProgressBar.java +++ b/app/src/main/java/com/gh/common/view/DownloadProgressBar.java @@ -177,7 +177,7 @@ public class DownloadProgressBar extends ProgressBar { mDefaultColor = Color.BLACK; break; default: - setProgressDrawable(getResources().getDrawable(R.drawable.game_item_btn_download_style)); + setProgressDrawable(getResources().getDrawable(R.drawable.download_button_normal_style)); mDefaultColor = Color.WHITE; break; } @@ -186,7 +186,7 @@ public class DownloadProgressBar extends ProgressBar { case PLUGIN: case INSTALL_PLUGIN: setProgressDrawable(getResources().getDrawable(mDownloadStyle == DOWNLOAD_RECT_STYLE - ? R.drawable.detail_download_plugin_install_rect_style : R.drawable.game_item_btn_plugin_style)); + ? R.drawable.detail_download_plugin_install_rect_style : R.drawable.download_button_pluggable_style)); mDefaultColor = Color.WHITE; setProgress(0); break; @@ -199,16 +199,16 @@ public class DownloadProgressBar extends ProgressBar { case LAUNCH_OR_OPEN: switch (mDownloadStyle) { case DOWNLOAD_RECT_STYLE: - setProgressDrawable(getResources().getDrawable(R.drawable.detail_download_open_rect_style)); - mDefaultColor = ContextCompat.getColor(getContext(), R.color.theme_font); + setProgressDrawable(getResources().getDrawable(R.drawable.detail_download_normal_rect_style)); + mDefaultColor = Color.WHITE; break; case DOWNLOAD_IMAGE_STYLE: setProgressDrawable(getResources().getDrawable(R.drawable.detail_download_open_image_style)); mDefaultColor = Color.WHITE; break; default: - setProgressDrawable(getResources().getDrawable(R.drawable.detail_download_open_style)); - mDefaultColor = ContextCompat.getColor(getContext(), R.color.theme_font); + setProgressDrawable(getResources().getDrawable(R.drawable.download_button_normal_style)); + mDefaultColor = Color.WHITE; break; } setProgress(0); @@ -233,7 +233,7 @@ public class DownloadProgressBar extends ProgressBar { case DOWNLOADING_PLUGIN: setProgressDrawable(getResources().getDrawable(mDownloadStyle == DOWNLOAD_RECT_STYLE ? R.drawable.detail_downloading_plugin_rect_style : R.drawable.detail_downloading_plugin_style)); - mDefaultColor = ContextCompat.getColor(getContext(), R.color.btn_plugin); + mDefaultColor = ContextCompat.getColor(getContext(), R.color.text_00D7B0); break; case RESERVABLE: setProgressDrawable(getResources().getDrawable(R.drawable.button_reserve)); 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 c7dfcd13c8..a2211a29d4 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java @@ -175,10 +175,10 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { if (downloadEntity.isPluggable() && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) { viewHolder.dmStartorpause.setText("安装"); - viewHolder.dmStartorpause.setBackgroundResource(R.drawable.game_item_btn_plugin_style); + viewHolder.dmStartorpause.setBackgroundResource(R.drawable.download_button_pluggable_style); } else { viewHolder.dmStartorpause.setText("安装"); - viewHolder.dmStartorpause.setBackgroundResource(R.drawable.game_item_btn_download_style); + viewHolder.dmStartorpause.setBackgroundResource(R.drawable.download_button_normal_style); } viewHolder.dmSpeed.setText(R.string.hundred_percent); } else if (status.equals(DownloadStatus.downloading)) { @@ -215,7 +215,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { LinearLayout.LayoutParams lparams = new LinearLayout.LayoutParams( LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT); viewHolder.dmDelete.setVisibility(View.VISIBLE); - viewHolder.dmStartorpause.setBackgroundResource(R.drawable.game_item_btn_download_style); + viewHolder.dmStartorpause.setBackgroundResource(R.drawable.download_button_normal_style); viewHolder.dmStartorpause.setText("继续"); viewHolder.dmStartorpause.setTextColor(Color.WHITE); viewHolder.dmSpeed.setText(downloadEntity.getPercent() + "%"); @@ -302,7 +302,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { } break; case "暂停": - viewHolder.dmStartorpause.setBackgroundResource(R.drawable.game_item_btn_download_style); + viewHolder.dmStartorpause.setBackgroundResource(R.drawable.download_button_normal_style); viewHolder.dmStartorpause.setText("继续"); viewHolder.dmStartorpause.setTextColor(Color.WHITE); LinearLayout.LayoutParams lparams = new LinearLayout.LayoutParams( 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 34e45d167d..8f29ac7663 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java @@ -386,7 +386,7 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter implemen if (PackagesManager.INSTANCE.isCanUpdate(updateEntity.getId(), updateEntity.getPackageName())) { viewHolder.guUpdate.setText(R.string.update); viewHolder.guUpdate.setTextColor(Color.WHITE); - viewHolder.guUpdate.setBackgroundResource(R.drawable.game_item_btn_download_style); + viewHolder.guUpdate.setBackgroundResource(R.drawable.download_button_normal_style); } else if (updateEntity.isPluggable()) { viewHolder.guUpdate.setText(R.string.pluggable); viewHolder.guUpdate.setTextColor(Color.WHITE); @@ -395,7 +395,7 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter implemen if (downloadEntity == null || downloadEntity.getUrl().equals(updateEntity.getUrl())) { viewHolder.guUpdate.setClickable(true); - viewHolder.guUpdate.setBackgroundResource(R.drawable.game_item_btn_plugin_style); + viewHolder.guUpdate.setBackgroundResource(R.drawable.download_button_pluggable_style); } else { viewHolder.guUpdate.setClickable(false); viewHolder.guUpdate.setBackgroundResource(R.drawable.game_item_btn_pause_up); @@ -410,7 +410,7 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter implemen if (downloadEntity.getStatus() == DownloadStatus.done) { viewHolder.guUpdate.setText(R.string.install); viewHolder.guUpdate.setTextColor(Color.WHITE); - viewHolder.guUpdate.setBackgroundResource(R.drawable.game_item_btn_plugin_style); + viewHolder.guUpdate.setBackgroundResource(R.drawable.download_button_pluggable_style); } else { viewHolder.guUpdate.setText(R.string.downloading); viewHolder.guUpdate.setTextColor( @@ -421,7 +421,7 @@ class GameUpdateFragmentAdapter extends BaseRecyclerAdapter implemen if (downloadEntity.getStatus() == DownloadStatus.done) { viewHolder.guUpdate.setText(R.string.install); viewHolder.guUpdate.setTextColor(Color.WHITE); - viewHolder.guUpdate.setBackgroundResource(R.drawable.game_item_btn_download_style); + viewHolder.guUpdate.setBackgroundResource(R.drawable.download_button_normal_style); } else { viewHolder.guUpdate.setText(R.string.downloading); viewHolder.guUpdate.setTextColor( diff --git a/app/src/main/res/drawable/detail_download_open_rect_style.xml b/app/src/main/res/drawable/detail_download_open_rect_style.xml index ae6fb13f36..d2b8708441 100644 --- a/app/src/main/res/drawable/detail_download_open_rect_style.xml +++ b/app/src/main/res/drawable/detail_download_open_rect_style.xml @@ -5,7 +5,7 @@ + android:color = "@color/theme" /> diff --git a/app/src/main/res/drawable/detail_download_open_style.xml b/app/src/main/res/drawable/detail_download_open_style.xml index 2adb563ac8..7359053629 100644 --- a/app/src/main/res/drawable/detail_download_open_style.xml +++ b/app/src/main/res/drawable/detail_download_open_style.xml @@ -5,7 +5,7 @@ + android:color = "@color/theme" /> diff --git a/app/src/main/res/drawable/detail_downloading_normal_rect_style.xml b/app/src/main/res/drawable/detail_downloading_normal_rect_style.xml index b983f18f87..db22536f6d 100644 --- a/app/src/main/res/drawable/detail_downloading_normal_rect_style.xml +++ b/app/src/main/res/drawable/detail_downloading_normal_rect_style.xml @@ -5,7 +5,7 @@ + android:color = "@color/theme" /> @@ -19,8 +19,8 @@ + android:endColor = "@color/theme" + android:startColor = "@color/theme" /> diff --git a/app/src/main/res/drawable/detail_downloading_normal_style.xml b/app/src/main/res/drawable/detail_downloading_normal_style.xml index e09980d732..b2596c8fb5 100644 --- a/app/src/main/res/drawable/detail_downloading_normal_style.xml +++ b/app/src/main/res/drawable/detail_downloading_normal_style.xml @@ -5,7 +5,7 @@ + android:color = "@color/theme" /> @@ -19,8 +19,8 @@ + android:endColor = "@color/theme" + android:startColor = "@color/theme" /> diff --git a/app/src/main/res/drawable/detail_downloading_plugin_rect_style.xml b/app/src/main/res/drawable/detail_downloading_plugin_rect_style.xml index 757e000cba..cbe07eff1c 100644 --- a/app/src/main/res/drawable/detail_downloading_plugin_rect_style.xml +++ b/app/src/main/res/drawable/detail_downloading_plugin_rect_style.xml @@ -1,28 +1,28 @@ - + - - + + + android:width="0.6dp" + android:color="@color/text_00D7B0" /> - + - - + + - - - - - + + + + + - - - + android:endColor="@color/text_00D7B0" + android:startColor="@color/text_00D7B0" /> + + + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/drawable/detail_downloading_plugin_style.xml b/app/src/main/res/drawable/detail_downloading_plugin_style.xml index 4a235a2fbb..f63ffdaaf4 100644 --- a/app/src/main/res/drawable/detail_downloading_plugin_style.xml +++ b/app/src/main/res/drawable/detail_downloading_plugin_style.xml @@ -5,7 +5,7 @@ + android:color = "@color/text_00D7B0" /> @@ -19,8 +19,8 @@ + android:endColor = "@color/text_00D7B0" + android:startColor = "@color/text_00D7B0" /> diff --git a/app/src/main/res/drawable/download_button_normal_style.xml b/app/src/main/res/drawable/download_button_normal_style.xml new file mode 100644 index 0000000000..f2c5af7f75 --- /dev/null +++ b/app/src/main/res/drawable/download_button_normal_style.xml @@ -0,0 +1,11 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/download_button_pluggable_style.xml b/app/src/main/res/drawable/download_button_pluggable_style.xml new file mode 100644 index 0000000000..8051c011b7 --- /dev/null +++ b/app/src/main/res/drawable/download_button_pluggable_style.xml @@ -0,0 +1,11 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/game_item.xml b/app/src/main/res/layout/game_item.xml index a31bab1f29..82f2e50147 100644 --- a/app/src/main/res/layout/game_item.xml +++ b/app/src/main/res/layout/game_item.xml @@ -191,7 +191,7 @@ android:id="@+id/download_btn" android:layout_width="60dp" android:layout_height="28.5dp" - android:background="@drawable/game_item_btn_download_style" + android:background="@drawable/download_button_normal_style" android:gravity="center" android:text="@string/download" android:textColor="@android:color/white" diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index f3a8ca221d..1c6281ed84 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -156,4 +156,7 @@ #4BC7FF #F8F8F8 #F0F0F0 + #00DBB0 + #00B8B8 + #00D7B0 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d00f791e00..9dbcdb8785 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -345,7 +345,7 @@ 等待中 打开 试玩 - 展开 + 展开 > 已淘号：%1$s]]> 已领取：%1$s]]>