From 12d6db5780d8a2121a3bef2d58bf897b24ff552a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 12 六月 2024 15:54:29 +0800
Subject: [PATCH] Merge branch 'dev'
---
app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java | 10 +---------
1 files changed, 1 insertions(+), 9 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 da664cc..4606be1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
@@ -536,12 +536,10 @@
//-100:娌℃湁鏁版嵁;-101:娌℃湁md5绉橀挜;-102:md5绉橀挜涓嶅;-103:鏈夊紓甯�;
if (zipData == null) {
this.eventBusPost(fileFullPath, driver, -100, HDLApp.getInstance().getString(R.string.exception_unable_to_pull_up_the_cloud_upgrade_file_data));
-// HdlLogLogic.print("鎷変笉鍒颁簯绔崌绾ф枃浠舵暟鎹�(-100)", true);
return false;
}
if (TextUtils.isEmpty(md5)) {
this.eventBusPost(fileFullPath, driver, -101, HDLApp.getInstance().getString(R.string.exception_failed_to_obtain_the_md5_key_of_the_upgrade_file_on_the_cloud));
-// HdlLogLogic.print("鎷夸笉鍒颁簯绔笂鍗囩骇鏂囦欢md5绉橀挜(-101)", true);
return false;
}
InputStream is = null;
@@ -555,7 +553,6 @@
long total = zipData.contentLength();
if (total == 0) {
this.eventBusPost(fileFullPath, driver, -102, HDLApp.getInstance().getString(R.string.exception_unable_to_pull_up_the_cloud_upgrade_file_data));
-// HdlLogLogic.print("鎷変笉鍒颁簯绔崌绾ф枃浠舵暟鎹�(-102)", true);
return false;
}
fos = new FileOutputStream(file);
@@ -563,7 +560,6 @@
while ((len = is.read(buf)) != -1) {
if (this.stopDownload) {
this.eventBusPost(fileFullPath, driver, -108, HDLApp.getInstance().getString(R.string.exception_the_user_cancels_downloading_the_upgrade_file));
-// HdlLogLogic.print("鐢ㄦ埛鍙栨秷涓嬭浇鍗囩骇鏂囦欢(-108)", true);
fos.flush();
fos.close();
is.close();
@@ -576,8 +572,7 @@
int progress = (int) (100 * sum * 1.0f / total);
if (sum != total) {
//涓嶇瓑浜�100閮借鎶�,绛変簬100澶勭悊鏁村潡閫昏緫瀹屼箣鍚庡啀鎶�100;
- this.eventBusPost(fileFullPath, driver, progress, "姝ｅ父涓婃姤杩涘害鍊�--->" + progress);
-// HdlLogLogic.print("姝ｅ父涓婃姤杩涘害鍊�--->" + progress, true);
+ this.eventBusPost(fileFullPath, driver, progress, "姝ｅ父涓婃姤杩涘害鍊�---" + progress);
}
}
fos.flush();
@@ -589,18 +584,15 @@
byte[] decrypt = AesUtils.decrypt(bytes);
if (decrypt == null) {
this.eventBusPost(fileFullPath, driver, -105, HDLApp.getInstance().getString(R.string.exception_failed_to_decrypt_the_upgrade_aes_file));
-// HdlLogLogic.print("鍗囩骇鏂囦欢aes瑙ｅ瘑澶辫触(-105)", true);
return false;
}
String fileMD5 = Md5Utils.encodeMD5(decrypt);
if (TextUtils.isEmpty(fileMD5)) {
this.eventBusPost(fileFullPath, driver, -106, HDLApp.getInstance().getString(R.string.exception_failed_to_generate_md5_for_the_upgrade_file));
-// HdlLogLogic.print("鍗囩骇鏂囦欢鐢熸垚md5澶辫触澶辫触(-106)", true);
return false;
}
if (!md5.equals(fileMD5)) {
this.eventBusPost(fileFullPath, driver, -107, HDLApp.getInstance().getString(R.string.exception_description_failed_to_compare_the_md5_of_the_upgrade_file));
-// HdlLogLogic.print("鍗囩骇鏂囦欢md5姣斿澶辫触(-107)", true);
return false;
}
//todo 娉ㄦ剰:瑙ｅ瘑涔嬪悗锛岃閲嶆柊鍐欐暟鎹�;
--
Gitblit v1.8.0