From f50e8e60e9da99e4f69d8ab76810dc7e5fb448bc Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 02 十二月 2024 10:29:09 +0800
Subject: [PATCH] 2024年12月02日10:29:05
---
app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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 bfc5c94..dd92a50 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlOtaLogic.java
@@ -143,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) {
@@ -263,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>() {
@@ -572,7 +579,7 @@
int progress = (int) (100 * sum * 1.0f / total);
if (sum != total) {
//涓嶇瓑浜�100閮借鎶�,绛変簬100澶勭悊鏁村潡閫昏緫瀹屼箣鍚庡啀鎶�100;
- this.eventBusPost(fileFullPath, driver, progress, "姝ｅ父涓婃姤杩涘害鍊�--->" + progress);
+ this.eventBusPost(fileFullPath, driver, progress, "姝ｅ父涓婃姤杩涘害鍊�---" + progress);
}
}
fos.flush();
--
Gitblit v1.8.0