diff --git a/app/src/main/java/com/gh/common/databind/BindingAdapters.java b/app/src/main/java/com/gh/common/databind/BindingAdapters.java index 5671d3a8ff..b874713b0b 100644 --- a/app/src/main/java/com/gh/common/databind/BindingAdapters.java +++ b/app/src/main/java/com/gh/common/databind/BindingAdapters.java @@ -456,7 +456,7 @@ public class BindingAdapters { return; } } - PackageCheckDialogFragment.show((AppCompatActivity) v.getContext(), gameEntity.getPackageDialog(), () -> { + PackageCheckDialogFragment.show((AppCompatActivity) v.getContext(), gameEntity.getId(), gameEntity.getPackageDialog(), () -> { DownloadDialogHelper.findAvailableDialogAndShow(v.getContext(), gameEntity, apk, () -> { CertificationDialog.showCertificationDialog(v.getContext(), gameEntity, () -> { DialogUtils.showVersionNumberDialog(v.getContext(), gameEntity, () -> { diff --git a/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt index ac61e171ec..ac3ce5413a 100644 --- a/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt @@ -41,6 +41,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() { private var mDisposable: Disposable? = null private var mAdapter: PackageCheckAdapter? = null var packageDialogEntity: PackageDialogEntity? = null + var gameId: String = "" var callBack: DialogUtils.ConfirmListener? = null override fun onCreate(savedInstanceState: Bundle?) { @@ -107,7 +108,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() { private fun initListener(entity: PackageDialogEntity) { binding.downloadBtn.setOnClickListener { if (binding.noRemindAgainCb.isChecked) { - SPUtils.setBoolean(Constants.SP_PACKAGE_CHECK, true) + SPUtils.setBoolean("${Constants.SP_PACKAGE_CHECK}:$gameId", true) } val isAllPackageInstalled = isAllPackageInstalled(entity) if (isAllPackageInstalled) { @@ -126,7 +127,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() { callBack?.onConfirm() } if (binding.noRemindAgainCb.isChecked) { - SPUtils.setBoolean(Constants.SP_PACKAGE_CHECK, true) + SPUtils.setBoolean("${Constants.SP_PACKAGE_CHECK}:$gameId", true) } dismissAllowingStateLoss() } @@ -245,7 +246,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() { companion object { @JvmStatic - fun show(activity: AppCompatActivity, packageDialogEntity: PackageDialogEntity?, callBack: DialogUtils.ConfirmListener) { + fun show(activity: AppCompatActivity, gameId: String, packageDialogEntity: PackageDialogEntity?, callBack: DialogUtils.ConfirmListener) { if (packageDialogEntity == null) { callBack.onConfirm() return @@ -254,7 +255,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() { callBack.onConfirm() return } - val isChoose = SPUtils.getBoolean(Constants.SP_PACKAGE_CHECK, false) + val isChoose = SPUtils.getBoolean("${Constants.SP_PACKAGE_CHECK}:$gameId", false) if (packageDialogEntity.level == "OPTIONAL_HINT" && isChoose) { callBack.onConfirm() return @@ -266,11 +267,13 @@ class PackageCheckDialogFragment : BaseDialogFragment() { if (dialogFragment == null) { dialogFragment = PackageCheckDialogFragment() dialogFragment.packageDialogEntity = packageDialogEntity + dialogFragment.gameId = gameId dialogFragment.callBack = callBack dialogFragment.show(activity.supportFragmentManager, PackageCheckDialogFragment::class.java.simpleName) } else { dialogFragment.packageDialogEntity = packageDialogEntity + dialogFragment.gameId = gameId dialogFragment.callBack = callBack val transaction: FragmentTransaction = activity.supportFragmentManager.beginTransaction() 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 ef1d6ced62..f8eeabeaa3 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java @@ -584,7 +584,7 @@ public class DownloadItemUtils { if (str.equals(context.getString(R.string.download))) { // 先弹下载弹窗(如果需要的话) - PackageCheckDialogFragment.show((AppCompatActivity) context, gameEntity.getPackageDialog(), () -> { + PackageCheckDialogFragment.show((AppCompatActivity) context, gameEntity.getId(), gameEntity.getPackageDialog(), () -> { DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, () -> { CertificationDialog.showCertificationDialog(context, gameEntity, () -> { DialogUtils.showOverseaDownloadDialog(context, gameEntity, () -> { @@ -597,7 +597,7 @@ public class DownloadItemUtils { DataLogUtils.uploadGameLog(context, gameEntity.getId(), gameEntity.getName(), entrance); } else if (str.equals(context.getString(R.string.attempt))) { - PackageCheckDialogFragment.show((AppCompatActivity) context, gameEntity.getPackageDialog(), () -> { + PackageCheckDialogFragment.show((AppCompatActivity) context, gameEntity.getId(), gameEntity.getPackageDialog(), () -> { DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, () -> { CertificationDialog.showCertificationDialog(context, gameEntity, () -> { DialogUtils.showVersionNumberDialog(context, gameEntity, () -> { diff --git a/app/src/main/java/com/gh/download/dialog/DownloadDialogItemViewHolder.kt b/app/src/main/java/com/gh/download/dialog/DownloadDialogItemViewHolder.kt index 0e063b813a..2650e0b7ab 100644 --- a/app/src/main/java/com/gh/download/dialog/DownloadDialogItemViewHolder.kt +++ b/app/src/main/java/com/gh/download/dialog/DownloadDialogItemViewHolder.kt @@ -280,7 +280,7 @@ class DownloadDialogItemViewHolder(val binding: DownloadDialogItemBinding) : Bas if (msg.isNullOrEmpty()) { DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apkEntity, object : EmptyCallback { override fun onCallback() { - PackageCheckDialogFragment.show(context as AppCompatActivity, gameEntity.packageDialog, DialogUtils.ConfirmListener { + PackageCheckDialogFragment.show(context as AppCompatActivity, gameEntity.id, gameEntity.packageDialog, DialogUtils.ConfirmListener { CertificationDialog.showCertificationDialog(context, gameEntity, DialogUtils.ConfirmListener { DialogUtils.checkDownload(context, apkEntity.size) { isSubscribe -> DownloadManager.createDownload( diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java index ba9a0a1078..867377c651 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java @@ -172,7 +172,7 @@ public class DetailViewHolder { PermissionHelper.checkStoragePermissionBeforeAction(mViewHolder.context, () -> { if (mGameEntity.getApk().size() == 1) { ApkEntity apk = mGameEntity.getApk().get(0); - PackageCheckDialogFragment.show((AppCompatActivity) mViewHolder.context, mGameEntity.getPackageDialog(), () -> { + PackageCheckDialogFragment.show((AppCompatActivity) mViewHolder.context, mGameEntity.getId(), mGameEntity.getPackageDialog(), () -> { DownloadDialogHelper.findAvailableDialogAndShow(mViewHolder.context, mGameEntity, apk, () -> { CertificationDialog.showCertificationDialog(mViewHolder.context, mGameEntity, () -> { DialogUtils.showVersionNumberDialog(mViewHolder.context, mGameEntity, () -> { diff --git a/app/src/main/java/com/gh/gamecenter/entity/PackageDialogEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/PackageDialogEntity.kt index 768da9e850..aeca207781 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/PackageDialogEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/PackageDialogEntity.kt @@ -21,25 +21,3 @@ data class DetectionObjectEntity( val text: String = "", val packages: ArrayList = arrayListOf() ) : Parcelable - -/* -@Parcelize -data class PackageLink( - val text: String = "", - @SerializedName("link_type") - val linkType: String = "", - @SerializedName("link_id") - val linkId: String = "", - @SerializedName("link_text") - val linkText: String = "", - @SerializedName("button_link") - val buttonLink: Boolean = false -) : Parcelable { - fun transform(): LinkEntity { - val entity = LinkEntity() - entity.linkText = linkText - entity.type = linkType - entity.link = linkId - return entity - } -}*/