From e57e1c01a52a326343122d458ad3bd330fc9d347 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 07 二月 2025 16:40:29 +0800
Subject: [PATCH] Merge branch '1.5.1'
---
app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 dd92a50..5df0ee2 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
@@ -542,11 +542,11 @@
this.stopDownload = false;
//-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));
+ this.eventBusPost(fileFullPath, driver, -100, HDLApp.getInstance().getAppLocaleContext().getString(R.string.exception_unable_to_pull_up_the_cloud_upgrade_file_data));
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));
+ this.eventBusPost(fileFullPath, driver, -101, HDLApp.getInstance().getAppLocaleContext().getString(R.string.exception_failed_to_obtain_the_md5_key_of_the_upgrade_file_on_the_cloud));
return false;
}
InputStream is = null;
@@ -559,14 +559,14 @@
is = zipData.byteStream();
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));
+ this.eventBusPost(fileFullPath, driver, -102, HDLApp.getInstance().getAppLocaleContext().getString(R.string.exception_unable_to_pull_up_the_cloud_upgrade_file_data));
return false;
}
fos = new FileOutputStream(file);
long sum = 0;
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));
+ this.eventBusPost(fileFullPath, driver, -108, HDLApp.getInstance().getAppLocaleContext().getString(R.string.exception_the_user_cancels_downloading_the_upgrade_file));
fos.flush();
fos.close();
is.close();
@@ -590,22 +590,22 @@
//todo 涓嬭浇鏂囦欢闇�瑕佽В瀵嗕箣鍚庡啀杩涜md5鍘诲仛姣斿
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));
+ this.eventBusPost(fileFullPath, driver, -105, HDLApp.getInstance().getAppLocaleContext().getString(R.string.exception_failed_to_decrypt_the_upgrade_aes_file));
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));
+ this.eventBusPost(fileFullPath, driver, -106, HDLApp.getInstance().getAppLocaleContext().getString(R.string.exception_failed_to_generate_md5_for_the_upgrade_file));
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));
+ this.eventBusPost(fileFullPath, driver, -107, HDLApp.getInstance().getAppLocaleContext().getString(R.string.exception_description_failed_to_compare_the_md5_of_the_upgrade_file));
return false;
}
//todo 娉ㄦ剰:瑙ｅ瘑涔嬪悗锛岃閲嶆柊鍐欐暟鎹�;
HdlFileLogic.getInstance().writeFile(fileFullPath, decrypt);
// FileUtils.writeByteArrayToFile(file, decrypt, false);//杩欎釜鏂规硶涓嶅吋鐢╝ndroid 6.0
- this.eventBusPost(fileFullPath, driver, 100, HDLApp.getInstance().getString(R.string.exception_the_upgrade_file_is_downloaded));
+ this.eventBusPost(fileFullPath, driver, 100, HDLApp.getInstance().getAppLocaleContext().getString(R.string.exception_the_upgrade_file_is_downloaded));
return true;
} catch (Exception e) {
this.eventBusPost(fileFullPath, driver, -103, e.getMessage());
--
Gitblit v1.8.0