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 211997aa59..c8965296f3 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java @@ -7,6 +7,12 @@ import android.text.TextUtils; import android.view.View; import android.widget.TextView; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.collection.ArrayMap; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; + import com.gh.common.constant.Config; import com.gh.common.dialog.ReserveDialogFragment; import com.gh.common.exposure.ExposureEvent; @@ -29,12 +35,6 @@ import com.lightgame.utils.Utils; import java.util.concurrent.LinkedBlockingQueue; -import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; -import androidx.collection.ArrayMap; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; - public class DownloadItemUtils { // 更新下载进度条 @@ -368,6 +368,9 @@ public class DownloadItemUtils { if (!ReservationRepository.thisGameHasBeenReserved(gameEntity.getId())) { downloadBtn.setOnClickListener(v -> { CheckLoginUtils.checkLogin(context, entrance, () -> { + if (clickCallback != null) { + clickCallback.onCallback(); + } PermissionHelper.checkReadPhoneStatePermissionBeforeAction(context, () -> { ReserveDialogFragment dialogFragment = ReserveDialogFragment.getInstance( gameEntity, @@ -375,13 +378,13 @@ public class DownloadItemUtils { ); dialogFragment.show(((AppCompatActivity) context).getSupportFragmentManager(), "reserve"); }); - if (clickCallback != null) { - clickCallback.onCallback(); - } }); }); } else { downloadBtn.setOnClickListener(v -> { + if (clickCallback != null) { + clickCallback.onCallback(); + } if ("download".equals(gameEntity.getReserveStatus())) { ReservationHelper.showDeleteReservationDialog(context, () -> { ReservationHelper.deleteReservation(gameEntity, () -> { @@ -403,10 +406,10 @@ public class DownloadItemUtils { if (gameEntity.getApk().size() == 1) { downloadBtn.setOnClickListener(v -> { EmptyCallback clickRunnable = () -> { - onNormalClick(context, downloadBtn, gameEntity, position, adapter, entrance, location, traceEvent); if (clickCallback != null) { clickCallback.onCallback(); } + onNormalClick(context, downloadBtn, gameEntity, position, adapter, entrance, location, traceEvent); }; // 启动不需要请求存储权限 @@ -418,11 +421,11 @@ public class DownloadItemUtils { }); } else { downloadBtn.setOnClickListener(v -> { + if (clickCallback != null) { + clickCallback.onCallback(); + } PermissionHelper.checkStoragePermissionBeforeAction(context, () -> { DownloadDialog.getInstance(context).showPopupWindow(v, gameEntity, entrance, location, traceEvent); - if (clickCallback != null) { - clickCallback.onCallback(); - } }); }); }