Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-4.7.0' of git.ghzs.com:halo/assistant-android into dev-4.7.0

Browse Source
This commit is contained in:
张玉久
2021-02-01 16:14:26 +08:00
parent 7138177df2 aa4cf291dc
commit b9da7fbcb8
41 changed files with 265 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/gh/common/util/DownloadItemUtils.java
View File

@ -134,7 +134,7 @@ public class DownloadItemUtils {
// 已预约
holder.gameDownloadBtn.setVisibility(View.VISIBLE);
holder.gameDownloadBtn.setText("已预约");
holder.gameDownloadBtn.setTextColor(ContextCompat.getColor(holder.gameDes.getContext(),R.color.aaaaaa));
holder.gameDownloadBtn.setTextColor(ContextCompat.getColor(holder.gameDes.getContext(), R.color.aaaaaa));
holder.gameDownloadBtn.setBackgroundResource(R.drawable.button_round_f5f5f5);
}
}
@ -580,7 +580,9 @@ public class DownloadItemUtils {
final String location,
@Nullable final ExposureEvent traceEvent) {
String str = downloadBtn.getText().toString();
ApkEntity apk = gameEntity.getApk().get(0);
if (gameEntity.getApk().isEmpty()) return;
ApkEntity apk = ExtensionsKt.safelyGetInRelease(gameEntity.getApk(), 0);
if (apk == null) return;
if (str.equals(context.getString(R.string.download))) {
// 先弹下载弹窗(如果需要的话)