From 00cd4c1f1fb156a3909be5980a3bcfdc2f853943 Mon Sep 17 00:00:00 2001 From: juntao Date: Fri, 5 Jan 2024 11:50:34 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A5=9E=E7=AD=96=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=8F=A3=E5=BE=84=E5=88=87=E6=8D=A2=20https://jira.shanqu.cc/b?= =?UTF-8?q?rowse/GHZS-4461?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gh/common/util/DataUtils.java | 2 -- .../com/gh/gamecenter/SplashScreenActivity.kt | 1 + .../main/java/com/halo/assistant/HaloApp.java | 2 ++ gradle.properties | 2 +- .../gh/gamecenter/common/utils/SensorsBridge.kt | 5 ++--- .../core/provider/ISensorsProvider.kt | 2 +- module_sensors_data/build.gradle | 10 +++++----- .../gh/gamecenter/sensorsdata/SensorsHelper.kt | 17 ++++------------- .../sensorsdata/provider/SensorsProviderImpl.kt | 4 ++-- 9 files changed, 18 insertions(+), 27 deletions(-) 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 438e01e89d..78f85e4de1 100644 --- a/app/src/main/java/com/gh/common/util/DataUtils.java +++ b/app/src/main/java/com/gh/common/util/DataUtils.java @@ -125,8 +125,6 @@ public class DataUtils { HaloApp.getInstance().setGid(gid); - SensorsBridge.setGid(gid); - // 更新广告配置 ExtensionsKt.doOnMainProcessOnly(HaloApp.getInstance(), () -> { AdDelegateHelper.INSTANCE.requestAdConfig(false, "", null); diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt index 86aa960598..2163039db0 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt @@ -257,6 +257,7 @@ class SplashScreenActivity : BaseActivity() { HaloApp.getInstance().flavorProvider.init(HaloApp.getInstance(), this, PkgHelper.getActivateRatio()) SensorsBridge.init(HaloApp.getInstance(), HaloApp.getInstance().channel) + SensorsBridge.setOAID(HaloApp.getInstance().oaid) } private fun prefetchData() { diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java index b5e0630df6..f22452b9d4 100644 --- a/app/src/main/java/com/halo/assistant/HaloApp.java +++ b/app/src/main/java/com/halo/assistant/HaloApp.java @@ -54,6 +54,7 @@ import com.gh.gamecenter.common.utils.EnvHelper; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.common.utils.ImageUtils; import com.gh.gamecenter.common.utils.PackageFlavorHelper; +import com.gh.gamecenter.common.utils.SensorsBridge; import com.gh.gamecenter.core.AppExecutor; import com.gh.gamecenter.core.iinterface.IApplication; import com.gh.gamecenter.core.provider.IFlavorProvider; @@ -306,6 +307,7 @@ public class HaloApp extends MultiDexApplication { OAIDHelper.INSTANCE.getOAID(this, s -> { setOAID(s); MetaUtil.INSTANCE.refreshMeta(); + SensorsBridge.INSTANCE.setOAID(s); return null; }); } diff --git a/gradle.properties b/gradle.properties index 58114c96da..1ff774d1de 100644 --- a/gradle.properties +++ b/gradle.properties @@ -68,7 +68,7 @@ DEV_VAPI_HOST=https://dev-app-api.796697.com VAPI_HOST=https://app-api.796697.com DEV_SA_SERVER_URL=https://sensors-data-api.ghzs.com/sa?project=default -SA_SERVER_URL=https://sensors-data-api.ghzs.com/sa?project=production +SA_SERVER_URL=https://sensors-data-api.ghzs.com/sa?project=produciton_2 android.useAndroidX=true android.enableJetifier=true diff --git a/module_common/src/main/java/com/gh/gamecenter/common/utils/SensorsBridge.kt b/module_common/src/main/java/com/gh/gamecenter/common/utils/SensorsBridge.kt index 833464cf02..bb0d4425a3 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/utils/SensorsBridge.kt +++ b/module_common/src/main/java/com/gh/gamecenter/common/utils/SensorsBridge.kt @@ -155,9 +155,8 @@ object SensorsBridge { if (mIsSensorsEnabled) mSensor?.logout(loginId) } - @JvmStatic - fun setGid(gid: String) { - if (mIsSensorsEnabled) mSensor?.setGid(gid) + fun setOAID(oaid: String) { + if (mIsSensorsEnabled) mSensor?.setOAID(oaid) } @JvmStatic diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/ISensorsProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/ISensorsProvider.kt index 48c3bdf8f7..ce0b68219f 100644 --- a/module_core/src/main/java/com/gh/gamecenter/core/provider/ISensorsProvider.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/ISensorsProvider.kt @@ -11,7 +11,7 @@ interface ISensorsProvider : IProvider { fun logout(loginId: String) - fun setGid(gid: String) + fun setOAID(oaid: String) fun trackEvent(eventName: String, vararg kv: String = arrayOf()) diff --git a/module_sensors_data/build.gradle b/module_sensors_data/build.gradle index cad7ba0979..03a7c5dcf1 100644 --- a/module_sensors_data/build.gradle +++ b/module_sensors_data/build.gradle @@ -40,7 +40,7 @@ android { publish { dimension "env" - manifestPlaceholders.put("SENSORS_SCHEME" , "saf547873a") + manifestPlaceholders.put("SENSORS_SCHEME" , "sa9d121451") buildConfigField "String", "DEV_SA_SERVER_URL", "\"${SA_SERVER_URL}\"" buildConfigField "String", "SA_SERVER_URL", "\"${SA_SERVER_URL}\"" @@ -49,7 +49,7 @@ android { tea { dimension "env" - manifestPlaceholders.put("SENSORS_SCHEME" , "saf547873a") + manifestPlaceholders.put("SENSORS_SCHEME" , "sa9d121451") buildConfigField "String", "DEV_SA_SERVER_URL", "\"${SA_SERVER_URL}\"" buildConfigField "String", "SA_SERVER_URL", "\"${SA_SERVER_URL}\"" @@ -58,7 +58,7 @@ android { kuaishou { dimension "env" - manifestPlaceholders.put("SENSORS_SCHEME" , "saf547873a") + manifestPlaceholders.put("SENSORS_SCHEME" , "sa9d121451") buildConfigField "String", "DEV_SA_SERVER_URL", "\"${SA_SERVER_URL}\"" buildConfigField "String", "SA_SERVER_URL", "\"${SA_SERVER_URL}\"" @@ -67,7 +67,7 @@ android { gdt { dimension "env" - manifestPlaceholders.put("SENSORS_SCHEME" , "saf547873a") + manifestPlaceholders.put("SENSORS_SCHEME" , "sa9d121451") buildConfigField "String", "DEV_SA_SERVER_URL", "\"${SA_SERVER_URL}\"" buildConfigField "String", "SA_SERVER_URL", "\"${SA_SERVER_URL}\"" @@ -76,7 +76,7 @@ android { sm { dimension "env" - manifestPlaceholders.put("SENSORS_SCHEME" , "saf547873a") + manifestPlaceholders.put("SENSORS_SCHEME" , "sa9d121451") buildConfigField "String", "DEV_SA_SERVER_URL", "\"${SA_SERVER_URL}\"" buildConfigField "String", "SA_SERVER_URL", "\"${SA_SERVER_URL}\"" diff --git a/module_sensors_data/src/main/java/com/gh/gamecenter/sensorsdata/SensorsHelper.kt b/module_sensors_data/src/main/java/com/gh/gamecenter/sensorsdata/SensorsHelper.kt index de1c1c3a8f..17c3129dea 100644 --- a/module_sensors_data/src/main/java/com/gh/gamecenter/sensorsdata/SensorsHelper.kt +++ b/module_sensors_data/src/main/java/com/gh/gamecenter/sensorsdata/SensorsHelper.kt @@ -16,13 +16,10 @@ import org.json.JSONObject object SensorsHelper { private const val KEY_USER_ID = "identity_mongold_id" - private const val KEY_GID = "identity_g_id" + private const val KEY_OAID = "identity_oaid" private const val TAG = "SensorsHelper" - // 目前正在使用的 gid - private var mCurrentGid = "" - @JvmStatic fun init(context: Context, channel: String) { // 初始化 @@ -96,16 +93,10 @@ object SensorsHelper { } @JvmStatic - fun setGid(gid: String) { - Utils.log(TAG, "setGid $gid") + fun setOAID(oaid: String) { + Utils.log(TAG, "setOAID $oaid") - // 当前绑定的 gid 与即将绑定的 gid 不一样时，先解绑旧的 gid - if (mCurrentGid.isNotEmpty() && mCurrentGid != gid) { - SensorsDataAPI.sharedInstance().unbind(KEY_GID, mCurrentGid) - } - - mCurrentGid = gid - SensorsDataAPI.sharedInstance().bind(KEY_GID, gid) + SensorsDataAPI.sharedInstance().bind("$$KEY_OAID", oaid) } @JvmStatic diff --git a/module_sensors_data/src/main/java/com/gh/gamecenter/sensorsdata/provider/SensorsProviderImpl.kt b/module_sensors_data/src/main/java/com/gh/gamecenter/sensorsdata/provider/SensorsProviderImpl.kt index 2035b322a2..5d0a0170c9 100644 --- a/module_sensors_data/src/main/java/com/gh/gamecenter/sensorsdata/provider/SensorsProviderImpl.kt +++ b/module_sensors_data/src/main/java/com/gh/gamecenter/sensorsdata/provider/SensorsProviderImpl.kt @@ -27,8 +27,8 @@ class SensorsProviderImpl : ISensorsProvider { SensorsHelper.logout(loginId) } - override fun setGid(gid: String) { - SensorsHelper.setGid(gid) + override fun setOAID(oaid: String) { + SensorsHelper.setOAID(oaid) } override fun trackEvent(eventName: String, vararg kv: String) {