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 1a53d85786..3e1345f6eb 100644 --- a/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java +++ b/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java @@ -72,6 +72,7 @@ public class DetailDownloadUtils { switch (downloadEntity.getStatus()) { case downloading: case pause: + case overflow: viewHolder.mDownloadPb.setText(R.string.downloading); if (downloadEntity.isPluggable() && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) { viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.DOWNLOADING_PLUGIN); 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 ed5b6c3a55..5a28b407e9 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java @@ -229,7 +229,8 @@ public class DownloadItemUtils { } else if (status.equals(DownloadStatus.pause) || status.equals(DownloadStatus.timeout) || status.equals(DownloadStatus.neterror) - || status.equals(DownloadStatus.subscribe)) { + || status.equals(DownloadStatus.subscribe) + || status.equals(DownloadStatus.overflow)) { holder.gameProgressbar.setProgress((int) (downloadEntity.getPercent() * 10)); if (isShowPlatform && platform != null) { holder.gameDownloadSpeed.setText(String.format("%s - 暂停", platform)); @@ -239,10 +240,10 @@ public class DownloadItemUtils { holder.gameDownloadPercentage.setText(downloadEntity.getPercent() + "%"); if (isNormal) { - if (status.equals(DownloadStatus.pause)) { - holder.gameDownloadBtn.setText(R.string.downloading); - } else { + if (status.equals(DownloadStatus.waiting)) { holder.gameDownloadBtn.setText(R.string.waiting); + } else { + 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)); 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 1ca3f46203..8b23a746ba 100644 --- a/app/src/main/java/com/gh/common/view/DownloadProgressBar.java +++ b/app/src/main/java/com/gh/common/view/DownloadProgressBar.java @@ -102,7 +102,7 @@ public class DownloadProgressBar extends ProgressBar { String txt = TextUtils.ellipsize(mText, mFakeTextPaint, width, TextUtils.TruncateAt.END).toString(); srcCanvas.drawText(txt, getWidth() / 2, baseline, mPaint); mPaint.setXfermode(mDuffXFerMode); - if (getProgress() != 0 && getProgress() != MAX_LENGTH) { + if (getProgress() != 0) { mPaint.setColor(DOWNLOAD_IMAGE_STYLE == mDownloadStyle ? Color.BLACK : Color.WHITE); // 反向颜色 } diff --git a/app/src/main/java/com/gh/common/view/MessageSpannableTextView.java b/app/src/main/java/com/gh/common/view/MessageSpannableTextView.java index 468da6aa79..f43b6fbd65 100644 --- a/app/src/main/java/com/gh/common/view/MessageSpannableTextView.java +++ b/app/src/main/java/com/gh/common/view/MessageSpannableTextView.java @@ -61,8 +61,6 @@ public class MessageSpannableTextView extends android.support.v7.widget.AppCompa markData.setKey(key); mMarkList.add(markData); - System.out.println(substring); - System.out.println(s); } else { builder.append(s); if (i != split.length - 1 || sText.substring(sText.length() - 2, sText.length()).equals("}}")) { 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 58ac7cb1de..b039f6a231 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/PlatformAdapter.java @@ -314,7 +314,8 @@ public class PlatformAdapter extends BaseRecyclerAdapter { || status.equals(DownloadStatus.timeout) || status.equals(DownloadStatus.neterror) || status.equals(DownloadStatus.downloading) - || status.equals(DownloadStatus.waiting)) { + || status.equals(DownloadStatus.waiting) + || status.equals(DownloadStatus.overflow)) { viewHolder.mDownloadItemTvStatus.setText(R.string.downloading); } else if (status.equals(DownloadStatus.done)) { viewHolder.mDownloadItemTvStatus.setText(R.string.install); 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 33151626ba..f0a0de29dc 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java @@ -238,6 +238,17 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { } else { viewHolder.dmDownloads.setText("已暂停"); } + } else if (status.equals(DownloadStatus.overflow)) { + LinearLayout.LayoutParams lparams = new LinearLayout.LayoutParams( + LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT); + viewHolder.dmDownloads.setLayoutParams(lparams); + viewHolder.dmDownloads.setTextColor(mContext.getResources().getColor(R.color.red)); + viewHolder.dmDownloads.setText("建议删除任务重新下载"); + viewHolder.dmDelete.setVisibility(View.VISIBLE); + viewHolder.dmStartorpause.setBackgroundResource(R.drawable.game_item_btn_pause_style); + viewHolder.dmStartorpause.setText("失败"); + viewHolder.dmStartorpause.setTextColor(Color.WHITE); + viewHolder.dmSpeed.setText(downloadEntity.getPercent() + "%"); } viewHolder.dmProgressbar.setProgress((int) (downloadEntity.getPercent() * 10)); diff --git a/libraries/LGLibrary b/libraries/LGLibrary index 72b3007b44..56ed06125d 160000 --- a/libraries/LGLibrary +++ b/libraries/LGLibrary @@ -1 +1 @@ -Subproject commit 72b3007b444765cf6059ee5bb724480a70d59ad9 +Subproject commit 56ed06125d789af02b5c693e91019dc98f5be4ce