1、增加避免重复安装同一个安装文件的机制

2、更新daemon第三方库版本 3、增加daemon的权限，使其可以正确输出日志文件及删除更新包文件

1、增加避免重复安装同一个安装文件的机制
2、更新daemon第三方库版本 3、增加daemon的权限，使其可以正确输出日志文件及删除更新包文件
168208bd · pye52 · 47898798 · 168208bd · 168208bd · 168208bd
Commit 168208bd authored May 14, 2020 by pye52
5 changed files
--- a/app/src/main/java/com/bgycc/smartcanteen/command/UpdateCommandWorker.java
+++ b/app/src/main/java/com/bgycc/smartcanteen/command/UpdateCommandWorker.java
@@ -8,7 +8,6 @@ import androidx.work.WorkerParameters;
 import com.bgycc.smartcanteen.BuildConfig;
 import com.bgycc.smartcanteen.api.SCRetrofit;
 import com.bgycc.smartcanteen.entity.CommandUpdate;
-import com.bgycc.smartcanteen.executor.SCTaskExecutor;
 import com.bgycc.smartcanteen.utils.DeviceProxy;
 import com.bgycc.smartcanteen.utils.TrustAllCerts;
 import com.blankj.utilcode.util.AppUtils;
@@ -20,7 +19,6 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.concurrent.TimeUnit;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -41,8 +39,7 @@ public class UpdateCommandWorker extends CommandWorker {
    private static final String UPDATE_APK = "SmartCanteen-update.apk";
    private static final String UPDATE_APK_PATH = PathUtils.getExternalStoragePath();
    private static final int BUFFER_SIZE = 8 * 1024;
-    // 下载完毕到唤起安装的延迟
+    private static final long DEFAULT_DELAY = 3 * 1000;
-    private static final long INSTALL_DELAY = 500;
    // 保证更新任务不会在同一时间内重复执行
    private CommandUpdate commandUpdate;
@@ -61,6 +58,18 @@ public class UpdateCommandWorker extends CommandWorker {
            return failed("更新包地址异常");
        }
        File updateApk = new File(UPDATE_APK_PATH, UPDATE_APK);
+        if (updateApk.exists()) {
+            // 若文件存在，则检查安装文件版本是否与当前应用版本一致
+            // 若一致则说明已安装完毕，直接返回即可
+            AppUtils.AppInfo info = AppUtils.getApkInfo(updateApk);
+            if (info != null
+                    && info.getPackageName().equals(BuildConfig.APPLICATION_ID)
+                    && info.getVersionCode() == BuildConfig.VERSION_CODE) {
+                LogUtils.d(TAG, "版本" + info.getVersionCode() + "已安装完毕");
+                updateApk.deleteOnExit();
+                return success("已是最新版本");
+            }
+        }
        updateApk.deleteOnExit();
        String url = commandUpdate.getData().getUrl();
@@ -121,6 +130,13 @@ public class UpdateCommandWorker extends CommandWorker {
            }
        }
+        // 强制显示一次100%进度，避免下载太快跳帧
+        inProgress("下载进度: 100%");
+        // 强制等待一段时间，避免下载太快跳帧
+        try {
+            Thread.sleep(DEFAULT_DELAY);
+        } catch (InterruptedException ignored) {
+        }
        // 检查apk是否为合法安装文件并进入安装状态
        AppUtils.AppInfo info = AppUtils.getApkInfo(updateApk);
        LogUtils.d(TAG, "更新包下载成功，开始安装: " + (info == null ? "null" : info.getPackageName()));
@@ -137,17 +153,13 @@ public class UpdateCommandWorker extends CommandWorker {
            LogUtils.d(TAG, "不允许安装低版本");
            inProgress("不允许安装低版本");
        } else {
-            // 安装任务需要抛到其他线程进行操作，当前任务直接返回
-            SCTaskExecutor.getInstance()
-                    .schedule(() -> {
            LogUtils.d(TAG, "开始安装更新包: " + updateApk.getAbsolutePath());
            if (DeviceProxy.updateApp(updateApk)) {
                inProgress("开始安装");
            } else {
                inProgress("安装文件权限修改失败");
            }
-                    }, INSTALL_DELAY, TimeUnit.MILLISECONDS);
        }
-        return success("开始安装更新包");
+        return success("下载成功，开始安装");
    }
 }
--- a/build.gradle
+++ b/build.gradle
 buildscript {
    ext {
-        daemon_verson_code = 10
+        daemon_verson_code = 11
-        daemon_verson_name = "1.0"
+        daemon_verson_name = "1.1"
    }
    repositories {
        google()

--- a/daemon/build.gradle
+++ b/daemon/build.gradle
@@ -100,5 +100,5 @@ dependencies {
    testImplementation 'junit:junit:4.13'
    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    implementation 'com.blankj:utilcodex:1.26.0'
+    implementation 'com.blankj:utilcodex:1.28.4'
 }
--- a/daemon/src/main/AndroidManifest.xml
+++ b/daemon/src/main/AndroidManifest.xml
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.bgycc.smartcanteen.daemon">
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
    <application
        android:allowBackup="true"
        android:icon="@mipmap/ic_launcher"

--- a/daemon/src/main/java/com/bgycc/smartcanteen/daemon/ServiceApplication.java
+++ b/daemon/src/main/java/com/bgycc/smartcanteen/daemon/ServiceApplication.java
@@ -12,18 +12,20 @@ import java.io.File;
 public class ServiceApplication extends Application {
    private static final String LOG_PREFIX = "daemon";
    private static final String LOG_DIR = "log";
+    // 日志文件保留周期
+    private static final int LOG_SAVE_DAYS = 7;
    @Override
    public void onCreate() {
        super.onCreate();
-        Utils.init(getApplicationContext());
+        Utils.init(this);
-        CrashUtils.init();
        String logDir = PathUtils.getExternalStoragePath() + File.separator + LOG_DIR;
        CrashUtils.init(logDir);
        LogUtils.getConfig()
                .setDir(logDir)
                .setLog2FileSwitch(true)
                .setBorderSwitch(false)
-                .setFilePrefix(LOG_PREFIX);
+                .setFilePrefix(LOG_PREFIX)
+                .setSaveDays(LOG_SAVE_DAYS);
    }
 }