From cae908da6a4bff88366cabf8d2eec7e073965ac2 Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Thu, 28 May 2020 17:31:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8E=86=E5=8F=B2=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E4=B8=8B=E8=BD=BD=E7=9A=84=E4=B8=8B=E8=BD=BD=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/common/constant/Constants.java | 2 ++ app/src/main/java/com/gh/common/exposure/ExposureEvent.kt | 3 ++- .../main/java/com/gh/common/util/DataCollectionUtils.java | 4 +++- app/src/main/java/com/gh/common/util/DownloadObserver.kt | 7 +++++-- app/src/main/java/com/gh/common/util/Extensions.kt | 2 +- .../gamedetail/history/HistoryApkListViewModel.kt | 2 +- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/gh/common/constant/Constants.java b/app/src/main/java/com/gh/common/constant/Constants.java index e67204b880..02af4e5a5e 100644 --- a/app/src/main/java/com/gh/common/constant/Constants.java +++ b/app/src/main/java/com/gh/common/constant/Constants.java @@ -30,6 +30,8 @@ public class Constants { public static final String EB_QUIT_LOGIN = "quit_login"; public static final String GAME_ID_DIVIDER = ":"; // 用于避免历史下载掺和到普通下载状态的 ID 修饰符 + + public static final String GAME_NAME_DECORATOR = " "; // 用于避免历史下载影响到部分依赖名字作为数据更新条件的修饰符 // 最近显示的弹窗信息 public static final String SP_LAST_OPENING_ID = "last_opening_dialog_id"; diff --git a/app/src/main/java/com/gh/common/exposure/ExposureEvent.kt b/app/src/main/java/com/gh/common/exposure/ExposureEvent.kt index 2640e6490f..9949ef8129 100644 --- a/app/src/main/java/com/gh/common/exposure/ExposureEvent.kt +++ b/app/src/main/java/com/gh/common/exposure/ExposureEvent.kt @@ -4,6 +4,7 @@ import android.os.Parcelable import androidx.annotation.Keep import androidx.room.Entity import androidx.room.PrimaryKey +import com.gh.common.constant.Constants import com.gh.common.exposure.meta.Meta import com.gh.common.exposure.meta.MetaUtil import com.gh.common.exposure.time.TimeUtil @@ -28,7 +29,7 @@ data class ExposureEvent( fun createEvent(gameEntity: GameEntity?, source: List, eTrace: List? = null, event: ExposureType = ExposureType.EXPOSURE): ExposureEvent { return ExposureEvent( payload = ExposureEntity(gameId = gameEntity?.id, - gameName = gameEntity?.name, + gameName = gameEntity?.name?.removeSuffix(Constants.GAME_NAME_DECORATOR), sequence = gameEntity?.sequence, platform = gameEntity?.platform, downloadType = gameEntity?.downloadType, diff --git a/app/src/main/java/com/gh/common/util/DataCollectionUtils.java b/app/src/main/java/com/gh/common/util/DataCollectionUtils.java index c802bf3eef..3ff2c16269 100644 --- a/app/src/main/java/com/gh/common/util/DataCollectionUtils.java +++ b/app/src/main/java/com/gh/common/util/DataCollectionUtils.java @@ -13,6 +13,8 @@ import com.lightgame.download.DownloadEntity; import java.util.HashMap; import java.util.Map; +import kotlin.text.StringsKt; + /** * Created by LGT on 2016/12/9. * 数据收集 工具类（data.ghzs666.com） @@ -32,7 +34,7 @@ public class DataCollectionUtils { // 上传下载数据（开始、完成） public static void uploadDownload(Context context, DownloadEntity downloadEntity, String status) { Map map = new HashMap<>(); - map.put("game", downloadEntity.getName()); + map.put("game", StringsKt.removeSuffix(downloadEntity.getName(), Constants.GAME_NAME_DECORATOR)); map.put("game_id", downloadEntity.getRealGameId(Constants.GAME_ID_DIVIDER)); if (downloadEntity.isPluggable()) { map.put("method", "插件化"); 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 b8fd4377bf..967561fca3 100644 --- a/app/src/main/java/com/gh/common/util/DownloadObserver.kt +++ b/app/src/main/java/com/gh/common/util/DownloadObserver.kt @@ -19,7 +19,10 @@ import com.gh.gamecenter.retrofit.RetrofitManager import com.gh.gamecenter.suggest.SuggestType import com.halo.assistant.HaloApp import com.halo.assistant.fragment.SettingsFragment -import com.lightgame.download.* +import com.lightgame.download.DataWatcher +import com.lightgame.download.DownloadEntity +import com.lightgame.download.DownloadStatus +import com.lightgame.download.FileUtils import com.lightgame.utils.AppManager import com.lightgame.utils.Util_System_Phone_State import com.lightgame.utils.Utils @@ -221,7 +224,7 @@ object DownloadObserver { } ExposureUtils.logADownloadCompleteExposureEvent( - GameEntity(id = downloadEntity.getRealGameId(Constants.GAME_ID_DIVIDER), mName = downloadEntity.name), + GameEntity(id = downloadEntity.getRealGameId(Constants.GAME_ID_DIVIDER), mName = downloadEntity.name.removeSuffix(Constants.GAME_NAME_DECORATOR)), downloadEntity.platform, downloadEntity.exposureTrace, type) diff --git a/app/src/main/java/com/gh/common/util/Extensions.kt b/app/src/main/java/com/gh/common/util/Extensions.kt index 83b245c5f5..ab12f08da6 100644 --- a/app/src/main/java/com/gh/common/util/Extensions.kt +++ b/app/src/main/java/com/gh/common/util/Extensions.kt @@ -468,7 +468,7 @@ fun Context.doOnMainProcessOnly(callback: EmptyCallback) { doOnMainProcessOnly { callback.onCallback() } } -fun Context.doOnMainProcessOnly(f: () -> Unit) { +inline fun Context.doOnMainProcessOnly(f: () -> Unit) { val processName = PackageUtils.obtainProcessName(this) if (processName == null || BuildConfig.APPLICATION_ID == processName) { f.invoke() diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListViewModel.kt index 1b62a51180..c2cac5e270 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListViewModel.kt @@ -33,7 +33,7 @@ class HistoryApkListViewModel(application: Application, var game: GameEntity) // 改变 id 避免其它地方根据原有 game id 变更状态 this.isReservable = false this.id = game.id + Constants.GAME_ID_DIVIDER + apk.version - this.name = game.name + " " // 历史版本加个空格避免其他用游戏名来判定是否待安装的地方错误判断 + this.name = game.name + Constants.GAME_NAME_DECORATOR // 历史版本加个空格避免其他用游戏名来判定是否待安装的地方错误判断 this.setApk(arrayListOf(apk)) }) }