From bc76e6eddb9bed0efcb7aaa894337f705b837051 Mon Sep 17 00:00:00 2001 From: lyr <15622190878@163.com> Date: Tue, 18 May 2021 11:59:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV4.9.0-?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83=E5=90=8E?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E6=B1=87=E6=80=BB(14?= =?UTF-8?q?=E3=80=8116)=20https://git.ghzs.com/pm/halo-app-issues/-/issues?= =?UTF-8?q?/1262#note=5F101438?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/common/util/DownloadItemUtils.java | 2 -- app/src/main/java/com/gh/common/util/DownloadObserver.kt | 2 ++ app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt | 4 +++- .../gh/gamecenter/adapter/viewholder/DetailViewHolder.java | 1 - .../java/com/gh/gamecenter/energy/EnergyCenterFragment.kt | 1 + app/src/main/java/com/gh/gamecenter/energy/TaskAdapter.kt | 4 ++-- .../java/com/gh/gamecenter/personalhome/UserHomeViewModel.kt | 3 +++ 7 files changed, 11 insertions(+), 6 deletions(-) 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 c923e78177..945756b0c9 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java @@ -712,8 +712,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); } diff --git a/app/src/main/java/com/gh/common/util/DownloadObserver.kt b/app/src/main/java/com/gh/common/util/DownloadObserver.kt index 12f2a62685..10faaee4ff 100644 --- a/app/src/main/java/com/gh/common/util/DownloadObserver.kt +++ b/app/src/main/java/com/gh/common/util/DownloadObserver.kt @@ -8,6 +8,7 @@ import com.gh.common.exposure.ExposureUtils import com.gh.common.exposure.meta.MetaUtil import com.gh.common.simulator.SimulatorDownloadManager import com.gh.common.simulator.SimulatorGameManager +import com.gh.common.util.EnergyTaskHelper.postEnergyTask import com.gh.common.xapk.XapkInstaller import com.gh.download.DownloadDataHelper import com.gh.download.DownloadManager @@ -126,6 +127,7 @@ object DownloadObserver { } else { statDoneEvent(downloadEntity) + postEnergyTask("download_game", downloadEntity.gameId, downloadEntity.packageName) val platform = PlatformUtils.getInstance(mApplication) .getPlatformName(downloadEntity.platform) if (platform != null) { diff --git a/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt b/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt index cd4b9a6a2d..19a9cdec47 100644 --- a/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt +++ b/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt @@ -139,7 +139,9 @@ object EnergyTaskHelper { isFocusable = true isFocusableInTouchMode = true setOnClickListener { - currentActivity.startActivity(EnergyCenterActivity.getIntent(currentActivity)) + if (currentActivity::class.java.simpleName != EnergyCenterActivity::class.java.simpleName) { + currentActivity.startActivity(EnergyCenterActivity.getIntent(currentActivity)) + } } } val popWindow = PopupWindow(contentView, LinearLayout.LayoutParams.MATCH_PARENT, 88F.dip2px()) 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 f51ce9839b..a5d43b8b1d 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 @@ -128,7 +128,6 @@ public class DetailViewHolder { break; case NORMAL: MtaHelper.onEvent("游戏详情_新", "下载", mGameEntity.getName()); - EnergyTaskHelper.postEnergyTask("download_game", mGameEntity.getId(), mGameEntity.getApk().get(0).getPackageName()); break; case PLUGIN: MtaHelper.onEvent("游戏详情_新", "插件化", mGameEntity.getName()); diff --git a/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterFragment.kt b/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterFragment.kt index 52e3455e93..78ff5f4973 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/EnergyCenterFragment.kt @@ -119,6 +119,7 @@ class EnergyCenterFragment : BaseLazyFragment() { DialogUtils.showSignSuccessDialog(requireContext()) { initSignView(it) mUserHomeViewModel?.getUserEnergy() + refreshTaskList() } } diff --git a/app/src/main/java/com/gh/gamecenter/energy/TaskAdapter.kt b/app/src/main/java/com/gh/gamecenter/energy/TaskAdapter.kt index 5080fb9afe..0633c7437b 100644 --- a/app/src/main/java/com/gh/gamecenter/energy/TaskAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/energy/TaskAdapter.kt @@ -55,7 +55,7 @@ class TaskAdapter(context: Context) : ListAdapter(context) { oldItem?.title != null && newItem?.title != null -> true oldItem?.dailyTask != null && newItem?.dailyTask != null -> { - oldItem.dailyTask?.id == newItem.dailyTask?.id + (oldItem.dailyTask?.id == newItem.dailyTask?.id && oldItem.dailyTask?.status == newItem.dailyTask?.status) } else -> super.areItemsTheSame(oldItem, newItem) @@ -71,7 +71,7 @@ class TaskAdapter(context: Context) : ListAdapter(context) { oldItem?.title != null && newItem?.title != null -> true oldItem?.dailyTask != null && newItem?.dailyTask != null -> { - oldItem.dailyTask?.id == newItem.dailyTask?.id + (oldItem.dailyTask?.id == newItem.dailyTask?.id && oldItem.dailyTask?.status == newItem.dailyTask?.status) } else -> super.areContentsTheSame(oldItem, newItem) diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeViewModel.kt b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeViewModel.kt index 49a9f8c25b..84074bb0ef 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeViewModel.kt @@ -7,6 +7,7 @@ import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider +import com.gh.common.util.EnergyTaskHelper import com.gh.common.util.ToastUtils import com.gh.common.util.createRequestBody import com.gh.gamecenter.R @@ -237,6 +238,8 @@ class UserHomeViewModel(application: Application, var userId: String) : AndroidV .observeOn(AndroidSchedulers.mainThread()) .subscribe(object : BiResponse() { override fun onSuccess(data: SignStatusEntity) { + EnergyTaskHelper.postEnergyTask("sign_in_cumulatively") + EnergyTaskHelper.postEnergyTask("sign_in_continuously") sign.postValue(data) } })