From 1f3acf4c29f367e40a3f589b51176ed24e28948f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 02 九月 2025 17:54:42 +0800
Subject: [PATCH] 2025年09月02日17:54:39
---
app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java | 264 +++++++++++++++++++++-------------------------------
1 files changed, 105 insertions(+), 159 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 972a3c6..5df0ee2 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,9 +15,9 @@
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.R;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
@@ -27,10 +28,9 @@
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.common.utils.ByteUtils;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import com.hdl.sdk.link.core.callback.HDLLinkCallBack;
@@ -39,12 +39,10 @@
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;
@@ -88,11 +86,16 @@
private Intent intentServer = null;
private ServiceConnection mServiceConnection = null;
+ /**
+ * 鏈嶅姟鏄惁寮�鍚� true=寮�鍚�
+ */
+ public boolean mServiceStart = false;
/**
* true琛ㄧず缁堟涓嬭浇鍗囩骇鏂囦欢(鐢ㄦ埛琛屼负)
*/
private boolean stopDownload = false;
+
//region -----鍥轰欢鍗囩骇---------
@@ -140,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) {
@@ -250,59 +259,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
@@ -313,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>() {
@@ -394,15 +351,9 @@
}
- /**
- * 璁剧疆缁堟涓嬭浇鏂囦欢鎸囦护
- */
- public void setStopDriversDownload() {
- this.stopDownload = true;
- }
/**
- * 浜戠鍙戣捣銆愯澶囬┍鍔ㄣ�戝崌绾TA鎸囦护
+ * 浜戠鍙戣捣銆愯澶囬┍鍔ㄥ崌绾с�慜TA鎸囦护
*
* @param oid 缃戝叧璁惧oid
* @param driverVersionId 椹卞姩鐗堟湰id
@@ -431,12 +382,23 @@
});
}
+
+ //endregion
+
+
/**
- * 鍚戜簯绔幏鍙栥�愯澶囬┍鍔ㄣ�戜笅杞藉崌绾ф枃浠�
+ * 鍙栨秷缁堟涓嬭浇鏂囦欢鎸囦护
+ */
+ public void stopDownloadUpgradeFile() {
+ this.stopDownload = true;
+ }
+
+ /**
+ * 鍚戜簯绔幏鍙栥�愯澶囧崌绾ф枃浠�(椹卞姩,鍥轰欢)涓嬭浇銆戝崌绾ф枃浠�
*
* @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) {
@@ -457,9 +419,6 @@
}
-
- //endregion
-
/**
* 鏈湴鍗囩骇鍖呮帹閫�(鍛婅瘔缃戝叧涓嬭浇鍗囩骇鍖呭湴鍧�绛変俊鎭�)
*
@@ -474,6 +433,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);//妯″潡淇℃伅
@@ -481,8 +441,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) {
@@ -500,6 +462,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);
+// }
+// }
+// });
+ }
+
/**
* 鍚姩鏈湴鏈嶅姟
@@ -509,11 +508,12 @@
//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);
this.mServiceConnection = serviceConnection;
+ this.mServiceStart = true;
//鍚姩鏈嶅姟鐩戝惉
HDLApp.getInstance().bindService(intentServer, serviceConnection, Context.BIND_AUTO_CREATE);
}
@@ -524,75 +524,10 @@
public void unLocalService() {
if (intentServer != null && this.mServiceConnection != null) {
HDLApp.getInstance().unbindService(this.mServiceConnection);
+ this.mServiceStart = false;
}
}
- /**
- * 銆愭祴璇曘�戝鐞嗕笅杞芥枃浠舵暟鎹�
- *
- * @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;
- }
/**
* 澶勭悊涓嬭浇鏂囦欢鏁版嵁
@@ -607,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;
@@ -624,18 +559,18 @@
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();
- //todo 鐢ㄦ埛缁堟瀹剁户缁鍙栨暟鎹�;
+ //todo 鐢ㄦ埛缁堟缁х画璇诲彇鏁版嵁;
return false;
}
fos.write(buf, 0, len);
@@ -644,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());
@@ -686,12 +623,15 @@
* @param describe 鎻忚堪鏂囨湰
*/
public void eventBusPost(String fileFullPath, String type, int progressValue, String describe) {
+
+
if (this.stopDownload) {
- HdlFileLogic.getInstance().deleteFile(fileFullPath);//鍒犻櫎涓嬭浇涓嶅畬鎴愭暟鎹�;
+// HdlFileLogic.getInstance().deleteFile(fileFullPath);//鍒犻櫎涓嬭浇涓嶅畬鏁存暟鎹�;
+ //鍙栨秷涓嬭浇骞挎挱涓�娆�
BaseEventBus baseEventBus = new BaseEventBus();
baseEventBus.setTopic(localDownloadProgress);
Progress progress = new Progress();
- progress.step = progressValue;
+ progress.step = -108;
progress.describe = describe;
baseEventBus.setType(type);
baseEventBus.setData(progress);
@@ -706,16 +646,20 @@
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";
@@ -725,6 +669,8 @@
public int step;
//杩涘害鎻忚堪淇℃伅
public String describe;
+ //琛ㄧず鏄┍鍔紝鍥轰欢;
+ public String type;
}
--
Gitblit v1.8.0