From 25cd08629811e93fbbf0f57ae80b6fcbb93eaf6c Mon Sep 17 00:00:00 2001
From: kehaoyuan <kehaoyuan@ghzhushou.com>
Date: Fri, 15 May 2020 13:32:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=9A=84checkRetryDownload(?=
 =?UTF-8?q?=E9=87=8D=E8=AF=95=E4=B8=8B=E8=BD=BD)=E6=94=BE=E5=88=B0initDown?=
 =?UTF-8?q?loadService(=E5=88=9D=E5=A7=8B=E5=8C=96=E4=B8=8B=E8=BD=BD)?=
 =?UTF-8?q?=E9=87=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/gh/download/DownloadManager.java  | 13 +++++--------
 .../main/java/com/gh/gamecenter/MainActivity.java   | 12 ++++++------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/gh/download/DownloadManager.java b/app/src/main/java/com/gh/download/DownloadManager.java
index 7abfbce134..a2771f56e6 100644
--- a/app/src/main/java/com/gh/download/DownloadManager.java
+++ b/app/src/main/java/com/gh/download/DownloadManager.java
@@ -2,14 +2,15 @@ package com.gh.download;
 
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import android.preference.PreferenceManager;
 import android.text.TextUtils;
 
+import androidx.annotation.Nullable;
+import androidx.collection.ArrayMap;
+
 import com.gh.common.AppExecutor;
 import com.gh.common.exposure.ExposureEvent;
 import com.gh.common.util.AppDebugConfig;
@@ -55,11 +56,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import androidx.annotation.Nullable;
-import androidx.collection.ArrayMap;
-
-import static android.os.Build.MANUFACTURER;
-
 public class DownloadManager implements DownloadStatusListener {
 
     private static DownloadManager mInstance;
@@ -282,7 +278,7 @@ public class DownloadManager implements DownloadStatusListener {
         } else if (PackageUtils.isCanUpdate(apkEntity, gameEntity.getId())) {
             downloadEntity.setUpdate(true);
         }
-        
+
         downloadEntity.setPlugin(!TextUtils.isEmpty(apkEntity.getGhVersion()));
 
         if (isSubscribe) {
@@ -637,6 +633,7 @@ public class DownloadManager implements DownloadStatusListener {
 
         // 开启下载服务, Fuck me, 即便是在启动页调用的方法，依然有可能触发 `unable  is in background`
         startDownloadService();
+        checkRetryDownload();
     }
 
     public void addObserver(DataWatcher dataWatcher) {
diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java
index bc43677ecf..cf4d0e2b42 100644
--- a/app/src/main/java/com/gh/gamecenter/MainActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java
@@ -23,6 +23,9 @@ import android.view.View;
 import android.view.Window;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.lifecycle.ViewModelProviders;
+
 import com.gh.base.AppUncaughtHandler;
 import com.gh.base.BaseActivity;
 import com.gh.base.fragment.BaseFragment_ViewPager;
@@ -116,8 +119,6 @@ import java.util.TimerTask;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import androidx.annotation.NonNull;
-import androidx.lifecycle.ViewModelProviders;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 import okhttp3.MediaType;
@@ -212,9 +213,10 @@ public class MainActivity extends BaseActivity {
                             "玩家操作", "点击关闭"));
         }
 
-//        checkTinkerPath(); // todo　看情况是否需要显示弹窗
+//        checkTinkerPath(); //　看情况是否需要显示补丁弹窗
 
-        checkRetryDownload();
+        // 必须放在这里，否在会导致获取baseActivity不是本应用包名
+        DownloadManager.getInstance(this).initDownloadService();
 
         checkNotificationPermission();
 
@@ -244,8 +246,6 @@ public class MainActivity extends BaseActivity {
             PushHelper.postPushClickAction(this.getApplicationContext(), null);
         }, 2000);
 
-        //必须放在这里，否在会导致获取baseActivity不是本应用包名
-        DownloadManager.getInstance(this).initDownloadService();
 
         // 耗时操作
         AppExecutor.getIoExecutor().execute(() -> {