From df1ab5221dad67fefcee7095cf6e0b88f22c87a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=B6=E5=AD=90=E7=BB=B4?= <yeziwei@ghzhushou.com>
Date: Fri, 14 Jul 2023 16:35:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=95=85=E7=8E=A9?=
 =?UTF-8?q?=E5=8A=A9=E6=89=8B=E4=B8=8B=E8=BD=BD=E5=BC=B9=E7=AA=97=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E4=B8=8A=E6=8A=A5=E5=AE=89=E8=A3=85=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=9A=84=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/vspace/VSpace32DialogFragment.kt | 5 ++++-
 app/src/main/java/com/gh/vspace/VSpaceDialogFragment.kt   | 8 +++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/gh/vspace/VSpace32DialogFragment.kt b/app/src/main/java/com/gh/vspace/VSpace32DialogFragment.kt
index 90ccbc2c38..7a3529978a 100644
--- a/app/src/main/java/com/gh/vspace/VSpace32DialogFragment.kt
+++ b/app/src/main/java/com/gh/vspace/VSpace32DialogFragment.kt
@@ -46,6 +46,7 @@ class VSpace32DialogFragment : BaseDraggableDialogFragment() {
     private val mBinding by lazy { DialogVspace32Binding.inflate(layoutInflater) }
     private var mIsLogInstallShow = false
     private var mIsLogAutoInstallClick = false
+    private var mIsClickDownloadThisTime = false // 是否本次弹出Dialog点击的下载按钮
     private val mDataWatcher = object : DataWatcher() {
         override fun onDataChanged(downloadEntity: DownloadEntity) {
             if (downloadEntity.url == mDownloadUrl && isAdded) {
@@ -146,6 +147,8 @@ class VSpace32DialogFragment : BaseDraggableDialogFragment() {
                     downloadType
                 ).toJson()
 
+                mIsClickDownloadThisTime = true
+
                 AppExecutor.uiExecutor.executeWithDelay({
                     DownloadManager.getInstance().cancel(mDownloadUrl)
                     DownloadManager.getInstance().add(downloadEntity)
@@ -221,7 +224,7 @@ class VSpace32DialogFragment : BaseDraggableDialogFragment() {
                 val isVSpace32DownloadOnly =
                     downloadEntity.getMetaExtra(Constants.EXTRA_DOWNLOAD_TYPE) == Constants.VSPACE_32_DOWNLOAD_ONLY
                 val isAutoInstall = SPUtils.getBoolean(Constants.SP_AUTO_INSTALL, true)
-                if (!isVSpace32DownloadOnly && isAutoInstall && !mIsLogAutoInstallClick) {
+                if (!isVSpace32DownloadOnly && isAutoInstall && !mIsLogAutoInstallClick && mIsClickDownloadThisTime) {
                     NewFlatLogUtils.logHaloFunEvent("halo_fun_32_install_tip_dialog_click")
                     SensorsBridge.trackEvent("HaloFunExpandInstallButtonClick")
                     mIsLogAutoInstallClick = true
diff --git a/app/src/main/java/com/gh/vspace/VSpaceDialogFragment.kt b/app/src/main/java/com/gh/vspace/VSpaceDialogFragment.kt
index f9f01fe182..1f1d8b169e 100644
--- a/app/src/main/java/com/gh/vspace/VSpaceDialogFragment.kt
+++ b/app/src/main/java/com/gh/vspace/VSpaceDialogFragment.kt
@@ -59,6 +59,7 @@ class VSpaceDialogFragment : BaseDraggableDialogFragment() {
     private val mBinding by lazy { DialogVspaceBinding.inflate(layoutInflater) }
     private var mIsLogInstallShow = false
     private var mIsLogAutoInstallClick = false
+    private var mIsClickDownloadThisTime = false // 是否本次弹出Dialog点击的下载按钮
     private val mDataWatcher = object : DataWatcher() {
         override fun onDataChanged(downloadEntity: DownloadEntity) {
             if (((mAppEntity64 != null && downloadEntity.url == mDownloadUrl64) || (mAppEntity64 == null && downloadEntity.url == mDownloadUrl32)) && isAdded) {
@@ -159,6 +160,7 @@ class VSpaceDialogFragment : BaseDraggableDialogFragment() {
                 DataCollectionUtils.uploadDownload(HaloApp.getInstance(), downloadEntity32, "开始")
             }
 
+            mIsClickDownloadThisTime = true
             AppExecutor.uiExecutor.executeWithDelay({
                 if (downloadEntity64 != null) {
                     DownloadManager.getInstance().cancel(mDownloadUrl64)
@@ -318,7 +320,11 @@ class VSpaceDialogFragment : BaseDraggableDialogFragment() {
                     mIsLogInstallShow = true
                 }
 
-                if (SPUtils.getBoolean(Constants.SP_AUTO_INSTALL, true) && !mIsLogAutoInstallClick) {
+                if (SPUtils.getBoolean(
+                        Constants.SP_AUTO_INSTALL,
+                        true
+                    ) && !mIsLogAutoInstallClick && mIsClickDownloadThisTime
+                ) {
                     SensorsBridge.trackEvent("HaloFunInstallButtonClick", "space_schema_type", vSpaceType)
                     mIsLogAutoInstallClick = true
                 }