From 6793945606c4b43cd06cbbc7719c42531cd519a6 Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Tue, 30 May 2023 11:00:15 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=8B=E8=BD=BD=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=9F=8B=E7=82=B9=E8=A1=A5=E5=85=85=20https://jira.shanqu.cc/b?= =?UTF-8?q?rowse/GHZS-2406?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/common/exposure/ExposureUtils.kt | 9 ++++++-- .../java/com/gh/common/util/DataUtils.java | 21 ++++++++++++++----- .../java/com/gh/common/util/RealNameHelper.kt | 17 +++++++++++++++ .../com/gh/download/DownloadDataHelper.kt | 6 ++++++ .../common/entity/ExposureEntity.kt | 2 ++ 5 files changed, 48 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/gh/common/exposure/ExposureUtils.kt b/app/src/main/java/com/gh/common/exposure/ExposureUtils.kt index dd5c12eef6..50579a1ee2 100644 --- a/app/src/main/java/com/gh/common/exposure/ExposureUtils.kt +++ b/app/src/main/java/com/gh/common/exposure/ExposureUtils.kt @@ -3,6 +3,7 @@ package com.gh.common.exposure import android.text.TextUtils import com.g00fy2.versioncompare.Version import com.gh.common.util.PackageUtils +import com.gh.common.util.RealNameHelper import com.gh.gamecenter.common.utils.FixedSizeLinkedHashSet import com.gh.gamecenter.common.utils.toObject import com.gh.gamecenter.feature.entity.ApkEntity @@ -42,7 +43,9 @@ object ExposureUtils { source = traceEvent?.source ?: ArrayList(), eTrace = ExposureTraceUtils.appendTrace(traceEvent), event = ExposureType.DOWNLOAD - ) + ).apply { + this.payload.certification = RealNameHelper.getCertificationStatus() + } if (!TextUtils.isEmpty(entity.id)) { ExposureManager.log(exposureEvent) } @@ -78,7 +81,9 @@ object ExposureUtils { source = traceEvent?.source ?: ArrayList(), eTrace = ExposureTraceUtils.appendTrace(traceEvent), event = ExposureType.DOWNLOAD_COMPLETE - ) + ).apply { + this.payload.certification = RealNameHelper.getCertificationStatus() + } exposureEvent.payload.host = host exposureEvent.payload.path = path exposureEvent.payload.speed = speed diff --git a/app/src/main/java/com/gh/common/util/DataUtils.java b/app/src/main/java/com/gh/common/util/DataUtils.java index 0cb4dbb671..b228171c8d 100644 --- a/app/src/main/java/com/gh/common/util/DataUtils.java +++ b/app/src/main/java/com/gh/common/util/DataUtils.java @@ -171,14 +171,25 @@ public class DataUtils { IdCardEntity idCardEntity = data.getIdCard(); if (idCardEntity != null) { - values.put(GhContentProvider.KEY_IS_CERTIFICATED, !TextUtils.isEmpty(data.getIdCard().getId())); // 是否认证 - values.put(GhContentProvider.KEY_IS_ADULT, - data.getIdCard().getMinor() == null - || !data.getIdCard().getMinor() - ); + boolean isCertificated = !TextUtils.isEmpty(data.getIdCard().getId()); + boolean isAdult = data.getIdCard().getMinor() == null || !data.getIdCard().getMinor(); + + values.put(GhContentProvider.KEY_IS_CERTIFICATED, isCertificated); // 是否认证 + values.put(GhContentProvider.KEY_IS_ADULT, isAdult); // 是否成年 + + if (!isCertificated) { + RealNameHelper.updateCertificationStatus(0); + } else { + if (isAdult) { + RealNameHelper.updateCertificationStatus(2); + } else { + RealNameHelper.updateCertificationStatus(1); + } + } } else { values.put(GhContentProvider.KEY_IS_CERTIFICATED, false); values.put(GhContentProvider.KEY_IS_ADULT, false); + RealNameHelper.updateCertificationStatus(0); } EventBus.getDefault().post(new EBReuse(Constants.EB_REALNAME_RESULT)); diff --git a/app/src/main/java/com/gh/common/util/RealNameHelper.kt b/app/src/main/java/com/gh/common/util/RealNameHelper.kt index 8c545434f8..1c38889a9b 100644 --- a/app/src/main/java/com/gh/common/util/RealNameHelper.kt +++ b/app/src/main/java/com/gh/common/util/RealNameHelper.kt @@ -16,6 +16,9 @@ object RealNameHelper { var pendingInstallPkgPath = "" + // 0表示未实名，1表示未成年，2表示成年 + private var mCertificationStatus: Int = 0 + /** * 弹未成年人不能下载游戏弹窗 */ @@ -124,7 +127,21 @@ object RealNameHelper { DownloadManager.getInstance() .addInvisiblePendingTask(downloadEntity) } + } + /** + * 获取实名状态 0表示未实名，1表示未成年，2表示成年 + */ + fun getCertificationStatus(): Int { + return mCertificationStatus + } + + /** + * 更新实名状态 0表示未实名，1表示未成年，2表示成年 + */ + @JvmStatic + fun updateCertificationStatus(newCertificationStatus: Int) { + mCertificationStatus = newCertificationStatus } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/download/DownloadDataHelper.kt b/app/src/main/java/com/gh/download/DownloadDataHelper.kt index 6b09c37ae1..fdd4b28bc3 100644 --- a/app/src/main/java/com/gh/download/DownloadDataHelper.kt +++ b/app/src/main/java/com/gh/download/DownloadDataHelper.kt @@ -3,6 +3,7 @@ package com.gh.download import android.content.pm.PackageInfo import android.text.TextUtils import com.gh.common.util.PackageUtils +import com.gh.common.util.RealNameHelper import com.gh.common.xapk.XapkInstaller import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.common.exposure.meta.MetaUtil @@ -125,6 +126,7 @@ object DownloadDataHelper { payloadObject.put("gameName", downloadEntity.name) payloadObject.put("platform", downloadEntity.platform) payloadObject.put("package", downloadEntity.packageName) + payloadObject.put("certification", RealNameHelper.getCertificationStatus()) payloadObject.put("filename", getFileName(downloadEntity)) payloadObject.put("task_num", NDataChanger.downloadingTasks.size) jsonObject.put("payload", payloadObject) @@ -209,6 +211,7 @@ object DownloadDataHelper { payloadObject.put("gameName", downloadEntity.name) payloadObject.put("platform", downloadEntity.platform) payloadObject.put("package", downloadEntity.packageName) + payloadObject.put("certification", RealNameHelper.getCertificationStatus()) payloadObject.put("filename", getFileName(downloadEntity)) payloadObject.put("launch_ms", startupTime) payloadObject.put("task_num", NDataChanger.downloadingTasks.size) @@ -247,6 +250,7 @@ object DownloadDataHelper { payloadObject.put("gameName", downloadEntity.name) payloadObject.put("platform", downloadEntity.platform) payloadObject.put("package", downloadEntity.packageName) + payloadObject.put("certification", RealNameHelper.getCertificationStatus()) payloadObject.put("filename", getFileName(downloadEntity)) payloadObject.put("total_size", sizeInMB) if (parallel != null) { @@ -317,6 +321,7 @@ object DownloadDataHelper { payloadObject.put("gameName", downloadEntity.name) payloadObject.put("platform", downloadEntity.platform) payloadObject.put("package", downloadEntity.packageName) + payloadObject.put("certification", RealNameHelper.getCertificationStatus()) payloadObject.put("filename", getFileName(downloadEntity)) payloadObject.put("speed_progress", JSONArray(averageSpeedList)) payloadObject.put("is_finished", downloadEntity.status == DownloadStatus.done) @@ -356,6 +361,7 @@ object DownloadDataHelper { sheet.put("game_id", downloadEntity.gameId) sheet.put("platform", downloadEntity.platform) sheet.put("package", downloadEntity.packageName) + sheet.put("certification", RealNameHelper.getCertificationStatus()) sheet.put("filename", getFileName(downloadEntity)) sheet.put("total_size", downloadEntity.size / 1024 / 1024) sheet.put("current_progress_size", downloadEntity.progress / 1024) diff --git a/module_common/src/main/java/com/gh/gamecenter/common/entity/ExposureEntity.kt b/module_common/src/main/java/com/gh/gamecenter/common/entity/ExposureEntity.kt index fedee4b892..1aa15a016a 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/entity/ExposureEntity.kt +++ b/module_common/src/main/java/com/gh/gamecenter/common/entity/ExposureEntity.kt @@ -32,6 +32,8 @@ class ExposureEntity( val isPlatformRecommend: Boolean? = false, var speed: Long = 0, + var certification: Int? = null, // 0表示未实名，1表示未成年，2表示成年 + // 外层内容 id (包括) // 1. "test_server_id" : "", // 开测表 ID // 2. "block_id" : "", // 板块 ID