From 0ffbba06fc8c93e2b50fd72c560e66f482f77784 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=B6=E5=AD=90=E7=BB=B4?= <yeziwei@ghzhushou.com>
Date: Tue, 28 Mar 2023 09:21:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A5=9E=E7=AD=96=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=9F=8B=E7=82=B9=E7=AC=AC=E4=B8=80=E6=9C=9F=E2=80=940323?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95(=E8=B0=83=E6=95=B4AppLaunch=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6)=20https://jira.shanqu.cc/browse/GHZS-1788?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gh/gamecenter/SplashScreenActivity.kt | 23 ++++++-------------
 .../common/tracker/TrackerLogger.kt           |  2 --
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt
index e823365557..aafa8f5f2d 100644
--- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt
@@ -19,7 +19,6 @@ import androidx.viewpager.widget.ViewPager
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.alibaba.android.arouter.launcher.ARouter
 import com.g00fy2.versioncompare.Version
-import com.gh.common.constant.Config
 import com.gh.common.dialog.NewPrivacyPolicyDialogFragment
 import com.gh.common.util.*
 import com.gh.common.util.DialogUtils
@@ -107,8 +106,6 @@ class SplashScreenActivity : BaseActivity() {
                 SPUtils.setLong(Constants.SP_INITIAL_USAGE_TIME, System.currentTimeMillis())
                 HaloApp.getInstance().isBrandNewInstall = true
                 if (!PackageFlavorHelper.IS_TEST_FLAVOR) {
-                    initSensors()
-                    logAppLaunch()
                     showPrivacyDialog(guideLayout)
                 } else {
                     // Test dex2oat
@@ -122,16 +119,12 @@ class SplashScreenActivity : BaseActivity() {
                         object : EmptyCallback {
                             override fun onCallback() {
                                 SPUtils.setBoolean(Constants.SP_IS_DEV_ENV, false)
-                                initSensors()
-                                logAppLaunch()
                                 showPrivacyDialog(guideLayout)
                             }
                         },
                         object : EmptyCallback {
                             override fun onCallback() {
                                 SPUtils.setBoolean(Constants.SP_IS_DEV_ENV, true)
-                                initSensors()
-                                logAppLaunch()
                                 showPrivacyDialog(guideLayout)
                             }
 
@@ -145,8 +138,6 @@ class SplashScreenActivity : BaseActivity() {
                 cancelPreviousUpdateTask()
                 guideLayout.visibility = View.VISIBLE
                 //requestPermission()
-                initSensors()
-                logAppLaunch()
             }
         } else {
             if (com.gh.gamecenter.common.BuildConfig.BUILD_TIME != 0L) {
@@ -161,13 +152,6 @@ class SplashScreenActivity : BaseActivity() {
         }
     }
 
-    private fun initSensors() {
-        // 仅官网渠道和测试包启用神策
-        if ("GH_206" == HaloApp.getInstance().channel || PackageFlavorHelper.IS_TEST_FLAVOR) {
-            SensorsBridge.init(HaloApp.getInstance(), HaloApp.getInstance().channel)
-        }
-    }
-
     private fun logAppLaunch() {
         val packageUtilsConfig =
             ARouter.getInstance().build(RouteConsts.provider.packageUtils).navigation() as? IPackageUtilsProvider
@@ -183,6 +167,7 @@ class SplashScreenActivity : BaseActivity() {
                 put("package_name", packageName)
                 put("signature", signatureHash)
                 put("app_name", appProvider?.getAppName())
+                put("install_first_time", if (HaloApp.getInstance().isBrandNewInstall) "是" else "否")
             }
         }
         SensorsBridge.trackEvent("AppLaunch", trackEvent)
@@ -308,11 +293,17 @@ class SplashScreenActivity : BaseActivity() {
         overridePendingTransition(0, 0)
         startActivity(intent)
         doFlavorInit()
+        logAppLaunch()
         finish()
     }
 
     private fun doFlavorInit() {
         HaloApp.getInstance().flavorProvider.init(HaloApp.getInstance(), this)
+
+        // 仅官网渠道和测试包启用神策
+        if ("GH_206" == HaloApp.getInstance().channel || PackageFlavorHelper.IS_TEST_FLAVOR) {
+            SensorsBridge.init(HaloApp.getInstance(), HaloApp.getInstance().channel)
+        }
     }
 
     private fun getGitLogString(): String {
diff --git a/module_common/src/main/java/com/gh/gamecenter/common/tracker/TrackerLogger.kt b/module_common/src/main/java/com/gh/gamecenter/common/tracker/TrackerLogger.kt
index c0bbfcdfd4..395f57bf52 100644
--- a/module_common/src/main/java/com/gh/gamecenter/common/tracker/TrackerLogger.kt
+++ b/module_common/src/main/java/com/gh/gamecenter/common/tracker/TrackerLogger.kt
@@ -170,8 +170,6 @@ object TrackerLogger {
             jsonObject.put("meta", getMeta())
         }
         uploadToLoghub(jsonObject, true)
-
-        SensorsBridge.trackEvent("AppLaunchSuccessful")
     }
 
     private fun uploadToLoghub(jsonObject: JSONObject, uploadImmediately: Boolean) {