From 74d51db562aea6e2d8cb8f861a5eeeeb750696fb Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 19 十二月 2023 20:57:47 +0800
Subject: [PATCH] 2023年12月19日20:57:41
---
app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java | 167 ++++++++++++++++++++++++++++---------------------------
1 files changed, 86 insertions(+), 81 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..e1c7539 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.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
@@ -30,9 +31,10 @@
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.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;
@@ -88,11 +90,16 @@
private Intent intentServer = null;
private ServiceConnection mServiceConnection = null;
+ /**
+ * 鏈嶅姟鏄惁寮�鍚� true=寮�鍚�
+ */
+ public boolean mServiceStart= false;
/**
* true琛ㄧず缁堟涓嬭浇鍗囩骇鏂囦欢(鐢ㄦ埛琛屼负)
*/
private boolean stopDownload = false;
+
//region -----鍥轰欢鍗囩骇---------
@@ -250,59 +257,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
@@ -394,15 +348,9 @@
}
- /**
- * 璁剧疆缁堟涓嬭浇鏂囦欢鎸囦护
- */
- public void setStopDriversDownload() {
- this.stopDownload = true;
- }
/**
- * 浜戠鍙戣捣銆愯澶囬┍鍔ㄣ�戝崌绾TA鎸囦护
+ * 浜戠鍙戣捣銆愯澶囬┍鍔ㄥ崌绾с�慜TA鎸囦护
*
* @param oid 缃戝叧璁惧oid
* @param driverVersionId 椹卞姩鐗堟湰id
@@ -431,12 +379,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 +416,6 @@
}
-
- //endregion
-
/**
* 鏈湴鍗囩骇鍖呮帹閫�(鍛婅瘔缃戝叧涓嬭浇鍗囩骇鍖呭湴鍧�绛変俊鎭�)
*
@@ -474,6 +430,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 +438,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 +459,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);
+// }
+// }
+// });
+ }
+
/**
* 鍚姩鏈湴鏈嶅姟
@@ -514,6 +510,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);
}
@@ -524,6 +521,7 @@
public void unLocalService() {
if (intentServer != null && this.mServiceConnection != null) {
HDLApp.getInstance().unbindService(this.mServiceConnection);
+ this.mServiceStart = false;
}
}
@@ -538,11 +536,11 @@
String driver = driver_type;
//-100:娌℃湁鏁版嵁;-101:娌℃湁md5绉橀挜;-102:md5绉橀挜涓嶅;-103:鏈夊紓甯�;
if (zipData == null) {
- this.eventBusPost(fullPath,driver, -100, "娌℃湁鏁版嵁");
+ this.eventBusPost(fullPath, driver, -100, "娌℃湁鏁版嵁");
return false;
}
if (TextUtils.isEmpty(md5)) {
- this.eventBusPost(fullPath,driver, -101, "娌℃湁md5绉橀挜");
+ this.eventBusPost(fullPath, driver, -101, "娌℃湁md5绉橀挜");
return false;
}
InputStream is = null;
@@ -555,7 +553,7 @@
is = zipData.byteStream();
long total = zipData.contentLength();
if (total == 0) {
- this.eventBusPost(fullPath,driver, -100, "娌℃湁鏁版嵁");
+ this.eventBusPost(fullPath, driver, -100, "娌℃湁鏁版嵁");
return false;
}
fos = new FileOutputStream(file);
@@ -567,7 +565,7 @@
int progress = (int) (100 * sum * 1.0f / total);
if (sum != total) {
//涓嶇瓑浜�100閮借鎶�,绛変簬100澶勭悊鏁村潡閫昏緫瀹屼箣鍚庡啀鎶�100;
- this.eventBusPost(fullPath,driver, progress, "姝ｅ父涓婃姤");
+ this.eventBusPost(fullPath, driver, progress, "姝ｅ父涓婃姤");
}
}
fos.flush();
@@ -576,19 +574,19 @@
byte[] bytes = FileUtils.readFileToByteArray(file);
String fileMD5 = Md5Utils.encodeMD5(bytes);
if (TextUtils.isEmpty(fileMD5)) {
- this.eventBusPost(fullPath,driver, -106, "鏂囦欢鐢熸垚md5澶辫触.");
+ this.eventBusPost(fullPath, driver, -106, "鏂囦欢鐢熸垚md5澶辫触.");
return false;
}
if (!md5.equals(fileMD5)) {
- this.eventBusPost(fullPath,driver, -107, "md5姣斿澶辫触.");
+ this.eventBusPost(fullPath, driver, -107, "md5姣斿澶辫触.");
return false;
}
- this.eventBusPost(fullPath,driver, 100, "涓嬭浇瀹屾垚.");
+ this.eventBusPost(fullPath, driver, 100, "涓嬭浇瀹屾垚.");
return true;
} catch (Exception e) {
- this.eventBusPost(fullPath,driver, -103, e.getMessage());
+ this.eventBusPost(fullPath, driver, -103, e.getMessage());
e.printStackTrace();
}
return false;
@@ -635,7 +633,7 @@
fos.flush();
fos.close();
is.close();
- //todo 鐢ㄦ埛缁堟瀹剁户缁鍙栨暟鎹�;
+ //todo 鐢ㄦ埛缁堟缁х画璇诲彇鏁版嵁;
return false;
}
fos.write(buf, 0, len);
@@ -686,13 +684,15 @@
* @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 = progressValue;
- progress.describe = describe;
+ progress.step = -108;
+ progress.describe = "鐢ㄦ埛鍙栨秷涓嬭浇.";
baseEventBus.setType(type);
baseEventBus.setData(progress);
EventBus.getDefault().post(baseEventBus);
@@ -706,11 +706,14 @@
Progress progress = new Progress();
progress.step = progressValue;
progress.describe = describe;
+ progress.type = type;
baseEventBus.setType(type);
baseEventBus.setData(progress);
EventBus.getDefault().post(baseEventBus);
// }
// });
+
+
}
@@ -725,6 +728,8 @@
public int step;
//杩涘害鎻忚堪淇℃伅
public String describe;
+ //琛ㄧず鏄┍鍔紝鍥轰欢;
+ public String type;
}
--
Gitblit v1.8.0