diff --git a/app/src/main/java/qianmu/container/mqtt/MQTTService.java b/app/src/main/java/qianmu/container/mqtt/MQTTService.java index b49b39d..bc91800 100644 --- a/app/src/main/java/qianmu/container/mqtt/MQTTService.java +++ b/app/src/main/java/qianmu/container/mqtt/MQTTService.java @@ -558,8 +558,9 @@ public class MQTTService extends Service { public void systemUpdate(CloseMqttBean closeMqttBean){ String url = closeMqttBean.getData().getUpdate().getUrl(); String version = closeMqttBean.getData().getUpdate().getFirmwareIssueVersion(); + LoggerUtil.e("固件升级版本:", version); if(!version.equals(SignWayUtil.getFirmwareVersion()) && !StringUtil.isEmpty(url)){ - downloadImgFile(url,"update.img"); + downloadImgFile(url,"update.zip"); } } @@ -774,6 +775,7 @@ public class MQTTService extends Service { */ private void downloadImgFile(String url,final String appName) { final String localPath = StringUtil.strSplice(Constant.CACHE_PATH, "update/", appName); + FileUtil.deleteFile(localPath); FileUtil.downloadFile(url, localPath, () -> { LoggerUtil.e("updateImg", "固件下载完成"); SignWayUtil.updateSystem(localPath); diff --git a/app/src/main/java/qianmu/container/util/DeviceDataUtil.java b/app/src/main/java/qianmu/container/util/DeviceDataUtil.java index f254c05..6705c1a 100644 --- a/app/src/main/java/qianmu/container/util/DeviceDataUtil.java +++ b/app/src/main/java/qianmu/container/util/DeviceDataUtil.java @@ -19,7 +19,7 @@ import qianmu.container.entity.DeviceBean; public class DeviceDataUtil { //保存LOG日志的目录 - public static final String SAVE_LOG_DIR_PATH = StringUtil.strSplice(Constant.CACHE_PATH, "/DeviceData"); + public static final String SAVE_LOG_DIR_PATH = StringUtil.strSplice(Constant.CACHE_PATH, "DeviceData"); //用于打印error级的日志信息 public static void e(String data) { diff --git a/app/src/main/java/qianmu/container/util/LoggerUtil.java b/app/src/main/java/qianmu/container/util/LoggerUtil.java index 42aa317..a4b4275 100644 --- a/app/src/main/java/qianmu/container/util/LoggerUtil.java +++ b/app/src/main/java/qianmu/container/util/LoggerUtil.java @@ -46,7 +46,7 @@ public class LoggerUtil { private static boolean isPrintStackInfo = true;//异常日志打印控制开关 //保存LOG日志的目录 - public static final String SAVE_LOG_DIR_PATH = StringUtil.strSplice(Constant.CACHE_PATH, "/LogDir"); + public static final String SAVE_LOG_DIR_PATH = StringUtil.strSplice(Constant.CACHE_PATH, "LogDir"); //日志打印时间Format private static final SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); private static final SimpleDateFormat dataFormat = new SimpleDateFormat("yyyy-MM-dd"); diff --git a/app/src/main/java/qianmu/container/util/SignWayUtil.java b/app/src/main/java/qianmu/container/util/SignWayUtil.java index 19ac7ac..86cc950 100644 --- a/app/src/main/java/qianmu/container/util/SignWayUtil.java +++ b/app/src/main/java/qianmu/container/util/SignWayUtil.java @@ -567,6 +567,7 @@ public class SignWayUtil { if(Constant.androidBoardType.equals("ys")) { LoggerUtil.e("固件安装:", filePath); MyManager manager = MyManager.getInstance(MyApplication.getInstance()); + manager. setUpdateSystemWithDialog(false);//设置升级固件弹窗确认 manager.setUpdateSystemDelete(true); // 升级成功后删除img文件 manager.upgradeSystem(filePath); } diff --git a/app/src/main/res/layout/activity_update_file.xml b/app/src/main/res/layout/activity_update_file.xml index e892eaf..94416d2 100644 --- a/app/src/main/res/layout/activity_update_file.xml +++ b/app/src/main/res/layout/activity_update_file.xml @@ -4,16 +4,18 @@ +