From 734babb3a7348050fdffe845c560ba8b0b218152 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 20 十一月 2023 18:24:43 +0800
Subject: [PATCH] 2023年11月20日18:24:36
---
app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 52 insertions(+), 4 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 ca50153..d858f8c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
@@ -208,6 +208,12 @@
* @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);
@@ -237,6 +243,17 @@
}
}
});
+ }
+
+ /**
+ * 鍚戜簯绔幏鍙栥�愯澶囧浐浠躲�戜笅杞藉崌绾ф枃浠�
+ *
+ * @param downloadUrl 浜戠鍥轰欢鍦板潃
+ */
+ public void getDeviceFirmwareDownloadFile(String downloadUrl, CloudCallBeak<DownloadUrlBean> callBack) {
+ String requestUrl = HttpApi.POST_OTA_GET_LinkDeviceFirmwareDownloadUrl;
+ JsonObject json = new JsonObject();
+
}
//endregion
@@ -364,7 +381,11 @@
*
* @param driverVersionId 椹卞姩鐗堟湰Id
*/
- public void getDeviceDriverDownloadUrl(String driverVersionId, CloudCallBeak<DownloadUrlBean> callBack) {
+ public void getDeviceDriverDownloadUrl(String driverVersionId, CloudCallBeak<String> callBack) {
+// "driverCode":"029B9988",
+// "driverName":"鏍稿績灞�",
+// "imageId":"12345678",
+// "version":"V01.02.20"
String requestUrl = HttpApi.POST_OTA_GET_LinkDeviceDriverDownloadUrl;
JsonObject json = new JsonObject();
json.addProperty("driverVersionId", driverVersionId);
@@ -374,7 +395,7 @@
if (TextUtils.isEmpty(json)) {
if (callBack != null) {
- callBack.onSuccess(new DownloadUrlBean());
+ callBack.onSuccess("-2");
}
return;
}
@@ -382,9 +403,25 @@
Type typeOfT = new TypeToken<DownloadUrlBean>() {
}.getType();
DownloadUrlBean downloadUrlBean = gson.fromJson(json, typeOfT);
- if (callBack != null) {
- callBack.onSuccess(downloadUrlBean);
+ if (downloadUrlBean == null) {
+ if (callBack != null) {
+ callBack.onSuccess("-2");
+ }
+ return;
}
+ getDeviceDriverDownloadFile(downloadUrlBean.getDownloadUrl(), new CloudCallBeak<DownloadUrlBean>() {
+ @Override
+ public void onSuccess(DownloadUrlBean obj) {
+ String full = HdlFileLogic.getInstance().getDriveRootPath() + "/" + driverVersionId;
+ HdlFileLogic.getInstance().writeFile(full, obj.toString());
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+
+ }
+ });
+
}
@Override
@@ -396,6 +433,17 @@
});
}
+ /**
+ * 鍚戜簯绔幏鍙栥�愯澶囬┍鍔ㄣ�戜笅杞藉崌绾ф枃浠�
+ *
+ * @param downloadUrl 浜戠鍥轰欢鍦板潃
+ */
+ public void getDeviceDriverDownloadFile(String downloadUrl, CloudCallBeak<DownloadUrlBean> callBack) {
+ String requestUrl = HttpApi.POST_OTA_GET_LinkDeviceFirmwareDownloadUrl;
+ JsonObject json = new JsonObject();
+
+ }
+
//endregion
}
--
Gitblit v1.8.0