From 44ba605a4e850efa757020da5fb4cf02bdf6e3ab Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 08 九月 2025 10:55:18 +0800
Subject: [PATCH] 2025年09月08日10:55:15
---
app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java | 129 +++++++++++-------------------------------
1 files changed, 35 insertions(+), 94 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 e1c7539..5df0ee2 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
@@ -17,7 +17,7 @@
import com.hdl.linkpm.sdk.ota.bean.DeviceFirmwareBean;
import com.hdl.linkpm.sdk.ota.bean.GatewayDriverBean;
import com.hdl.photovoltaic.HDLApp;
-import com.hdl.photovoltaic.config.AppConfigManage;
+import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
@@ -28,25 +28,21 @@
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.listener.LinkCallBack;
import com.hdl.photovoltaic.utils.AesUtils;
-import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.utils.Md5Utils;
+import com.hdl.photovoltaic.utils.NetworkUtils;
import com.hdl.sdk.link.common.exception.HDLLinkException;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
-import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
import com.hdl.sdk.link.core.callback.HDLLinkCallBack;
-import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
import org.apache.commons.io.FileUtils;
import org.greenrobot.eventbus.EventBus;
import java.io.File;
import java.io.FileOutputStream;
-import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
-import java.util.Objects;
import okhttp3.ResponseBody;
@@ -93,7 +89,7 @@
/**
* 鏈嶅姟鏄惁寮�鍚� true=寮�鍚�
*/
- public boolean mServiceStart= false;
+ public boolean mServiceStart = false;
/**
* true琛ㄧず缁堟涓嬭浇鍗囩骇鏂囦欢(鐢ㄦ埛琛屼负)
@@ -147,13 +143,19 @@
* 鍓嶆彁鏉′欢:璁惧鑷姩涓婃姤oid淇℃伅缁欎簯绔�
*
* @param deviceOidId oid浜戠id
+ * @param oid 璁惧oid
+ * @param homeId 鐢电珯id
* @param callBack -
*/
- public void getCurrentDeviceFirmwares(String deviceOidId, CloudCallBeak<List<DeviceFirmwareBean>> callBack) {
+ public void getCurrentDeviceFirmwares(String deviceOidId, String oid, String homeId, CloudCallBeak<List<DeviceFirmwareBean>> callBack) {
String requestUrl = HttpApi.POST_OTA_GET_DeviceFirmwares;
JsonObject json = new JsonObject();
- json.addProperty("deviceOidId", deviceOidId);
- json.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
+ if (!TextUtils.isEmpty(deviceOidId)) {
+ json.addProperty("deviceOidId", deviceOidId);
+ } else {
+ json.addProperty("oid", oid);
+ }
+ json.addProperty("homeId", homeId);
HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@Override
public void onSuccess(String json) {
@@ -267,12 +269,13 @@
* 鍓嶆彁鏉′欢:璁惧鑷姩涓婃姤oid淇℃伅缁欎簯绔�
*
* @param oid 缃戝叧璁惧oid
+ * @param homeId 鐢电珯id
* @param callBack -
*/
- public void getCurrentGatewayDrivers(String oid, CloudCallBeak<List<GatewayDriverBean>> callBack) {
+ public void getCurrentGatewayDrivers(String oid, String homeId, CloudCallBeak<List<GatewayDriverBean>> callBack) {
String requestUrl = HttpApi.POST_OTA_GET_GatewayDrivers;
JsonObject json = new JsonObject();
- json.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
+ json.addProperty("homeId", homeId);
json.addProperty("oid", oid);
HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@@ -505,7 +508,7 @@
//1,寤虹珛鏈湴鏈嶅姟锛�
//2锛屽憡璇夌綉鍏虫墜鏈篿p鍜岀鍙ｏ紱
//瀹炰緥鍖� 鑾峰彇ip 鍦板潃
- MyNanoHttpServer.getInstance(AppManagerUtils.getAppManager().getIPAddress(HDLApp.getInstance()));
+ MyNanoHttpServer.getInstance(NetworkUtils.getIPAddress(HDLApp.getInstance()));
//MyNanoHttpServer.getInstance("127.0.0.1");
intentServer = new Intent();
intentServer.setClass(HDLApp.getInstance(), MyNanoHttpService.class);
@@ -525,72 +528,6 @@
}
}
- /**
- * 銆愭祴璇曘�戝鐞嗕笅杞芥枃浠舵暟鎹�
- *
- * @param zipData 鏂囦欢鏁版嵁娴佸璞�
- * @param md5 妫�楠屾枃浠禡D5鍊�
- * @return 杩斿洖瑙ｅ瘑鐨刡yte[]
- */
- public boolean testDisposeDownLoadFile(String fullPath, ResponseBody zipData, String md5) {
- String driver = driver_type;
- //-100:娌℃湁鏁版嵁;-101:娌℃湁md5绉橀挜;-102:md5绉橀挜涓嶅;-103:鏈夊紓甯�;
- if (zipData == null) {
- this.eventBusPost(fullPath, driver, -100, "娌℃湁鏁版嵁");
- return false;
- }
- if (TextUtils.isEmpty(md5)) {
- this.eventBusPost(fullPath, driver, -101, "娌℃湁md5绉橀挜");
- return false;
- }
- InputStream is = null;
- byte[] buf = new byte[1204 * 4];
- int len = 0;
- FileOutputStream fos = null;
- File file = null;
- try {
- file = new File(fullPath);
- is = zipData.byteStream();
- long total = zipData.contentLength();
- if (total == 0) {
- this.eventBusPost(fullPath, driver, -100, "娌℃湁鏁版嵁");
- return false;
- }
- fos = new FileOutputStream(file);
- long sum = 0;
- while ((len = is.read(buf)) != -1) {
- fos.write(buf, 0, len);
- sum += len;
- //todo 涓嬭浇涓紝鍙互鑷繁璁＄畻鐨勮繘搴︽潯(鍙互骞挎挱鍑哄幓)
- int progress = (int) (100 * sum * 1.0f / total);
- if (sum != total) {
- //涓嶇瓑浜�100閮借鎶�,绛変簬100澶勭悊鏁村潡閫昏緫瀹屼箣鍚庡啀鎶�100;
- this.eventBusPost(fullPath, driver, progress, "姝ｅ父涓婃姤");
- }
- }
- fos.flush();
- fos.close();
- is.close();
- byte[] bytes = FileUtils.readFileToByteArray(file);
- String fileMD5 = Md5Utils.encodeMD5(bytes);
- if (TextUtils.isEmpty(fileMD5)) {
- this.eventBusPost(fullPath, driver, -106, "鏂囦欢鐢熸垚md5澶辫触.");
- return false;
- }
- if (!md5.equals(fileMD5)) {
- this.eventBusPost(fullPath, driver, -107, "md5姣斿澶辫触.");
- return false;
- }
- this.eventBusPost(fullPath, driver, 100, "涓嬭浇瀹屾垚.");
-
-
- return true;
- } catch (Exception e) {
- this.eventBusPost(fullPath, driver, -103, e.getMessage());
- e.printStackTrace();
- }
- return false;
- }
/**
* 澶勭悊涓嬭浇鏂囦欢鏁版嵁
@@ -605,11 +542,11 @@
this.stopDownload = false;
//-100:娌℃湁鏁版嵁;-101:娌℃湁md5绉橀挜;-102:md5绉橀挜涓嶅;-103:鏈夊紓甯�;
if (zipData == null) {
- this.eventBusPost(fileFullPath, driver, -100, "娌℃湁鏁版嵁");
+ 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, "娌℃湁md5绉橀挜");
+ 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;
@@ -622,14 +559,14 @@
is = zipData.byteStream();
long total = zipData.contentLength();
if (total == 0) {
- this.eventBusPost(fileFullPath, driver, -100, "娌℃湁鏁版嵁");
+ 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, "鐢ㄦ埛鍙栨秷涓嬭浇.");
+ 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();
@@ -642,31 +579,33 @@
int progress = (int) (100 * sum * 1.0f / total);
if (sum != total) {
//涓嶇瓑浜�100閮借鎶�,绛変簬100澶勭悊鏁村潡閫昏緫瀹屼箣鍚庡啀鎶�100;
- this.eventBusPost(fileFullPath, driver, progress, "姝ｅ父涓婃姤");
+ this.eventBusPost(fileFullPath, driver, progress, "姝ｅ父涓婃姤杩涘害鍊�---" + progress);
}
}
fos.flush();
fos.close();
is.close();
- byte[] bytes = FileUtils.readFileToByteArray(file);
- //涓嬭浇鏂囦欢闇�瑕佽В瀵嗕箣鍚庡啀杩涜md5鍘诲仛姣斿
+ byte[] bytes = HdlFileLogic.getInstance().readFileByte(fileFullPath);
+// byte[] bytes = FileUtils.readFileToByteArray(file);//杩欎釜鏂规硶涓嶅吋鐢╝ndroid 6.0
+ //todo 涓嬭浇鏂囦欢闇�瑕佽В瀵嗕箣鍚庡啀杩涜md5鍘诲仛姣斿
byte[] decrypt = AesUtils.decrypt(bytes);
if (decrypt == null) {
- this.eventBusPost(fileFullPath, driver, -105, "aes瑙ｅ瘑澶辫触.");
+ 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, "鏂囦欢鐢熸垚md5澶辫触.");
+ 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, "md5姣斿澶辫触.");
+ 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 娉ㄦ剰:瑙ｅ瘑涔嬪悗锛岃閲嶆柊鍐欐暟鎹�;
- FileUtils.writeByteArrayToFile(file, decrypt, false);
- this.eventBusPost(fileFullPath, driver, 100, "涓嬭浇瀹屾垚.");
+ HdlFileLogic.getInstance().writeFile(fileFullPath, decrypt);
+// FileUtils.writeByteArrayToFile(file, decrypt, false);//杩欎釜鏂规硶涓嶅吋鐢╝ndroid 6.0
+ 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());
@@ -684,15 +623,16 @@
* @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();
progress.step = -108;
- progress.describe = "鐢ㄦ埛鍙栨秷涓嬭浇.";
+ progress.describe = describe;
baseEventBus.setType(type);
baseEventBus.setData(progress);
EventBus.getDefault().post(baseEventBus);
@@ -720,6 +660,7 @@
//鑷畾涔変笂鎶ヤ笅杞介┍鍔ㄦ垨鍥轰欢杩涘害涓婚
public static final String localDownloadProgress = "cloud/download/progress/up";
+
public static final String driver_type = "driver";
public static final String firmware_type = "firmware";
--
Gitblit v1.8.0