Merge remote-tracking branch 'origin/release' into dev-5.0.0

# Conflicts: # dependencies.gradle
2021-06-03 16:47:45 +08:00
parent a0b8caa60a 039203408a
commit 84f3556275
72 changed files with 377 additions and 854 deletions
--- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java
+++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java
@ -743,8 +743,6 @@ public class DownloadItemUtils {
            downloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style);
            downloadBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style));
            DeviceRemindDialog.Companion.showDeviceRemindDialog(context, gameEntity);
-
-            EnergyTaskHelper.postEnergyTask("download_game", gameEntity.getId(), gameEntity.getApk().get(0).getPackageName());
        } else {
            Utils.toast(context, msg);
        }