From 3b47201d878ba8ff973b84baf15942475688e964 Mon Sep 17 00:00:00 2001 From: hxb <hxb@hdlchina.com.cn> Date: 星期五, 15 十二月 2023 16:04:28 +0800 Subject: [PATCH] 合并第一个版本 --- app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java index 0d490d5..51d3304 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java @@ -590,7 +590,7 @@ fos.flush(); fos.close(); is.close(); - //todo 鐢ㄦ埛缁堟瀹剁户缁鍙栨暟鎹�; + //todo 鐢ㄦ埛缁堟缁х画璇诲彇鏁版嵁; return false; } fos.write(buf, 0, len); @@ -641,8 +641,10 @@ * @param describe 鎻忚堪鏂囨湰 */ public void eventBusPost(String fileFullPath, String type, int progressValue, String describe) { + HdlLogLogic.print("杩涘害鍊�====" + progressValue + ""); + if (this.stopDownload) { - HdlFileLogic.getInstance().deleteFile(fileFullPath);//鍒犻櫎涓嬭浇涓嶅畬鎴愭暟鎹�; + HdlFileLogic.getInstance().deleteFile(fileFullPath);//鍒犻櫎涓嬭浇涓嶅畬鏁存暟鎹�; BaseEventBus baseEventBus = new BaseEventBus(); baseEventBus.setTopic(localDownloadProgress); Progress progress = new Progress(); @@ -661,11 +663,14 @@ Progress progress = new Progress(); progress.step = progressValue; progress.describe = describe; + progress.type = type; baseEventBus.setType(type); baseEventBus.setData(progress); EventBus.getDefault().post(baseEventBus); // } // }); + + } @@ -680,6 +685,8 @@ public int step; //杩涘害鎻忚堪淇℃伅 public String describe; + //琛ㄧず鏄┍鍔紝鍥轰欢; + public String type; } -- Gitblit v1.8.0