From 6ab8b243530fb6abb2cc825898bb32ec61d6119e Mon Sep 17 00:00:00 2001
From: chenjuntao <chenjuntao@ghzhushou.com>
Date: Tue, 31 Dec 2019 15:24:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E4=B8=8B=E8=BD=BD=E7=9B=AE=E5=BD=95=E6=97=A7=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=8C=85=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gh/gamecenter/SplashScreenActivity.java   | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java
index 783e4bd991..465d8b3a36 100644
--- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java
@@ -15,11 +15,7 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import androidx.annotation.NonNull;
-import androidx.core.app.ActivityCompat;
-import androidx.viewpager.widget.PagerAdapter;
-import androidx.viewpager.widget.ViewPager;
-
+import com.g00fy2.versioncompare.Version;
 import com.gh.base.BaseActivity;
 import com.gh.common.util.DataUtils;
 import com.gh.common.util.DeviceTokenUtils;
@@ -44,7 +40,6 @@ import com.gh.gamecenter.user.UserRepository;
 import com.halo.assistant.HaloApp;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.download.FileUtils;
-import com.lightgame.utils.Utils;
 import com.qq.gdt.action.ActionType;
 
 import org.jetbrains.annotations.NotNull;
@@ -55,6 +50,10 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 import pub.devrel.easypermissions.AfterPermissionGranted;
@@ -241,7 +240,7 @@ public class SplashScreenActivity extends BaseActivity {
         if (EasyPermissions.hasPermissions(this, mPermissions)) {
             MtaHelper.onEvent("授权情况", "启动授权", "都授权");
             // 检查是否有旧版本光环，有就删掉
-            HaloApp.getInstance().getMainExecutor().execute(this::checkOldGhFile);
+            HaloApp.getInstance().getMainExecutor().execute(this::deleteOutdatedUpdatePackage);
         } else {
             ActivityCompat.requestPermissions(this, mPermissions, REQUEST_PERMISSION_TAG);
         }
@@ -268,7 +267,7 @@ public class SplashScreenActivity extends BaseActivity {
     private void logGrantedPermission(List<String> perms) {
         if (perms.size() == 1) {
             MtaHelper.onEvent("授权情况", "启动授权", "只授权存储");
-            HaloApp.getInstance().getMainExecutor().execute(this::checkOldGhFile);
+            HaloApp.getInstance().getMainExecutor().execute(this::deleteOutdatedUpdatePackage);
         } else {
             if (perms.contains(Manifest.permission.READ_PHONE_STATE)) {
                 MtaHelper.onEvent("授权情况", "启动授权", "都不授权");
@@ -279,7 +278,8 @@ public class SplashScreenActivity extends BaseActivity {
     }
 
     // 检查下载文件夹下是否有旧版本的光环助手的包，有则删除
-    private void checkOldGhFile() {
+    @SuppressWarnings("ResultOfMethodCallIgnored")
+    private void deleteOutdatedUpdatePackage() {
         File folder = new File(FileUtils.getDownloadDir(this) + File.separator);
         if (folder.isDirectory()) {
             for (File file : folder.listFiles()) {
@@ -288,13 +288,13 @@ public class SplashScreenActivity extends BaseActivity {
                     int index = name.indexOf("_");
                     if (index != -1) {
                         try {
-                            float version = Float.valueOf(name.substring(name.indexOf("V") + 1, index));
-                            float currentVersion = Float.valueOf(PackageUtils.getVersionName());
-                            if (version <= currentVersion && file.delete()) {
-                                Utils.log(file.getName() + " file delete success.");
+                            String versionString = name.substring(name.indexOf("V") + 1, index);
+                            Version currentVersion = new Version(PackageUtils.getVersionName());
+                            if (currentVersion.isHigherThan(versionString) || currentVersion.isEqual(versionString)) {
+                                file.delete();
                             }
-                        } catch (Exception ignore) {
-
+                        } catch (Exception exception) {
+                            exception.printStackTrace();
                         }
                     }
                 }