From 0f91b37f7711481b9671409d0de08873d77060eb Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 20 十二月 2023 17:24:31 +0800
Subject: [PATCH] 2023年12月20日17:24:20
---
app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java | 147 +++++++++++++++++++++---------------------------
1 files changed, 65 insertions(+), 82 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 51d3304..03ffa54 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
@@ -7,6 +7,7 @@
import com.google.gson.Gson;
+import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.reflect.TypeToken;
import com.hdl.linkpm.sdk.core.exception.HDLException;
@@ -14,7 +15,6 @@
import com.hdl.linkpm.sdk.ota.bean.CloudDeviceFirmwaresBean;
import com.hdl.linkpm.sdk.ota.bean.CloudGatewayDriversBean;
import com.hdl.linkpm.sdk.ota.bean.DeviceFirmwareBean;
-import com.hdl.linkpm.sdk.ota.bean.DownloadUrlBean;
import com.hdl.linkpm.sdk.ota.bean.GatewayDriverBean;
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.config.UserConfigManage;
@@ -30,7 +30,6 @@
import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.utils.Md5Utils;
import com.hdl.sdk.link.common.exception.HDLLinkException;
-import com.hdl.sdk.link.common.utils.ByteUtils;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import com.hdl.sdk.link.core.callback.HDLLinkCallBack;
@@ -380,10 +379,11 @@
//endregion
+
/**
- * 璁剧疆缁堟涓嬭浇鏂囦欢鎸囦护
+ * 鍙栨秷缁堟涓嬭浇鏂囦欢鎸囦护
*/
- public void setStopDriversDownload() {
+ public void stopDownloadUpgradeFile() {
this.stopDownload = true;
}
@@ -427,6 +427,7 @@
*/
public void pushUpgradePacketInfo(String mac, String oid, String module, String version, String size, String url, String sign_method, LinkCallBack<String> linkCallBack) {
String requestUrl = TopicApi.SET_GATEWAY_UPGRADE_INFO;
+ JsonArray jsonArray = new JsonArray();
JsonObject json = new JsonObject();
json.addProperty("oid", oid);// 鐗╃悊璁惧oid
json.addProperty("module", module);//妯″潡淇℃伅
@@ -434,8 +435,10 @@
// json.addProperty("is_diff", is_diff);//true=澧為噺鍖咃紝false=鍏ㄩ噺鍖�
json.addProperty("size", size);//鍗囩骇鍖呭ぇ灏�
json.addProperty("url", url);//鍗囩骇鍖呬笅杞藉湴鍧�
- json.addProperty("sign_method", sign_method);//鍗囩骇鍖呯鍚嶇被鍨�:md5
- TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, json, "", new HDLLinkCallBack() {
+ json.addProperty("sign", sign_method);//鍗囩骇鍖呯鍚嶇被鍨�:md5
+ json.addProperty("sign_method", "md5");//鍗囩骇鍖呯鍚嶇被鍨�:md5
+ jsonArray.add(json);
+ TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, jsonArray, "", new HDLLinkCallBack() {
@Override
public void onSuccess(String msg) {
if (linkCallBack != null) {
@@ -451,6 +454,43 @@
}
}
});
+ }
+
+ /**
+ * 鍙栨秷鍗囩骇椹卞姩,鍥轰欢鏂囦欢鎸囦护
+ *
+ * @param mac 璁惧mac
+ * @param linkCallBack 鍥炶皟update
+ */
+ public void cancelUpgrade(String mac, LinkCallBack<Boolean> linkCallBack) {
+ String requestUrl = TopicApi.SET_GATEWAY_REMOTE_EDIT;
+// JsonObject json = new JsonObject();
+// json.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
+// json.addProperty("server_addr", AppConfigManage.getUserRegionUrl());
+// json.addProperty("local_secret", UserConfigManage.getInstance().getLocalSecret());
+// //瑙ｅ瘑璐熻浇鏁版嵁(鍐欏瘑閽ョ粰缃戝叧涓�瀹氭槸鏄庢枃锛屽洜涓洪偅鏃剁綉鍏宠繕娌℃湁瀵嗛挜)
+// TcpClient.getInstance().sendDataToLinkGateway(mac, false, requestUrl, json, "", new HDLLinkCallBack() {
+// @Override
+// public void onSuccess(String msg) {
+// GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(mac);
+// if (gatewayBean != null) {
+// if (!TextUtils.isEmpty(UserConfigManage.getInstance().getLocalSecret())) {
+// gatewayBean.setLocalEncrypt(true);
+// }
+// }
+// if (linkCallBack != null) {
+// linkCallBack.onSuccess(true);
+// }
+//
+// }
+//
+// @Override
+// public void onError(HDLLinkException e) {
+// if (linkCallBack != null) {
+// linkCallBack.onError(e);
+// }
+// }
+// });
}
@@ -482,72 +522,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;
- }
/**
* 澶勭悊涓嬭浇鏂囦欢鏁版嵁
@@ -562,11 +536,13 @@
this.stopDownload = false;
//-100:娌℃湁鏁版嵁;-101:娌℃湁md5绉橀挜;-102:md5绉橀挜涓嶅;-103:鏈夊紓甯�;
if (zipData == null) {
- this.eventBusPost(fileFullPath, driver, -100, "娌℃湁鏁版嵁");
+ this.eventBusPost(fileFullPath, driver, -100, "鎷変笉鍒颁簯绔崌绾ф枃浠舵暟鎹�");
+ HdlLogLogic.print("鎷変笉鍒颁簯绔崌绾ф枃浠舵暟鎹�(-100)", true);
return false;
}
if (TextUtils.isEmpty(md5)) {
- this.eventBusPost(fileFullPath, driver, -101, "娌℃湁md5绉橀挜");
+ this.eventBusPost(fileFullPath, driver, -101, "鎷夸笉鍒颁簯绔笂鍗囩骇鏂囦欢md5绉橀挜");
+ HdlLogLogic.print("鎷夸笉鍒颁簯绔笂鍗囩骇鏂囦欢md5绉橀挜(-101)", true);
return false;
}
InputStream is = null;
@@ -579,14 +555,16 @@
is = zipData.byteStream();
long total = zipData.contentLength();
if (total == 0) {
- this.eventBusPost(fileFullPath, driver, -100, "娌℃湁鏁版嵁");
+ this.eventBusPost(fileFullPath, driver, -102, "鎷変笉鍒颁簯绔崌绾ф枃浠舵暟鎹�");
+ HdlLogLogic.print("鎷変笉鍒颁簯绔崌绾ф枃浠舵暟鎹�(-102)", true);
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, "鐢ㄦ埛鍙栨秷涓嬭浇鍗囩骇鏂囦欢.");
+ HdlLogLogic.print("鐢ㄦ埛鍙栨秷涓嬭浇鍗囩骇鏂囦欢(-108)", true);
fos.flush();
fos.close();
is.close();
@@ -599,7 +577,8 @@
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);
+ HdlLogLogic.print("姝ｅ父涓婃姤杩涘害鍊�->" + progress, true);
}
}
fos.flush();
@@ -609,21 +588,25 @@
//涓嬭浇鏂囦欢闇�瑕佽В瀵嗕箣鍚庡啀杩涜md5鍘诲仛姣斿
byte[] decrypt = AesUtils.decrypt(bytes);
if (decrypt == null) {
- this.eventBusPost(fileFullPath, driver, -105, "aes瑙ｅ瘑澶辫触.");
+ this.eventBusPost(fileFullPath, driver, -105, "鍗囩骇鏂囦欢aes瑙ｅ瘑澶辫触.");
+ HdlLogLogic.print("鍗囩骇鏂囦欢aes瑙ｅ瘑澶辫触(-105)", true);
return false;
}
String fileMD5 = Md5Utils.encodeMD5(decrypt);
if (TextUtils.isEmpty(fileMD5)) {
- this.eventBusPost(fileFullPath, driver, -106, "鏂囦欢鐢熸垚md5澶辫触.");
+ this.eventBusPost(fileFullPath, driver, -106, "鍗囩骇鏂囦欢鐢熸垚md5澶辫触澶辫触.");
+ HdlLogLogic.print("鍗囩骇鏂囦欢鐢熸垚md5澶辫触澶辫触(-106)", true);
return false;
}
if (!md5.equals(fileMD5)) {
- this.eventBusPost(fileFullPath, driver, -107, "md5姣斿澶辫触.");
+ this.eventBusPost(fileFullPath, driver, -107, "鍗囩骇鏂囦欢md5姣斿澶辫触.");
+ HdlLogLogic.print("鍗囩骇鏂囦欢md5姣斿澶辫触(-107)", true);
return false;
}
//todo 娉ㄦ剰:瑙ｅ瘑涔嬪悗锛岃閲嶆柊鍐欐暟鎹�;
FileUtils.writeByteArrayToFile(file, decrypt, false);
- this.eventBusPost(fileFullPath, driver, 100, "涓嬭浇瀹屾垚.");
+ this.eventBusPost(fileFullPath, driver, 100, "鍗囩骇鏂囦欢涓嬭浇瀹屾垚.");
+ HdlLogLogic.print("鍗囩骇鏂囦欢涓嬭浇瀹屾垚.", true);
return true;
} catch (Exception e) {
this.eventBusPost(fileFullPath, driver, -103, e.getMessage());
@@ -641,7 +624,7 @@
* @param describe 鎻忚堪鏂囨湰
*/
public void eventBusPost(String fileFullPath, String type, int progressValue, String describe) {
- HdlLogLogic.print("杩涘害鍊�====" + progressValue + "");
+
if (this.stopDownload) {
HdlFileLogic.getInstance().deleteFile(fileFullPath);//鍒犻櫎涓嬭浇涓嶅畬鏁存暟鎹�;
--
Gitblit v1.8.0