From 66c4c910dcfe5d955103376c4c4afc685557dc55 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 23 十一月 2023 18:13:02 +0800
Subject: [PATCH] 2023年11月23日18:11:10
---
app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java | 206 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 163 insertions(+), 43 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 77ed570..e28e092 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
@@ -1,10 +1,8 @@
package com.hdl.photovoltaic.other;
-import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
-import android.os.IBinder;
import android.text.TextUtils;
@@ -33,7 +31,11 @@
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;
+
+import org.apache.commons.io.FileUtils;
+import org.greenrobot.eventbus.EventBus;
import java.io.File;
import java.io.FileOutputStream;
@@ -41,10 +43,8 @@
import java.io.InputStream;
import java.lang.reflect.Type;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import java.util.Objects;
-import java.util.logging.FileHandler;
import okhttp3.ResponseBody;
@@ -184,7 +184,7 @@
JsonObject json = new JsonObject();
json.addProperty("hardwareModel", hardwareModel);
json.addProperty("osImageId", osImageId);
- json.addProperty("protocolType", "ZIGBEE");//鍗忚绫诲瀷,鍙敤鍊�:BUSPRO,KNX,ZIGBEE,OTHER
+// json.addProperty("protocolType", "ZIGBEE");//鍗忚绫诲瀷,鍙敤鍊�:BUSPRO,KNX,ZIGBEE,OTHER
HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@Override
public void onSuccess(String json) {
@@ -459,7 +459,7 @@
/**
* 鍚戜簯绔幏鍙栥�愯澶囬┍鍔ㄣ�戜笅杞藉崌绾ф枃浠�
*
- * @param downloadUrl 浜戠鍥轰欢鍦板潃
+ * @param downloadUrl 浜戠椹卞姩鍦板潃
*/
public void getDeviceDriverDownloadFile(String downloadUrl, CloudCallBeak<ResponseBody> callBack) {
HttpClient.getInstance().downLoadFile(downloadUrl, new CloudCallBeak<ResponseBody>() {
@@ -553,62 +553,182 @@
}
/**
- * 澶勭悊涓嬭浇鏂囦欢鏁版嵁
+ * 銆愭祴璇曘�戝鐞嗕笅杞芥枃浠舵暟鎹�
*
* @param zipData 鏂囦欢鏁版嵁娴佸璞�
* @param md5 妫�楠屾枃浠禡D5鍊�
* @return 杩斿洖瑙ｅ瘑鐨刡yte[]
*/
- public byte[] disposeDownLoadFile(ResponseBody zipData, String md5) {
+ public boolean testDisposeDownLoadFile(String fullPath, ResponseBody zipData, String md5) {
+ String driver = driver_type;
+ //-100:娌℃湁鏁版嵁;-101:娌℃湁md5绉橀挜;-102:md5绉橀挜涓嶅;-103:鏈夊紓甯�;
if (zipData == null) {
- return null;
+ this.eventBusPost(driver, -100, "娌℃湁鏁版嵁");
+ return false;
}
if (TextUtils.isEmpty(md5)) {
- return null;
+ this.eventBusPost(driver, -101, "娌℃湁md5绉橀挜");
+ return false;
}
InputStream is = null;
- List<Byte> byteList = new ArrayList<>();
- byte[] decrypt = null;
+ byte[] buf = new byte[1204 * 4];
+ int len = 0;
+ FileOutputStream fos = null;
+ File file = null;
try {
+ file = new File(fullPath);
is = zipData.byteStream();
- int total = (int) zipData.contentLength();
- byte[] buf = new byte[1024*4];
+ long total = zipData.contentLength();
+ if (total == 0) {
+ this.eventBusPost(driver, -100, "娌℃湁鏁版嵁");
+ return false;
+ }
+ fos = new FileOutputStream(file);
long sum = 0;
- int len = 0;
while ((len = is.read(buf)) != -1) {
+ fos.write(buf, 0, len);
sum += len;
- //todo 涓嬭浇涓紝鍙互鑷鍔犲叆杩涘害鏉�(鍙互骞挎挱鍑哄幓)
- int progress = (int) (sum * 1.0f / total * 100);
- for (int i = 0; i < len; i++) {
- byteList.add(buf[i]);
+ //todo 涓嬭浇涓紝鍙互鑷繁璁＄畻鐨勮繘搴︽潯(鍙互骞挎挱鍑哄幓)
+ int progress = (int) (100 * sum * 1.0f / total);
+ if (sum != total) {
+ //涓嶇瓑浜�100閮借鎶�,绛変簬100澶勭悊鏁村潡閫昏緫瀹屼箣鍚庡啀鎶�100;
+ this.eventBusPost(driver, progress, "姝ｅ父涓婃姤");
}
}
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- try {
- if (is != null) {
- is.close();
- }
- Byte[] sourceByte = byteList.toArray(new Byte[0]);
- byte[] bytes = new byte[sourceByte.length];
- for (int i = 0; i < sourceByte.length; i++) {
- bytes[i] = sourceByte[i];
- }
- //涓嬭浇鏂囦欢闇�瑕佽В瀵嗕箣鍚庡啀杩涜md5鍘诲仛姣斿
- decrypt = AesUtils.decrypt(bytes);
- if (decrypt != null) {
- String fileMD5 = Md5Utils.encodeMD5(decrypt);
- if (TextUtils.isEmpty(fileMD5) || !Objects.equals(fileMD5, md5)) {
- //鏍￠獙澶辫触,缃┖
- decrypt = null;
- }
- }
- } catch (IOException ignored) {
+ fos.flush();
+ fos.close();
+ is.close();
+ byte[] bytes = FileUtils.readFileToByteArray(file);
+ String fileMD5 = Md5Utils.encodeMD5(bytes);
+ if (TextUtils.isEmpty(fileMD5)) {
+ this.eventBusPost(driver, -106, "鏂囦欢鐢熸垚md5澶辫触.");
+ return false;
+ }
+ if (!md5.equals(fileMD5)) {
+ this.eventBusPost(driver, -107, "md5姣斿澶辫触.");
+ return false;
+ }
+ this.eventBusPost(driver, 100, "涓嬭浇瀹屾垚.");
- }
+
+ return true;
+ } catch (Exception e) {
+ this.eventBusPost(driver, -103, e.getMessage());
+ e.printStackTrace();
}
- return decrypt;
+ return false;
+ }
+
+ /**
+ * 澶勭悊涓嬭浇鏂囦欢鏁版嵁
+ *
+ * @param fullPath 鏂囦欢鍏ㄨ矾寰�
+ * @param zipData 鏂囦欢鏁版嵁娴佸璞�
+ * @param md5 妫�楠屾枃浠禡D5鍊�
+ * @param driver 椹卞姩鎴栬�呭浐浠�
+ * @return 鎴愬姛true
+ */
+ public boolean disposeDownLoadFile(String fullPath, ResponseBody zipData, String md5, String driver) {
+ //-100:娌℃湁鏁版嵁;-101:娌℃湁md5绉橀挜;-102:md5绉橀挜涓嶅;-103:鏈夊紓甯�;
+ if (zipData == null) {
+ this.eventBusPost(driver, -100, "娌℃湁鏁版嵁");
+ return false;
+ }
+ if (TextUtils.isEmpty(md5)) {
+ this.eventBusPost(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(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(driver, progress, "姝ｅ父涓婃姤");
+ }
+ }
+ fos.flush();
+ fos.close();
+ is.close();
+ byte[] bytes = FileUtils.readFileToByteArray(file);
+ //涓嬭浇鏂囦欢闇�瑕佽В瀵嗕箣鍚庡啀杩涜md5鍘诲仛姣斿
+ byte[] decrypt = AesUtils.decrypt(bytes);
+ if (decrypt == null) {
+ this.eventBusPost(driver, -105, "aes瑙ｅ瘑澶辫触.");
+ return false;
+ }
+ String fileMD5 = Md5Utils.encodeMD5(decrypt);
+ if (TextUtils.isEmpty(fileMD5)) {
+ this.eventBusPost(driver, -106, "鏂囦欢鐢熸垚md5澶辫触.");
+ return false;
+ }
+ if (!md5.equals(fileMD5)) {
+ this.eventBusPost(driver, -107, "md5姣斿澶辫触.");
+ return false;
+ }
+ //todo 娉ㄦ剰:瑙ｅ瘑涔嬪悗锛岃閲嶆柊鍐欐暟鎹�;
+ FileUtils.writeByteArrayToFile(file, decrypt, false);
+ this.eventBusPost(driver, 100, "涓嬭浇瀹屾垚.");
+ return true;
+ } catch (Exception e) {
+ this.eventBusPost(driver, -103, e.getMessage());
+ e.printStackTrace();
+ }
+ return false;
+ }
+
+
+ /**
+ * 鍙戝竷杩涘害涓婚
+ *
+ * @param type 椹卞姩:driver,鍥轰欢:firmware
+ * @param progressValue 杩涘害鍊�
+ * @param describe 鎻忚堪鏂囨湰
+ */
+ public void eventBusPost(String type, int progressValue, String describe) {
+// HdlThreadLogic.runMainThread(new Runnable() {
+// @Override
+// public void run() {
+ BaseEventBus baseEventBus = new BaseEventBus();
+ baseEventBus.setTopic(localDownloadProgress);
+ Progress progress = new Progress();
+ progress.step = progressValue;
+ progress.describe = describe;
+ baseEventBus.setType(type);
+ baseEventBus.setData(progress);
+ EventBus.getDefault().post(baseEventBus);
+// }
+// });
+ }
+
+
+ //鑷畾涔変笂鎶ヤ笅杞介┍鍔ㄦ垨鍥轰欢杩涘害涓婚
+ public static final String localDownloadProgress = "cloud/download/progress/up";
+
+ public static final String driver_type = "driver";
+ public static final String firmware_type = "firmware";
+
+ public static class Progress {
+ //杩涘害鍊�
+ public int step;
+ //杩涘害鎻忚堪淇℃伅
+ public String describe;
}
--
Gitblit v1.8.0