From 073e5d5103870246fe33029e5f6d36536a1bb76c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 30 六月 2023 10:33:05 +0800
Subject: [PATCH] 2023年06月30日10:33:03

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
index f914f0e..6ecf796 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -20,6 +20,7 @@
 import com.hdl.photovoltaic.ui.bean.OidBean;
 import com.hdl.photovoltaic.uni.HDLUniMP;
 import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
+import com.hdl.sdk.link.common.exception.HDLLinkCode;
 import com.hdl.sdk.link.common.exception.HDLLinkException;
 import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
 import com.hdl.sdk.link.core.callback.GatewayCallBack;
@@ -58,18 +59,23 @@
     /**
      * 娣诲姞閫嗗彉鍣�
      *
-     * @param inverterDeviceBean 閫嗗彉鍣ㄥ璞�
-     * @param cloudCallBeak      鍥炶皟
+     * @param mac           -
+     * @param spk           -
+     * @param sid           -
+     * @param oid           -
+     * @param name          -
+     * @param cloudCallBeak
      */
-    public void addInverterDevice(InverterDeviceBean inverterDeviceBean, CloudCallBeak<Boolean> cloudCallBeak) {
+    public void addInverterDevice(String mac, String spk, String sid, String oid, String name, CloudCallBeak<Boolean> cloudCallBeak) {
+
         String requestUrl = HttpApi.POST_Device_Add;
         JsonObject json = new JsonObject();
         json.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
-        json.addProperty("mac", inverterDeviceBean.getDevice_mac());
-        json.addProperty("spk", inverterDeviceBean.getGateway_type());
-        json.addProperty("sid", inverterDeviceBean.getSid());
-        json.addProperty("oid", inverterDeviceBean.getOid());
-        json.addProperty("name", inverterDeviceBean.getDevice_name());
+        json.addProperty("mac", mac);
+        json.addProperty("spk", spk);
+        json.addProperty("sid", sid);
+        json.addProperty("oid", oid);
+        json.addProperty("name", name);
         // json.addProperty("zoneType", "password");//鍖哄煙
 
         HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() {
@@ -271,7 +277,7 @@
      * @param mac           璁惧mac
      * @param cloudCallBeak 鍥炶皟update
      */
-    public void steEditGatewayParam(String mac, CloudCallBeak<Boolean> cloudCallBeak) {
+    public void editGatewayParam(String mac, CloudCallBeak<Boolean> cloudCallBeak) {
         String requestUrl = TopicApi.GATEWAY_SEND_EDIT;
         JsonObject json = new JsonObject();
         json.addProperty("master", "true");

--
Gitblit v1.8.0