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 | 343 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 202 insertions(+), 141 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..03ffa54 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
@@ -1,14 +1,13 @@
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;
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;
@@ -16,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;
@@ -32,8 +30,11 @@
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;
+
+import org.apache.commons.io.FileUtils;
+import org.greenrobot.eventbus.EventBus;
import java.io.File;
import java.io.FileOutputStream;
@@ -41,10 +42,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;
@@ -88,6 +87,16 @@
private Intent intentServer = null;
private ServiceConnection mServiceConnection = null;
+ /**
+ * 鏈嶅姟鏄惁寮�鍚� true=寮�鍚�
+ */
+ public boolean mServiceStart = false;
+
+ /**
+ * true琛ㄧず缁堟涓嬭浇鍗囩骇鏂囦欢(鐢ㄦ埛琛屼负)
+ */
+ private boolean stopDownload = false;
+
//region -----鍥轰欢鍗囩骇---------
@@ -184,7 +193,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) {
@@ -245,59 +254,6 @@
}
- /**
- * 鍚戜簯绔幏鍙栥�愯澶囧浐浠躲�戝崌绾у寘涓嬭浇鍦板潃
- *
- * @param firmwareVersionId 鍥轰欢鐗堟湰Id
- */
- public void getDeviceFirmwareDownloadUrl(String firmwareVersionId, CloudCallBeak<DownloadUrlBean> callBack) {
-// "protocolType":"bus",
-// "deviceModel":"029B9988",
-// "firmwareNameEn":"鏍稿績灞�",
-// "firmwareNameCn":"鏍稿績灞�",
-// "imageId":"12345678",
-// "version":"V01.02.20"
- String requestUrl = HttpApi.POST_OTA_GET_LinkDeviceFirmwareDownloadUrl;
- JsonObject json = new JsonObject();
- json.addProperty("firmwareVersionId", firmwareVersionId);
- HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
- @Override
- public void onSuccess(String json) {
-
- if (TextUtils.isEmpty(json)) {
- if (callBack != null) {
- callBack.onSuccess(new DownloadUrlBean());
- }
- return;
- }
- Gson gson = new Gson();
- Type typeOfT = new TypeToken<DownloadUrlBean>() {
- }.getType();
- DownloadUrlBean downloadUrlBean = gson.fromJson(json, typeOfT);
- if (callBack != null) {
- callBack.onSuccess(downloadUrlBean);
- }
- }
-
- @Override
- public void onFailure(HDLException e) {
- if (callBack != null) {
- callBack.onFailure(e);
- }
- }
- });
- }
-
- /**
- * 鍚戜簯绔幏鍙栥�愯澶囧浐浠躲�戜笅杞藉崌绾ф枃浠�
- *
- * @param downloadUrl 浜戠鍥轰欢鍦板潃
- */
- public void getDeviceFirmwareDownloadFile(String downloadUrl, CloudCallBeak<DownloadUrlBean> callBack) {
- String requestUrl = HttpApi.POST_OTA_GET_LinkDeviceFirmwareDownloadUrl;
- JsonObject json = new JsonObject();
-
- }
//endregion
@@ -389,8 +345,9 @@
}
+
/**
- * 浜戠鍙戣捣銆愯澶囬┍鍔ㄣ�戝崌绾TA鎸囦护
+ * 浜戠鍙戣捣銆愯澶囬┍鍔ㄥ崌绾с�慜TA鎸囦护
*
* @param oid 缃戝叧璁惧oid
* @param driverVersionId 椹卞姩鐗堟湰id
@@ -419,49 +376,23 @@
});
}
+
+ //endregion
+
+
/**
- * 鍚戜簯绔幏鍙栥�愯澶囬┍鍔ㄣ�戝崌绾у寘涓嬭浇鍦板潃
- *
- * @param driverVersionId 椹卞姩鐗堟湰Id
+ * 鍙栨秷缁堟涓嬭浇鏂囦欢鎸囦护
*/
- public void getDeviceDriverDownloadUrl(String driverVersionId, CloudCallBeak<DownloadUrlBean> callBack) {
-
- String requestUrl = HttpApi.POST_OTA_GET_LinkDeviceDriverDownloadUrl;
- JsonObject json = new JsonObject();
- json.addProperty("driverVersionId", driverVersionId);
- HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
- @Override
- public void onSuccess(String s) {
- if (TextUtils.isEmpty(s)) {
- if (callBack != null) {
- callBack.onSuccess(new DownloadUrlBean());
- }
- return;
- }
- Gson gson = new Gson();
- Type typeOfT = new TypeToken<DownloadUrlBean>() {
- }.getType();
- DownloadUrlBean downloadUrlBean = gson.fromJson(s, typeOfT);
- if (callBack != null) {
- callBack.onSuccess(downloadUrlBean);
- }
- }
-
- @Override
- public void onFailure(HDLException e) {
- if (callBack != null) {
- callBack.onFailure(e);
- }
- }
- });
+ public void stopDownloadUpgradeFile() {
+ this.stopDownload = true;
}
/**
- * 鍚戜簯绔幏鍙栥�愯澶囬┍鍔ㄣ�戜笅杞藉崌绾ф枃浠�
+ * 鍚戜簯绔幏鍙栥�愯澶囧崌绾ф枃浠�(椹卞姩,鍥轰欢)涓嬭浇銆戝崌绾ф枃浠�
*
- * @param downloadUrl 浜戠鍥轰欢鍦板潃
+ * @param downloadUrl 浜戠椹卞姩鍦板潃
*/
- public void getDeviceDriverDownloadFile(String downloadUrl, CloudCallBeak<ResponseBody> callBack) {
+ public void getDeviceUpgradeDownloadFile(String downloadUrl, CloudCallBeak<ResponseBody> callBack) {
HttpClient.getInstance().downLoadFile(downloadUrl, new CloudCallBeak<ResponseBody>() {
@Override
public void onSuccess(ResponseBody s) {
@@ -482,9 +413,6 @@
}
-
- //endregion
-
/**
* 鏈湴鍗囩骇鍖呮帹閫�(鍛婅瘔缃戝叧涓嬭浇鍗囩骇鍖呭湴鍧�绛変俊鎭�)
*
@@ -499,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);//妯″潡淇℃伅
@@ -506,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) {
@@ -525,6 +456,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);
+// }
+// }
+// });
+ }
+
/**
* 鍚姩鏈湴鏈嶅姟
@@ -539,6 +507,7 @@
intentServer = new Intent();
intentServer.setClass(HDLApp.getInstance(), MyNanoHttpService.class);
this.mServiceConnection = serviceConnection;
+ this.mServiceStart = true;
//鍚姩鏈嶅姟鐩戝惉
HDLApp.getInstance().bindService(intentServer, serviceConnection, Context.BIND_AUTO_CREATE);
}
@@ -549,66 +518,158 @@
public void unLocalService() {
if (intentServer != null && this.mServiceConnection != null) {
HDLApp.getInstance().unbindService(this.mServiceConnection);
+ this.mServiceStart = false;
}
}
+
/**
* 澶勭悊涓嬭浇鏂囦欢鏁版嵁
*
- * @param zipData 鏂囦欢鏁版嵁娴佸璞�
- * @param md5 妫�楠屾枃浠禡D5鍊�
- * @return 杩斿洖瑙ｅ瘑鐨刡yte[]
+ * @param fileFullPath 鏂囦欢鍏ㄨ矾寰�
+ * @param zipData 鏂囦欢鏁版嵁娴佸璞�
+ * @param md5 妫�楠屾枃浠禡D5鍊�
+ * @param driver 椹卞姩鎴栬�呭浐浠�
+ * @return 鎴愬姛true
*/
- public byte[] disposeDownLoadFile(ResponseBody zipData, String md5) {
+ public boolean disposeDownLoadFile(String fileFullPath, ResponseBody zipData, String md5, String driver) {
+ this.stopDownload = false;
+ //-100:娌℃湁鏁版嵁;-101:娌℃湁md5绉橀挜;-102:md5绉橀挜涓嶅;-103:鏈夊紓甯�;
if (zipData == null) {
- return null;
+ this.eventBusPost(fileFullPath, driver, -100, "鎷変笉鍒颁簯绔崌绾ф枃浠舵暟鎹�");
+ HdlLogLogic.print("鎷変笉鍒颁簯绔崌绾ф枃浠舵暟鎹�(-100)", true);
+ return false;
}
if (TextUtils.isEmpty(md5)) {
- return null;
+ this.eventBusPost(fileFullPath, driver, -101, "鎷夸笉鍒颁簯绔笂鍗囩骇鏂囦欢md5绉橀挜");
+ HdlLogLogic.print("鎷夸笉鍒颁簯绔笂鍗囩骇鏂囦欢md5绉橀挜(-101)", true);
+ 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(fileFullPath);
is = zipData.byteStream();
- int total = (int) zipData.contentLength();
- byte[] buf = new byte[1024*4];
+ long total = zipData.contentLength();
+ if (total == 0) {
+ this.eventBusPost(fileFullPath, driver, -102, "鎷変笉鍒颁簯绔崌绾ф枃浠舵暟鎹�");
+ HdlLogLogic.print("鎷変笉鍒颁簯绔崌绾ф枃浠舵暟鎹�(-102)", true);
+ return false;
+ }
+ fos = new FileOutputStream(file);
long sum = 0;
- int len = 0;
while ((len = is.read(buf)) != -1) {
- sum += len;
- //todo 涓嬭浇涓紝鍙互鑷鍔犲叆杩涘害鏉�(鍙互骞挎挱鍑哄幓)
- int progress = (int) (sum * 1.0f / total * 100);
- for (int i = 0; i < len; i++) {
- byteList.add(buf[i]);
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- try {
- if (is != null) {
+ if (this.stopDownload) {
+ this.eventBusPost(fileFullPath, driver, -108, "鐢ㄦ埛鍙栨秷涓嬭浇鍗囩骇鏂囦欢.");
+ HdlLogLogic.print("鐢ㄦ埛鍙栨秷涓嬭浇鍗囩骇鏂囦欢(-108)", true);
+ fos.flush();
+ fos.close();
is.close();
+ //todo 鐢ㄦ埛缁堟缁х画璇诲彇鏁版嵁;
+ return false;
}
- 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];
+ fos.write(buf, 0, len);
+ sum += len;
+ //todo 涓嬭浇涓紝鍙互鑷繁璁＄畻鐨勮繘搴︽潯(鍙互骞挎挱鍑哄幓)
+ int progress = (int) (100 * sum * 1.0f / total);
+ if (sum != total) {
+ //涓嶇瓑浜�100閮借鎶�,绛変簬100澶勭悊鏁村潡閫昏緫瀹屼箣鍚庡啀鎶�100;
+ this.eventBusPost(fileFullPath, driver, progress, "姝ｅ父涓婃姤杩涘害鍊�->" + progress);
+ HdlLogLogic.print("姝ｅ父涓婃姤杩涘害鍊�->" + progress, true);
}
- //涓嬭浇鏂囦欢闇�瑕佽В瀵嗕箣鍚庡啀杩涜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);
+ //涓嬭浇鏂囦欢闇�瑕佽В瀵嗕箣鍚庡啀杩涜md5鍘诲仛姣斿
+ byte[] decrypt = AesUtils.decrypt(bytes);
+ if (decrypt == null) {
+ 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澶辫触澶辫触.");
+ HdlLogLogic.print("鍗囩骇鏂囦欢鐢熸垚md5澶辫触澶辫触(-106)", true);
+ return false;
+ }
+ if (!md5.equals(fileMD5)) {
+ this.eventBusPost(fileFullPath, driver, -107, "鍗囩骇鏂囦欢md5姣斿澶辫触.");
+ HdlLogLogic.print("鍗囩骇鏂囦欢md5姣斿澶辫触(-107)", true);
+ return false;
+ }
+ //todo 娉ㄦ剰:瑙ｅ瘑涔嬪悗锛岃閲嶆柊鍐欐暟鎹�;
+ FileUtils.writeByteArrayToFile(file, decrypt, false);
+ this.eventBusPost(fileFullPath, driver, 100, "鍗囩骇鏂囦欢涓嬭浇瀹屾垚.");
+ HdlLogLogic.print("鍗囩骇鏂囦欢涓嬭浇瀹屾垚.", true);
+ return true;
+ } catch (Exception e) {
+ this.eventBusPost(fileFullPath, driver, -103, e.getMessage());
+ e.printStackTrace();
}
- return decrypt;
+ return false;
+ }
+
+
+ /**
+ * 鍙戝竷杩涘害涓婚
+ *
+ * @param type 椹卞姩:driver,鍥轰欢:firmware
+ * @param progressValue 杩涘害鍊�
+ * @param describe 鎻忚堪鏂囨湰
+ */
+ public void eventBusPost(String fileFullPath, String type, int progressValue, String describe) {
+
+
+ if (this.stopDownload) {
+ HdlFileLogic.getInstance().deleteFile(fileFullPath);//鍒犻櫎涓嬭浇涓嶅畬鏁存暟鎹�;
+ BaseEventBus baseEventBus = new BaseEventBus();
+ baseEventBus.setTopic(localDownloadProgress);
+ Progress progress = new Progress();
+ progress.step = -108;
+ progress.describe = "鐢ㄦ埛鍙栨秷涓嬭浇.";
+ baseEventBus.setType(type);
+ baseEventBus.setData(progress);
+ EventBus.getDefault().post(baseEventBus);
+ return;
+ }
+// 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;
+ progress.type = type;
+ 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;
+ //琛ㄧず鏄┍鍔紝鍥轰欢;
+ public String type;
}
--
Gitblit v1.8.0