From 8866d7f71e55f6e88b3bbc2d7f64dc70b6f62ead Mon Sep 17 00:00:00 2001
From: chenjuntao <chenjuntao@ghzhushou.com>
Date: Wed, 21 Nov 2018 17:34:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=209.0=20=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=B2=A1=E6=9C=89=E8=AF=BB=E5=86=99=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E4=BC=9A=E5=B4=A9=E6=BA=83=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gh/common/exposure/time/Corrector.kt   |  2 ++
 .../java/com/gh/common/util/PackageUtils.java  | 18 +++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/gh/common/exposure/time/Corrector.kt b/app/src/main/java/com/gh/common/exposure/time/Corrector.kt
index 8520c08384..e22046b44d 100644
--- a/app/src/main/java/com/gh/common/exposure/time/Corrector.kt
+++ b/app/src/main/java/com/gh/common/exposure/time/Corrector.kt
@@ -9,6 +9,7 @@ class Corrector {
 
     companion object {
         const val TIME_CORRECTOR_ADJUST_PERIOD: Long = 600000
+
     }
 
     var delta: Long = 0
@@ -18,6 +19,7 @@ class Corrector {
             RetrofitManager.getInstance(HaloApp.getInstance().application).api.time
                     .subscribeOn(Schedulers.io())
                     .subscribe({
+                        // TODO Fix time parsing format.
                         val serverTime = java.lang.Long.parseLong(it.string())
                         delta = serverTime * 1000 - System.currentTimeMillis()
                     }, Throwable::printStackTrace)
diff --git a/app/src/main/java/com/gh/common/util/PackageUtils.java b/app/src/main/java/com/gh/common/util/PackageUtils.java
index e4c064edcd..42ad1da1eb 100644
--- a/app/src/main/java/com/gh/common/util/PackageUtils.java
+++ b/app/src/main/java/com/gh/common/util/PackageUtils.java
@@ -181,15 +181,15 @@ public class PackageUtils {
      * 启动安装应用程序
      */
     public static void launchSetup(final Context context, final String path) {
-        if (isCanLaunchSetup(context, path)) {
-            context.startActivity(PackageUtils.getInstallIntent(context, path));
-        } else {
-            DialogUtils.showPluginDialog(context, new DialogUtils.ConfirmListener() {
-                @Override
-                public void onConfirm() {
-                    context.startActivity(PackageUtils.getUninstallIntent(context, path));
-                }
-            });
+        try {
+            if (isCanLaunchSetup(context, path)) {
+                context.startActivity(PackageUtils.getInstallIntent(context, path));
+            } else {
+                DialogUtils.showPluginDialog(context,
+                        () -> context.startActivity(PackageUtils.getUninstallIntent(context, path)));
+            }
+        } catch (Exception e) {
+            Utils.toast(context, e.getMessage());
         }
     }