From de14cc95ef42d1ab5d95b6c4edfbf433b7824b53 Mon Sep 17 00:00:00 2001
From: chenjuntao <chenjuntao@ghzhushou.com>
Date: Thu, 1 Aug 2019 15:30:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=89=E7=8E=AF=E5=8A=A9?=
 =?UTF-8?q?=E6=89=8BV3.6.6-=E6=9C=80=E5=90=8E=E4=BC=98=E5=8C=96=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85(14,=2015)=20https://gitlab.ghzs.com/pm/halo-app-issue?=
 =?UTF-8?q?s/issues/599?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/gh/common/util/DialogUtils.java  |  5 ++++-
 .../java/com/gh/common/util/DownloadItemUtils.java     | 10 ++++------
 .../java/com/gh/gamecenter/SplashScreenActivity.java   |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java
index 7f52353210..eb011c0ae8 100644
--- a/app/src/main/java/com/gh/common/util/DialogUtils.java
+++ b/app/src/main/java/com/gh/common/util/DialogUtils.java
@@ -983,10 +983,13 @@ public class DialogUtils {
 
         positiveTv.setOnClickListener(view -> {
             dialog.dismiss();
-            callback.onCallback();
             MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "点击我知道了");
         });
 
+        dialog.setOnDismissListener(d -> {
+            callback.onCallback();
+        });
+
         MtaHelper.onEvent("隐私政策弹窗", "隐私政策弹窗", "出现弹窗");
 
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
diff --git a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java
index 4489ebabfc..ebcbd9af51 100644
--- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java
+++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java
@@ -462,19 +462,17 @@ public class DownloadItemUtils {
             install(context, gameEntity, position, adapter);
         } else if (str.equals(context.getString(R.string.launch))) {
             if (entrance.contains("我的游戏")) {
-                MtaHelper.onEvent( "我的游戏_启动", "启动", gameEntity.getName());
+                MtaHelper.onEvent("我的游戏_启动", "启动", gameEntity.getName());
             }
             DataUtils.onGameLaunchEvent(context, gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), location);
             PackageUtils.launchApplicationByPackageName(context, gameEntity.getApk().get(0).getPackageName());
         } else if (str.equals(context.getString(R.string.waiting))
                 || str.equals(context.getString(R.string.downloading))) {
-            DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, () -> {
-                context.startActivity(DownloadManagerActivity.getDownloadMangerIntent(context,
-                        apk.getUrl(), entrance + "+(" + location.split(":")[0] + ")"));
-            });
+            context.startActivity(DownloadManagerActivity.getDownloadMangerIntent(context,
+                    apk.getUrl(), entrance + "+(" + location.split(":")[0] + ")"));
         } else if (str.equals(context.getString(R.string.update))) {
             if (entrance.contains("我的游戏")) {
-                MtaHelper.onEvent( "我的游戏_启动", "更新", gameEntity.getName());
+                MtaHelper.onEvent("我的游戏_启动", "更新", gameEntity.getName());
             }
             DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, () -> {
                 DialogUtils.checkDownload(context, apk.getSize(),
diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java
index 24df0a0682..5c4875e7f4 100644
--- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java
@@ -126,7 +126,7 @@ public class SplashScreenActivity extends BaseActivity {
             // 判断是不是光环的新用户
             if (SPUtils.getBoolean(SP_BRAND_NEW_USER, true)) {
                 showPrivacyPolicy(() -> {
-                    // 用户点击我知道了
+                    // Dialog dismiss 后的回调
                     SPUtils.setBoolean(SP_BRAND_NEW_USER, false);
                     requestPermissionAndLaunchMainActivity();
                 });