From e2f6180d6d61da309f7a15b031c94fa1004de2d2 Mon Sep 17 00:00:00 2001
From: chenjuntao <chenjuntao@ghzhushou.com>
Date: Mon, 13 May 2019 11:00:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=85=89=E7=8E=AF=E5=8A=A9?=
 =?UTF-8?q?=E6=89=8BV3.6.4=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=EF=BC=88MTA=EF=BC=89=20https://gitlab.ghzs.com/pm/hal?=
 =?UTF-8?q?o-app-issues/issues/510?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/gh/download/DownloadManager.java | 10 ++++++++--
 .../com/gh/gamecenter/personal/PersonalFragment.java   |  2 ++
 app/src/main/java/com/gh/gamecenter/qa/AskFragment.kt  |  1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/gh/download/DownloadManager.java b/app/src/main/java/com/gh/download/DownloadManager.java
index 5746cce6d9..37d0e953ea 100644
--- a/app/src/main/java/com/gh/download/DownloadManager.java
+++ b/app/src/main/java/com/gh/download/DownloadManager.java
@@ -18,6 +18,7 @@ import com.gh.common.util.DataCollectionUtils;
 import com.gh.common.util.DialogUtils;
 import com.gh.common.util.GdtHelper;
 import com.gh.common.util.MD5Utils;
+import com.gh.common.util.MtaHelper;
 import com.gh.common.util.PackageUtils;
 import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.GameEntity;
@@ -92,8 +93,13 @@ public class DownloadManager implements DownloadStatusListener {
 
     @Override
     public void onTaskError(DownloadEntity entity) {
-        DownloadNotification.showDownloadingNotification(mContext);
-        downloadingMap.remove(entity.getUrl());
+        // 下载进度超出是任务出错，但不需要去掉状态栏通知 https://gitlab.ghzs.com/pm/halo-app-issues/issues/496
+        if (entity.getStatus() == DownloadStatus.overflow) {
+            MtaHelper.onEventWithBasicDeviceInfo("下载无法完成", "游戏", entity.getName());
+        } else {
+            DownloadNotification.showDownloadingNotification(mContext);
+            downloadingMap.remove(entity.getUrl());
+        }
     }
 
     @Override
diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java
index 98f8e45619..27cb134314 100644
--- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java
+++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.java
@@ -26,6 +26,7 @@ import com.gh.common.util.EntranceUtils;
 import com.gh.common.util.GetLoginDataUtils;
 import com.gh.common.util.ImageUtils;
 import com.gh.common.util.LogUtils;
+import com.gh.common.util.MtaHelper;
 import com.gh.common.util.PackageUtils;
 import com.gh.common.util.StringUtils;
 import com.gh.gamecenter.CollectionActivity;
@@ -367,6 +368,7 @@ public class PersonalFragment extends BaseFragment implements Observer<ApiRespon
                 break;
             case R.id.personal_history:
                 startActivity(HistoryActivity.getHistoryIntent(getContext(), "我的光环-浏览记录"));
+                MtaHelper.onEvent("问答页面", "我的光环", "浏览记录");
                 break;
         }
     }
diff --git a/app/src/main/java/com/gh/gamecenter/qa/AskFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/AskFragment.kt
index 882bc45842..8ed67df844 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/AskFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/AskFragment.kt
@@ -265,6 +265,7 @@ class AskFragment : BaseFragment<Any>() {
                     "问题-提问"
                 }
                 MtaHelper.onEvent("问答页面", "问答页面", positionType)
+                MtaHelper.onEvent("问答页面", UserManager.getInstance().community.name, positionType)
                 context?.ifLogin("(首页-问答)", action = {
                     startActivity(QuestionEditActivity.getIntent(context!!))
                 })