diff --git a/app/build.gradle b/app/build.gradle index e4ad6da..764f4a8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,11 +12,12 @@ android { minSdkVersion 22 targetSdkVersion 30 versionCode 6 - versionName "V2.0.8.11" + versionName "V2.0.8.12" // 2.0.8.2 修改网络连接证书设置、定时开关机设置 // 2.0.8.3 获取mac修改 // V2.0.8.5 同屏优化 // 2.0.8.6 视频播放器切换 + // 2.0.8.12 固件更新 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e777bf0..9ae3840 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -4,6 +4,7 @@ package="qianmu.container"> + diff --git a/app/src/main/java/qianmu/container/app/Constant.java b/app/src/main/java/qianmu/container/app/Constant.java index 2d8675b..5e539fb 100644 --- a/app/src/main/java/qianmu/container/app/Constant.java +++ b/app/src/main/java/qianmu/container/app/Constant.java @@ -25,12 +25,12 @@ public class Constant { public static String TTSHome=""; // sbc-思必驰 kdxf-科大讯飞 //public static String androidBoardType = ""; //设备板子型号 无固定版 // public static String androidBoardType = "ys"; // 设备板子型号 ys(亿晟) 北京颐堤港定制touch - public static String androidBoardType = "xwst"; //设备板子型号 xwst(欣威视通3399) + // public static String androidBoardType = "xwst"; //设备板子型号 xwst(欣威视通3399) // public static String androidBoardType = "xwst2"; //设备板子型号 xwst2(欣威视通3588、T982、3576) // public static String androidBoardType = "zc"; //设备板子型号 zc(卓策主板——王府井喜悦、杨浦中心医院) // public static String androidBoardType = "sx"; //设备板子型号 sx(视想) // public static String androidBoardType = "nova"; //设备板子型号 诺瓦盒子 华贸LED - // public static String androidBoardType = "huidu"; //设备板子型号 huidu(灰度主板) 罗湖寻车机 + public static String androidBoardType = "huidu"; //设备板子型号 huidu(灰度主板) 罗湖寻车机 // public static String androidBoardType = "bv"; //设备板子型号 Bv-3588M // public static String androidBoardType = "smt"; //设备板子型号 视美泰 diff --git a/app/src/main/java/qianmu/container/mqtt/MQTTService.java b/app/src/main/java/qianmu/container/mqtt/MQTTService.java index edca4f6..32092ce 100644 --- a/app/src/main/java/qianmu/container/mqtt/MQTTService.java +++ b/app/src/main/java/qianmu/container/mqtt/MQTTService.java @@ -805,6 +805,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.downloadFile(url, localPath, () -> { + LoggerUtil.e("updateImg", "固件下载完成"); SignWayUtil.updateSystem(localPath); }); } diff --git a/app/src/main/java/qianmu/container/util/SignWayUtil.java b/app/src/main/java/qianmu/container/util/SignWayUtil.java index e14c90e..de37034 100644 --- a/app/src/main/java/qianmu/container/util/SignWayUtil.java +++ b/app/src/main/java/qianmu/container/util/SignWayUtil.java @@ -520,6 +520,7 @@ public class SignWayUtil { // 估计升级 public static void updateSystem(String filePath){ if(Constant.androidBoardType.equals("ys")) { + LoggerUtil.e("固件安装:", filePath); MyManager manager = MyManager.getInstance(MyApplication.getInstance()); manager.setUpdateSystemDelete(true); // 升级成功后删除img文件 manager.upgradeSystem(filePath);