From 936fb552a30c05fc7a60c20f47bf6fccbc2dc1c1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 27 十二月 2023 16:17:23 +0800
Subject: [PATCH] 备份一下代码

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java |  881 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 818 insertions(+), 63 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 da64b67..aabe708 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -1,32 +1,44 @@
 package com.hdl.photovoltaic.other;
 
+import android.text.TextUtils;
+
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.reflect.TypeToken;
-import com.hdl.photovoltaic.bean.HttpResponsePack;
+import com.hdl.linkpm.sdk.core.exception.HDLException;
+import com.hdl.photovoltaic.config.AppConfigManage;
 import com.hdl.photovoltaic.config.UserConfigManage;
 import com.hdl.photovoltaic.internet.HttpClient;
+import com.hdl.photovoltaic.internet.TcpClient;
 import com.hdl.photovoltaic.internet.api.HttpApi;
-import com.hdl.photovoltaic.listener.BaseSuccessFailureCallBeak;
+import com.hdl.photovoltaic.internet.api.TopicApi;
 import com.hdl.photovoltaic.listener.CloudCallBeak;
+import com.hdl.photovoltaic.listener.LinkCallBack;
 import com.hdl.photovoltaic.ui.bean.CloudInverterChildDeviceBean;
 import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
-import com.hdl.photovoltaic.ui.bean.InverterDeviceBean;
+import com.hdl.photovoltaic.ui.bean.DeviceRemoteInfo;
+import com.hdl.photovoltaic.ui.bean.DeviceTimeBean;
 import com.hdl.photovoltaic.ui.bean.OidBean;
-import com.hdl.photovoltaic.uni.HDLUniMP;
-import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
+import com.hdl.sdk.link.HDLLinkLocalSdk;
 import com.hdl.sdk.link.common.exception.HDLLinkException;
 import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
+import com.hdl.sdk.link.core.bean.response.BaseLocalResponse;
 import com.hdl.sdk.link.core.callback.GatewayCallBack;
+import com.hdl.sdk.link.core.callback.HDLLinkCallBack;
+import com.hdl.sdk.link.core.config.HDLLinkConfig;
 import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
+import com.hdl.sdk.link.gateway.type.GatewayMasterType;
+
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
 
 /**
- * 璁惧閫昏緫鐨勭晫闈�
+ * 璁惧閫昏緫
  */
 public class HdlDeviceLogic {
     private static volatile HdlDeviceLogic sHdlDeviceLogic;
@@ -49,75 +61,168 @@
     }
 
     /**
-     * 娣诲姞閫嗗彉鍣�
-     *
-     * @param inverterDeviceBean 閫嗗彉鍣ㄥ璞�
-     * @param cloudCallBeak      鍥炶皟
+     * 鑾峰彇褰撳墠浣忓畢鐨勯�嗗彉鍣ㄥ垪琛�(鍖呮嫭浠庣殑閫嗗彉鍣�)
      */
-    public void addInverterDevice(InverterDeviceBean inverterDeviceBean, CloudCallBeak<Boolean> cloudCallBeak) {
+    public List<GatewayBean> getCurrentHomeGatewayList() {
+        List<GatewayBean> newList = new ArrayList<>();
+        List<GatewayBean> list = HDLLinkLocalGateway.getInstance().getGatewayList();
+        if (list.size() > 0) {
+            for (int i = 0; i < list.size(); i++) {
+                GatewayBean gatewayBean = list.get(i);
+                if (TextUtils.isEmpty(gatewayBean.getDevice_mac())) {
+                    continue;
+                }
+                //鐢╤omeId绛涢�夊綋鍓嶄綇瀹呯殑閫嗗彉鍣ㄥ垪琛�
+                if (gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
+                    newList.add(gatewayBean);
+                }
+            }
+        }
+        return newList;
+    }
+
+    /**
+     * 鑾峰彇褰撳墠浣忓畢鐨勩�愪富銆戦�嗗彉鍣�
+     */
+    public GatewayBean getCurrentHomeMainGateway() {
+        return queryCurrentHomeMainGateway(this.getCurrentHomeGatewayList());
+    }
+
+    /**
+     * 鏌ヨ褰撳墠浣忓畢鐨勩�愪富銆戦�嗗彉鍣�
+     */
+    public GatewayBean queryCurrentHomeMainGateway(List<GatewayBean> list) {
+        if (list == null || list.size() == 0) {
+            return null;
+        }
+        GatewayBean findGatewayBean = null;
+        for (int i = 0; i < list.size(); i++) {
+            GatewayBean gatewayBean = list.get(i);
+            if (gatewayBean.getMaster().equals(GatewayMasterType.MasterTrue) && gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
+                //鎵惧埌杩斿洖
+                findGatewayBean = gatewayBean;
+                break;
+            }
+        }
+        return findGatewayBean;
+    }
+
+
+    /**
+     * 閫嗗彉鍣ㄤ笂浼犳暟鎹埌浜戠(鍖呮嫭:sid锛宱id)
+     *
+     * @param homeId 浣忓畢id
+     * @param mac    璁惧mac
+     */
+    public void uploadDataToCloud(String homeId, String mac, CloudCallBeak<Boolean> callBeak) {
+        getInverterOidList(mac, new LinkCallBack<List<OidBean>>() {
+            @Override
+            public void onSuccess(List<OidBean> obj) {
+                if (obj == null) {
+                    return;
+                }
+                fullUpdateOid(homeId, obj, new CloudCallBeak<Boolean>() {
+                    @Override
+                    public void onSuccess(Boolean obj) {
+                        HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔垚鍔�-->" + homeId + "--->" + mac, true);
+                    }
+
+                    @Override
+                    public void onFailure(HDLException e) {
+                        HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�-->" + homeId + "--->" + mac + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
+                    }
+                });
+            }
+
+            @Override
+            public void onError(HDLLinkException e) {
+                HdlLogLogic.print("鑾峰彇閫嗗彉鍣╫id鍒楄〃澶辫触-->" + homeId + "--->" + mac + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
+            }
+        });
+
+    }
+
+    /**
+     * 娣诲姞閫嗗彉鍣ㄥ埌浜戠涓�
+     *
+     * @param mac           -
+     * @param spk           -
+     * @param sid           -
+     * @param oid           -
+     * @param name          -
+     * @param cloudCallBeak -
+     */
+    public void addInverterDeviceToCloud(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() {
+        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
             @Override
-            public void onSuccess(HttpResponsePack httpResponsePack) {
+            public void onSuccess(String str) {
                 if (cloudCallBeak != null) {
                     cloudCallBeak.onSuccess(true);
+                    //涓存椂鐨勯�昏緫锛屼笂浼爋id鍒楄〃鍒颁簯绔�
+                    uploadDataToCloud(UserConfigManage.getInstance().getHomeId(), mac, null);
                 }
             }
 
             @Override
-            public void onFailure(Exception exception) {
+            public void onFailure(HDLException e) {
                 if (cloudCallBeak != null) {
-                    cloudCallBeak.onFailure(exception);
+                    cloudCallBeak.onFailure(e);
                 }
             }
         });
     }
 
     /**
-     * 鑾峰彇閫嗗彉鍣ㄥ垪琛�
+     * 鑾峰彇浜戠閫嗗彉鍣ㄥ垪琛�
      *
-     * @param inverterDeviceBean 閫嗗彉鍣ㄥ璞�
-     * @param cloudCallBeak      鍥炶皟
+     * @param homeId        浣忓畢id
+     * @param cloudCallBeak 鍥炶皟
      */
-    public void getInverterDeviceList(InverterDeviceBean inverterDeviceBean, CloudCallBeak<CloudInverterDeviceBean> cloudCallBeak) {
+    public void getCloudInverterDeviceList(String homeId, CloudCallBeak<List<CloudInverterDeviceBean>> cloudCallBeak) {
         String requestUrl = HttpApi.POST_Device_List;
         JsonObject json = new JsonObject();
-        json.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
+        json.addProperty("homeId", homeId);
         // json.addProperty("zoneType", "password");//鍖哄煙
 
-        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() {
+        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
             @Override
-            public void onSuccess(HttpResponsePack httpResponsePack) {
-                if (httpResponsePack != null && httpResponsePack.getData() != null) {
-                    Gson gson = new Gson();
-                    String json = gson.toJson(httpResponsePack.getData());
-                    CloudInverterDeviceBean loginUserRegionBean = new Gson().fromJson(json, CloudInverterDeviceBean.class);
+            public void onSuccess(String jsonStr) {
+                if (TextUtils.isEmpty(jsonStr)) {
                     if (cloudCallBeak != null) {
-                        cloudCallBeak.onSuccess(loginUserRegionBean);
+                        cloudCallBeak.onSuccess(null);
                     }
+                }
+                Type type = new TypeToken<List<CloudInverterDeviceBean>>() {
+                }.getType();
+                List<CloudInverterDeviceBean> list = new Gson().fromJson(jsonStr, type);
+                if (cloudCallBeak != null) {
+                    cloudCallBeak.onSuccess(list);
                 }
             }
 
             @Override
-            public void onFailure(Exception exception) {
+            public void onFailure(HDLException e) {
                 if (cloudCallBeak != null) {
-                    cloudCallBeak.onFailure(exception);
+                    cloudCallBeak.onFailure(e);
                 }
             }
         });
     }
 
+
     /**
-     * 鍒犻櫎閫嗗彉鍣�
+     * 鍒犻櫎浜戠涓婇�嗗彉鍣�
      *
      * @param deviceId      璁惧id
      * @param cloudCallBeak 鍥炶皟
@@ -129,18 +234,18 @@
         json.addProperty("deviceId", deviceId);
         // json.addProperty("zoneType", "password");//鍖哄煙
 
-        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() {
+        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
             @Override
-            public void onSuccess(HttpResponsePack httpResponsePack) {
+            public void onSuccess(String str) {
                 if (cloudCallBeak != null) {
                     cloudCallBeak.onSuccess(true);
                 }
             }
 
             @Override
-            public void onFailure(Exception exception) {
+            public void onFailure(HDLException e) {
                 if (cloudCallBeak != null) {
-                    cloudCallBeak.onFailure(exception);
+                    cloudCallBeak.onFailure(e);
                 }
             }
         });
@@ -159,25 +264,28 @@
         json.addProperty("parentOid", parentOid);
         // json.addProperty("zoneType", "password");//鍖哄煙
 
-        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() {
+        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
             @Override
-            public void onSuccess(HttpResponsePack httpResponsePack) {
-                if (httpResponsePack != null && httpResponsePack.getData() != null) {
-                    Gson gson = new Gson();
-                    String json = gson.toJson(httpResponsePack.getData());
-                    Type typeOfT = new TypeToken<List<CloudInverterChildDeviceBean>>() {
-                    }.getType();
-                    List<CloudInverterChildDeviceBean> list = gson.fromJson(json, typeOfT);
+            public void onSuccess(String jsonStr) {
+                if (TextUtils.isEmpty(jsonStr)) {
                     if (cloudCallBeak != null) {
-                        cloudCallBeak.onSuccess(list);
+                        cloudCallBeak.onSuccess(null);
                     }
+                    return;
+                }
+                Gson gson = new Gson();
+                Type typeOfT = new TypeToken<List<CloudInverterChildDeviceBean>>() {
+                }.getType();
+                List<CloudInverterChildDeviceBean> list = gson.fromJson(jsonStr, typeOfT);
+                if (cloudCallBeak != null) {
+                    cloudCallBeak.onSuccess(list);
                 }
             }
 
             @Override
-            public void onFailure(Exception exception) {
+            public void onFailure(HDLException e) {
                 if (cloudCallBeak != null) {
-                    cloudCallBeak.onFailure(exception);
+                    cloudCallBeak.onFailure(e);
                 }
             }
         });
@@ -186,21 +294,22 @@
     /**
      * 鍏ㄩ噺鏇存柊OID
      *
+     * @param homeId        浣忓畢id
      * @param oidList       oid鍒楄〃
-     * @param cloudCallBeak 鍥炶皟
+     * @param cloudCallBeak 鍥炶皟update
      */
-    public void fullRenewalOid(List<OidBean> oidList, CloudCallBeak<Boolean> cloudCallBeak) {
-        String requestUrl = HttpApi.POST_Device_ChildDevices_List;
+    public void fullUpdateOid(String homeId, List<OidBean> oidList, CloudCallBeak<Boolean> cloudCallBeak) {
+        String requestUrl = HttpApi.POST_Device_Oid;
         JsonObject json = new JsonObject();
         json.addProperty("operationSource", "PROGRAM_ENERGY");//
-        json.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
+        json.addProperty("homeId", homeId);
         JsonArray jsonArray = new JsonArray();
         for (int i = 0; i < oidList.size(); i++) {
             OidBean oidBean = oidList.get(i);
             JsonObject jsonObject = new JsonObject();
             jsonObject.addProperty("protocolType", oidBean.getProtocolType());
             jsonObject.addProperty("deviceType", oidBean.getDeviceType());
-            jsonObject.addProperty("mac", oidBean.getMac());
+            jsonObject.addProperty("mac", oidBean.getDevice_mac());
             jsonObject.addProperty("oid", oidBean.getOid());
             jsonObject.addProperty("device_name", oidBean.getDevice_name());
             jsonObject.addProperty("device_model", oidBean.getDevice_model());
@@ -212,9 +321,9 @@
         json.add("devices", jsonArray);
         // json.addProperty("zoneType", "password");//鍖哄煙
 
-        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() {
+        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
             @Override
-            public void onSuccess(HttpResponsePack httpResponsePack) {
+            public void onSuccess(String str) {
 
                 if (cloudCallBeak != null) {
                     cloudCallBeak.onSuccess(true);
@@ -223,9 +332,9 @@
             }
 
             @Override
-            public void onFailure(Exception exception) {
+            public void onFailure(HDLException e) {
                 if (cloudCallBeak != null) {
-                    cloudCallBeak.onFailure(exception);
+                    cloudCallBeak.onFailure(e);
                 }
             }
         });
@@ -233,11 +342,657 @@
     }
 
 
-    public void searchGateway(GatewayCallBack gatewayCallBack)
-    {
-        List<String> spks = new ArrayList<>();
-        spks.add("energy.hdl_inverter");
+    /**
+     * 璁剧疆缃戝叧杩滅▼鍙傛暟
+     *
+     * @param mac          璁惧mac
+     * @param linkCallBack 鍥炶皟update
+     */
+    public void setGatewayRemoteParam(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());
+        //瑙e瘑璐熻浇鏁版嵁(鍐欏瘑閽ョ粰缃戝叧涓�瀹氭槸鏄庢枃锛屽洜涓洪偅鏃剁綉鍏宠繕娌℃湁瀵嗛挜)
+        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);
+                }
+            }
+        });
+    }
+
+    /**
+     * 缃戝叧鏃堕棿璇诲彇
+     *
+     * @param mac          璁惧mac
+     * @param linkCallBack 鍥炶皟update
+     */
+    public void getGatewayTime(String mac, LinkCallBack<DeviceTimeBean> linkCallBack) {
+        String requestUrl = TopicApi.GET_GATEWAY_TIME;
+        TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, null, "", new HDLLinkCallBack() {
+            @Override
+            public void onSuccess(String json) {
+
+                if (TextUtils.isEmpty(json)) {
+                    if (linkCallBack != null) {
+                        linkCallBack.onSuccess(new DeviceTimeBean());
+                    }
+                    return;
+                }
+
+                Gson gson = new Gson();
+                Type typeOfT = new TypeToken<BaseLocalResponse<DeviceTimeBean>>() {
+                }.getType();
+                BaseLocalResponse<DeviceTimeBean> baseLocalResponse = gson.fromJson(json, typeOfT);
+                if (linkCallBack != null) {
+                    linkCallBack.onSuccess(baseLocalResponse.getObjects());
+                }
+            }
+
+            @Override
+            public void onError(HDLLinkException e) {
+                if (linkCallBack != null) {
+                    linkCallBack.onError(e);
+                }
+            }
+        });
+
+    }
+
+    /**
+     * 缃戝叧鏃堕棿淇敼
+     *
+     * @param mac          璁惧mac
+     * @param date         鏃ユ湡
+     * @param time         鏃堕棿
+     * @param linkCallBack 鍥炶皟update
+     */
+    public void editGatewayTime(String mac, String date, String time, LinkCallBack<Boolean> linkCallBack) {
+        String requestUrl = TopicApi.SET_GATEWAY_TIME_EDIT;
+        JsonObject json = new JsonObject();
+        json.addProperty("date", date);// "2020-08-15"
+        json.addProperty("time", time);//"17:25:20"
+        TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, json, "", new HDLLinkCallBack() {
+            @Override
+            public void onSuccess(String msg) {
+                if (linkCallBack != null) {
+                    linkCallBack.onSuccess(true);
+                }
+            }
+
+            @Override
+            public void onError(HDLLinkException e) {
+                if (linkCallBack != null) {
+                    linkCallBack.onError(e);
+                }
+            }
+        });
+
+    }
+
+    /**
+     * 缂栬緫缃戝叧鍙傛暟
+     *
+     * @param mac          璁惧mac
+     * @param linkCallBack 鍥炶皟update
+     */
+    public void editGatewayParam(String mac, LinkCallBack<Boolean> linkCallBack) {
+        String requestUrl = TopicApi.SET_GATEWAY_EDIT;
+        JsonObject json = new JsonObject();
+        json.addProperty("master", GatewayMasterType.MasterTrue);
+        TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, json, "", new HDLLinkCallBack() {
+            @Override
+            public void onSuccess(String msg) {
+                if (linkCallBack != null) {
+                    linkCallBack.onSuccess(true);
+                }
+            }
+
+            @Override
+            public void onError(HDLLinkException e) {
+                if (linkCallBack != null) {
+                    linkCallBack.onError(e);
+                }
+            }
+        });
+
+    }
+
+    /**
+     * 鑾峰彇缃戝叧璇︽儏淇℃伅
+     *
+     * @param mac          缃戝叧mac
+     * @param linkCallBack 鍥炶皟
+     */
+    public void getGatewayInfo(String mac, LinkCallBack<GatewayBean> linkCallBack) {
+        String requestUrl = TopicApi.GET_GATEWAY_INFO;
+        TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, null, "", new HDLLinkCallBack() {
+            @Override
+            public void onSuccess(String json) {
+                if (TextUtils.isEmpty(json)) {
+                    if (linkCallBack != null) {
+                        linkCallBack.onSuccess(null);
+                    }
+                    return;
+                }
+                Gson gson = new Gson();
+                GatewayBean gatewayBean = gson.fromJson(json, GatewayBean.class);
+                if (linkCallBack != null) {
+                    linkCallBack.onSuccess(gatewayBean);
+                }
+            }
+
+            @Override
+            public void onError(HDLLinkException e) {
+                if (linkCallBack != null) {
+                    linkCallBack.onError(e);
+                }
+            }
+        });
+
+    }
+
+    /**
+     * 鑾峰彇閫嗗彉鍣╫id鍒楄〃
+     *
+     * @param mac          缃戝叧mac
+     * @param linkCallBack 鍥炶皟
+     */
+    public void getInverterOidList(String mac, LinkCallBack<List<OidBean>> linkCallBack) {
+        String requestUrl = TopicApi.GET_GATEWAY_OID_LIST;
+        TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, null, "", new HDLLinkCallBack() {
+            @Override
+            public void onSuccess(String json) {
+                if (TextUtils.isEmpty(json)) {
+                    if (linkCallBack != null) {
+                        linkCallBack.onSuccess(null);
+                    }
+                    return;
+                }
+                Gson gson = new Gson();
+                Type typeOfT = new TypeToken<BaseLocalResponse<List<OidBean>>>() {
+                }.getType();
+                BaseLocalResponse<List<OidBean>> baseLocalResponse = gson.fromJson(json, typeOfT);
+
+                if (linkCallBack == null) {
+                    return;
+                }
+                if (baseLocalResponse == null || baseLocalResponse.getObjects() == null) {
+                    linkCallBack.onSuccess(new ArrayList<>());
+                } else {
+                    linkCallBack.onSuccess(baseLocalResponse.getObjects());
+                }
+            }
+
+            @Override
+            public void onError(HDLLinkException e) {
+                if (linkCallBack != null) {
+                    linkCallBack.onError(e);
+                }
+            }
+        });
+
+    }
+
+    /**
+     * 鑾峰彇閫嗗彉鍣ㄥ垪琛�(鏁村悎浜戠鍜屾湰鍦板垪琛�)
+     * 娉ㄦ剰:鏈夊缃戯紝浠ヤ簯绔澶囦负鍑�,鏈湴瀛樺湪锛屼簯绔病鏈夊垯鍒犻櫎锛涘唴缃戯紝浠ユ湰鍦颁负涓�,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓紱
+     *
+     * @param homeId        浣忓畢id
+     * @param cloudCallBeak 杩斿洖閫嗗彉鍣ㄥ垪琛�
+     */
+    public void getCurrentHomeLocalAndCloudGatewayList(String homeId, CloudCallBeak<List<GatewayBean>> cloudCallBeak) {
+        HdlDeviceLogic.getInstance().searchCurrentHomeGateway(new GatewayCallBack() {
+            @Override
+            public void onSuccess(List<GatewayBean> gatewayBeanList) {
+                //灞�鍩熺綉鏈�2绉嶆儏鍐�(1:鏈夊眬鍩熺綉锛屾湁澶栫綉锛�2:鏈夊眬鍩熺綉锛屾病鏈夊缃�);
+                HdlDeviceLogic.getInstance().getCloudInverterDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
+                    @Override
+                    public void onSuccess(List<CloudInverterDeviceBean> list) {
+                        ///鎯呭喌1:鏈夊眬鍩熺綉锛屾湁澶栫綉锛�
+                        if (list == null || list.size() == 0) {
+                            //浜戠娌℃湁缁戝畾閫嗗彉鍣�,榛樿杩斿洖鏈湴閫嗗彉鍣ㄥ垪琛�;
+                            if (cloudCallBeak != null) {
+                                cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
+                            }
+                            return;
+                        }
+                        //璁板綍鏉℃暟
+                        AtomicInteger atomicInteger = new AtomicInteger(0);
+                        for (int i = 0; i < list.size(); i++) {
+                            CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
+                            //鑾峰彇杩滅▼璁惧閫氳淇℃伅(鎷垮埌缃戝叧ID锛宮qtt閫氳绉橀挜)
+                            getDeviceRemoteInfo(homeId, cloudInverterDeviceBean.getSpk(), cloudInverterDeviceBean.getOsn(), new CloudCallBeak<DeviceRemoteInfo>() {
+                                @Override
+                                public void onSuccess(DeviceRemoteInfo deviceRemoteInfo) {
+                                    atomicInteger.set(atomicInteger.get() + 1);
+                                    //鏇存柊閫嗗彉鍣ㄦ湰鍦扮紦瀛樹俊鎭�
+                                    refreshGatewayCacheData(true, cloudInverterDeviceBean, deviceRemoteInfo);
+                                    //鏈�鍚庝竴鏉℃墠鍋氬垹闄ら�嗗彉鍣ㄩ�昏緫澶勭悊
+                                    if (atomicInteger.get() == list.size()) {
+                                        //鏀堕泦鍒犻櫎閫嗗彉鍣╯id
+                                        List<String> removeSidList = new ArrayList<>();
+                                        for (int i = 0; i < list.size(); i++) {
+                                            CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
+                                            for (int j = 0; j < HDLLinkLocalGateway.getInstance().getGatewayList().size(); j++) {
+                                                GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getGatewayList().get(j);
+                                                if (!cloudInverterDeviceBean.getSid().equals(gatewayBean.getSid())) {
+                                                    //鏈湴鏈夛紝浜戠娌℃湁,鍒犻櫎鏈湴锛�
+                                                    removeSidList.add(gatewayBean.getSid());
+                                                }
+
+                                            }
+                                        }
+                                        for (int i = 0; i < removeSidList.size(); i++) {
+                                            //鍒犻櫎鏈湴鐨勯�嗗彉鍣�
+                                            removeLocalInverter(removeSidList.get(i));
+                                        }
+                                        if (cloudCallBeak != null) {
+                                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
+                                        }
+                                    }
+                                }
+
+                                @Override
+                                public void onFailure(HDLException e) {
+                                    atomicInteger.set(atomicInteger.get() + 1);
+                                    //褰撴渶鍚庝竴鏉¤姹傚け璐ヤ簡锛屾墠鍦ㄨ繖閲屽仛鍒犻櫎閫嗗彉鍣ㄩ�昏緫澶勭悊
+                                    if (atomicInteger.get() == list.size()) {
+                                        //鏀堕泦鍒犻櫎閫嗗彉鍣╯id
+                                        List<String> removeSidList = new ArrayList<>();
+                                        for (int i = 0; i < list.size(); i++) {
+                                            CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
+                                            for (int j = 0; j < HDLLinkLocalGateway.getInstance().getGatewayList().size(); j++) {
+                                                GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getGatewayList().get(j);
+                                                if (!cloudInverterDeviceBean.getSid().equals(gatewayBean.getSid())) {
+                                                    //鏈湴鏈夛紝浜戠娌℃湁,鍒犻櫎鏈湴锛�
+                                                    removeSidList.add(gatewayBean.getSid());
+                                                }
+
+                                            }
+                                        }
+                                        for (int i = 0; i < removeSidList.size(); i++) {
+                                            //鍒犻櫎鏈湴鐨勯�嗗彉鍣�
+                                            removeLocalInverter(removeSidList.get(i));
+                                        }
+                                        if (cloudCallBeak != null) {
+                                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
+                                        }
+                                    }
+                                    HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触->msg->" + e.getMsg() + "(" + e.getCode() + ")");
+                                }
+                            });
+                        }
+
+
+                    }
+
+                    @Override
+                    public void onFailure(HDLException e) {
+                        ///鎯呭喌2:鏈夊眬鍩熺綉锛屾病鏈夊缃�;
+                        //鏈湴鏈夐�嗗彉鍣ㄥ垪琛�,鑾峰彇浜戠缁戝畾閫嗗彉鍣ㄥけ璐�,榛樿杩斿洖鏈湴閫嗗彉鍣ㄥ垪琛�;
+                        if (cloudCallBeak != null) {
+                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
+                        }
+                    }
+                });
+            }
+
+            @Override
+            public void onError(HDLLinkException e) {
+                //澶栫綉鍙湁1绉嶆儏鍐�(鏈湴鎼滅储閫嗗彉鍣ㄥ垪琛ㄥけ璐ヤ簡)
+                HdlDeviceLogic.getInstance().getCloudInverterDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
+                    @Override
+                    public void onSuccess(List<CloudInverterDeviceBean> list) {
+                        //澶栫綉杩涙潵鍏堛�愰粯璁ゃ�戞竻绌烘湰鍦伴�嗗彉鍣ㄥ垪琛�
+                        HDLLinkLocalGateway.getInstance().getGatewayList().clear();
+                        if (list == null || list.size() == 0) {
+                            if (cloudCallBeak != null) {
+                                //浜戠涔熸病鏈夐�嗗彉鍣ㄥ垪琛�,杩斿洖绌哄垪琛ㄥ洖鍘�
+                                cloudCallBeak.onSuccess(new ArrayList<>());
+                            }
+                            HdlLogLogic.print("鍦ㄥ彧鏈夈�愬缃戙�戞儏鍐典笅鑾峰彇浜戠閫嗗彉鍣ㄥ垪琛ㄨ繑鍥炵┖鍒楄〃", true);
+                            return;
+                        }
+                        //璁板綍鏉℃暟
+                        AtomicInteger atomicInteger = new AtomicInteger(0);
+
+                        for (int i = 0; i < list.size(); i++) {
+                            CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
+
+                            //鑾峰彇杩滅▼璁惧閫氳淇℃伅(鎷垮埌缃戝叧ID锛宮qtt閫氳绉橀挜)
+                            getDeviceRemoteInfo(homeId, cloudInverterDeviceBean.getSpk(), cloudInverterDeviceBean.getOsn(), new CloudCallBeak<DeviceRemoteInfo>() {
+                                @Override
+                                public void onSuccess(DeviceRemoteInfo deviceRemoteInfo) {
+                                    atomicInteger.set(atomicInteger.get() + 1);
+                                    //鏇存柊閫嗗彉鍣ㄦ湰鍦扮紦瀛樹俊鎭�
+                                    refreshGatewayCacheData(false, cloudInverterDeviceBean, deviceRemoteInfo);
+                                    //鍒版渶鍚庝竴鏉★紝鎵嶆湁鍥炶皟
+                                    if (atomicInteger.get() == list.size()) {
+                                        if (cloudCallBeak != null) {
+                                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
+                                        }
+                                    }
+                                }
+
+                                @Override
+                                public void onFailure(HDLException e) {
+                                    atomicInteger.set(atomicInteger.get() + 1);
+                                    //褰撴渶鍚庝竴鏉¤姹傚け璐ヤ簡锛屾墠鏈夊洖璋�
+                                    if (atomicInteger.get() == list.size()) {
+                                        if (cloudCallBeak != null) {
+                                            cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
+                                        }
+                                    }
+                                    HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触->msg->" + e.getMsg() + "(" + e.getCode() + ")");
+                                }
+                            });
+                        }
+
+
+                    }
+
+                    @Override
+                    public void onFailure(HDLException e) {
+                        if (cloudCallBeak != null) {
+                            cloudCallBeak.onFailure(e);
+                        }
+                    }
+                });
+            }
+        });
+    }
+
+    /**
+     * 鑾峰彇璁惧杩滅▼閫氳淇℃伅
+     *
+     * @param homeId        浣忓畢Id
+     * @param spk           spk
+     * @param mac           璁惧mac
+     * @param cloudCallBeak 鍥炶皟
+     */
+    public void getDeviceRemoteInfo(String homeId, String spk, String mac, CloudCallBeak<DeviceRemoteInfo> cloudCallBeak) {
+        String requestUrl = HttpApi.POST_Device_RemoteInfo;
+        JsonObject json = new JsonObject();
+        json.addProperty("homeId", homeId);
+        json.addProperty("spk", spk);
+        json.addProperty("mac", mac);
+        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+            @Override
+            public void onSuccess(String jsonStr) {
+                if (TextUtils.isEmpty(jsonStr)) {
+                    if (cloudCallBeak != null) {
+                        cloudCallBeak.onSuccess(null);
+                    }
+                }
+                Type type = new TypeToken<DeviceRemoteInfo>() {
+                }.getType();
+                DeviceRemoteInfo deviceRemoteInfo = new Gson().fromJson(jsonStr, type);
+                if (cloudCallBeak != null) {
+                    cloudCallBeak.onSuccess(deviceRemoteInfo);
+                }
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                if (cloudCallBeak != null) {
+                    cloudCallBeak.onFailure(e);
+                }
+            }
+        });
+    }
+
+    /**
+     * 鍒犻櫎鏈湴缂撳瓨閫嗗彉鍣�
+     *
+     * @param sid 璁惧sid
+     */
+    private void removeLocalInverter(String sid) {
+        GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(sid);
+        if (gatewayBean != null) {
+            HDLLinkLocalGateway.getInstance().getGatewayList().remove(gatewayBean);
+        }
+    }
+
+    /**
+     * 娓呯┖閫嗗彉鍣ㄤ綇瀹卛d
+     *
+     * @param mac mac
+     */
+    public void clearInverterHomeId(String mac, LinkCallBack<Boolean> callBeak) {
+        String requestUrl = TopicApi.SET_GATEWAY_REMOTE_EDIT;
+        JsonObject json = new JsonObject();
+        json.addProperty("homeId", "");
+        json.addProperty("server_addr", "");
+        TcpClient.getInstance().sendDataToLinkGateway(mac, true, 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 (callBeak != null) {
+                    callBeak.onSuccess(true);
+                }
+
+            }
+
+            @Override
+            public void onError(HDLLinkException e) {
+                if (callBeak != null) {
+                    callBeak.onError(e);
+                }
+            }
+        });
+    }
+
+    /**
+     * 鎼滅储閫嗗彉鍣ㄥ垪琛�
+     * 娉ㄦ剰:鍙悳绱㈠綋鍓嶄綇瀹呴�嗗彉鍣ㄥ拰娌℃湁琚粦瀹氱殑閫嗗彉鍣�
+     *
+     * @param gatewayCallBack -
+     */
+    public void searchCurrentHomeGateway(GatewayCallBack gatewayCallBack) {
+        List<String> spks = this.getGatewaySpk();
         //缃戝叧鎼滅储
         HDLLinkLocalGateway.getInstance().refreshGatewayByHomeIdAndSpk(UserConfigManage.getInstance().getHomeId(), spks, true, gatewayCallBack);
     }
+
+    /**
+     * 鎼滅储灞�鍩熺綉鎵�鏈夐�嗗彉鍣ㄥ垪琛�
+     * 娉ㄦ剰:鍖呮嫭宸茬粡琚粦瀹氬埌浣忓畢鐨勯�嗗彉鍣�
+     *
+     * @param gatewayCallBack -
+     */
+    public void searchAllGateway(GatewayCallBack gatewayCallBack) {
+        //缃戝叧鎼滅储
+        HDLLinkLocalSdk.getInstance().refreshGateway(gatewayCallBack, this.getGatewaySpk());
+    }
+
+    /**
+     * 妫�娴嬫湰鍦拌繛鎺ョ姸鎬�
+     *
+     * @param deviceMac 璁惧mac锛�
+     * @param callBeak  杩斿洖 true=鏈湴杩炴帴;false=杩滅▼;
+     */
+    public void isLocalConnect(String deviceMac, CloudCallBeak<Boolean> callBeak) {
+        searchCurrentHomeGateway(new GatewayCallBack() {
+            @Override
+            public void onSuccess(List<GatewayBean> gatewayBeanList) {
+                if (gatewayBeanList == null || gatewayBeanList.size() == 0) {
+                    if (callBeak != null) {
+                        callBeak.onSuccess(false);
+                    }
+                    return;
+                }
+                boolean is_find = false;
+                for (int i = 0; i < gatewayBeanList.size(); i++) {
+                    GatewayBean gatewayBean = gatewayBeanList.get(i);
+                    if (gatewayBean.getDevice_mac().equals(deviceMac)) {
+                        //鍗囩骇鐨勬椂鍊欐悳绱㈢綉鍏冲垪琛�,鎶婁箣鍓峬qtt绉橀挜瑕嗙洊鎺�,瑕侀噸鏂拌幏鍙栨墠琛�;
+                        if (!TextUtils.isEmpty(gatewayBean.getHomeId())) {
+                            getDeviceRemoteInfo(gatewayBean.getHomeId(), gatewayBean.getSpk(), gatewayBean.getDevice_mac(), new CloudCallBeak<DeviceRemoteInfo>() {
+                                @Override
+                                public void onSuccess(DeviceRemoteInfo deviceRemoteInfo) {
+                                    if (deviceRemoteInfo != null) {
+                                        gatewayBean.setAesKey(deviceRemoteInfo.getSecret());//璁剧疆mqtt閫氳绉橀挜
+                                        gatewayBean.setGatewayId(deviceRemoteInfo.getGatewayId());//璁剧疆gatewayId
+                                        //todo 璁剧疆鍒般�愬簱銆戦噷闈�,搴曞眰mqtt璁㈤槄锛屽姞瑙e瘑浼氱敤鍒拌鍙傛暟;
+                                        HDLLinkConfig.getInstance().setAesKey(deviceRemoteInfo.getSecret());//璁剧疆mqtt閫氳绉橀挜搴�
+                                        HDLLinkConfig.getInstance().setGatewayId(deviceRemoteInfo.getGatewayId());//璁剧疆gatewayId
+                                    }
+                                }
+
+                                @Override
+                                public void onFailure(HDLException e) {
+
+                                }
+                            });
+                        }
+                        is_find = true;
+                        break;
+                    }
+
+                }
+                if (callBeak != null) {
+                    callBeak.onSuccess(is_find);
+                }
+            }
+
+            @Override
+            public void onError(HDLLinkException e) {
+                if (callBeak != null) {
+                    callBeak.onSuccess(false);
+                }
+            }
+        });
+    }
+
+    /**
+     * 妫�娴嬮�嗗彉鍣ㄦ湁娌℃湁杩炴帴涓婁簯
+     *
+     * @param deviceMac 璁惧mac
+     */
+    public void checkInverterConnectedCloud(String deviceMac, CloudCallBeak<CloudInverterDeviceBean> cloudCallBeak) {
+        this.getCloudInverterDeviceList(UserConfigManage.getInstance().getHomeId(), new CloudCallBeak<List<CloudInverterDeviceBean>>() {
+            @Override
+            public void onSuccess(List<CloudInverterDeviceBean> list) {
+                CloudInverterDeviceBean cloudInverterDeviceBean = null;
+                if (list != null && list.size() > 0) {
+                    for (int i = 0; i < list.size(); i++) {
+                        if (list.get(i).getOsn().equals(deviceMac)) {
+                            cloudInverterDeviceBean = list.get(i);
+                            break;
+                        }
+
+                    }
+                }
+                if (cloudCallBeak != null) {
+                    cloudCallBeak.onSuccess(cloudInverterDeviceBean);
+                }
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                if (cloudCallBeak != null) {
+                    cloudCallBeak.onFailure(e);
+                }
+            }
+        });
+    }
+
+
+    /**
+     * 鍒锋柊閫嗗彉鍣ㄧ紦瀛樹俊鎭�(鍖呮嫭璁剧疆mqtt绉橀挜锛�
+     * 娉�:
+     * 1:鏈湴瀛樺湪,鏇存柊淇℃伅鍗冲彲;
+     * 2:鏈湴涓嶅瓨鍦�,鍒欒櫄鎷熶竴涓�嗗彉鍣ㄥ璞℃坊鍔犲湪鏈湴;
+     *
+     * @param deviceRemoteInfo        璁惧杩滅▼閫氳淇℃伅
+     * @param cloudInverterDeviceBean 閫嗗彉鍣�
+     */
+    private void refreshGatewayCacheData(boolean isLocal, CloudInverterDeviceBean cloudInverterDeviceBean, DeviceRemoteInfo deviceRemoteInfo) {
+        //鏈湴鏌ユ壘閫嗗彉鍣�
+        GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(cloudInverterDeviceBean.getOsn());
+        if (gatewayBean == null) {
+            //涓嶅瓨鍦紝铏氭嫙涓�涓�嗗彉鍣ㄥ璞�;
+            gatewayBean = new GatewayBean();
+            HDLLinkLocalGateway.getInstance().getGatewayList().add(gatewayBean);//娣诲姞閫嗗彉鍣ㄨ澶�
+        }
+        //鏇存柊灞炴��
+        if (deviceRemoteInfo != null) {
+            gatewayBean.setAesKey(deviceRemoteInfo.getSecret());//璁剧疆mqtt閫氳绉橀挜
+            gatewayBean.setGatewayId(deviceRemoteInfo.getGatewayId());//璁剧疆gatewayId
+            //todo 璁剧疆鍒般�愬簱銆戦噷闈�,搴曞眰mqtt璁㈤槄锛屽姞瑙e瘑浼氱敤鍒拌鍙傛暟;
+            HDLLinkConfig.getInstance().setAesKey(deviceRemoteInfo.getSecret());//璁剧疆mqtt閫氳绉橀挜搴�
+            HDLLinkConfig.getInstance().setGatewayId(deviceRemoteInfo.getGatewayId());//璁剧疆gatewayId
+
+        }
+        gatewayBean.setHomeId(UserConfigManage.getInstance().getHomeId());//浣忓畢id
+        gatewayBean.setDeviceStatus(cloudInverterDeviceBean.getDeviceStatus());//璁剧疆缃戝叧鐘舵��
+        gatewayBean.setDeviceId(cloudInverterDeviceBean.getDeviceId());//璁剧疆link璁惧id
+        gatewayBean.setDevice_mac(cloudInverterDeviceBean.getOsn());//璁剧疆mac
+        gatewayBean.setOid(cloudInverterDeviceBean.getOid());//璁惧oid
+        gatewayBean.setSid(cloudInverterDeviceBean.getSid());//璁惧sid
+        gatewayBean.setDevice_name(cloudInverterDeviceBean.getName());//璁惧鍚嶇О
+        gatewayBean.setGatewayType(cloudInverterDeviceBean.getSpk());//璁剧疆spk
+        gatewayBean.setLocalEncrypt(true);
+        gatewayBean.setMaster(GatewayMasterType.MasterTrue);//榛樿閮芥槸涓婚�嗗彉鍣�(浠ュ悗鏀寔浠庨�嗗彉鍣ㄨ鏇存敼)
+        gatewayBean.setSystemStatusDesc(cloudInverterDeviceBean.getSystemStatusDesc());//璁惧鐘舵��
+        gatewayBean.setHwVersion(cloudInverterDeviceBean.getHwVersion());//杞欢鐗堟湰鍙�
+        gatewayBean.setCategorySecondName(cloudInverterDeviceBean.getCategorySecondName());//璁惧绫诲瀷(浜у搧浜岀骇鍒嗙被鍚嶇О
+        gatewayBean.setAddresses(cloudInverterDeviceBean.getAddresses());//瀛愮綉鍙�/璁惧鍙�,閫嗗彉鍣ㄥ湴鍧�
+        gatewayBean.setPowerPvNow(cloudInverterDeviceBean.getPowerPvNow());//鍙戠數鍔熺巼
+        gatewayBean.setTotalElectricityPvToday(cloudInverterDeviceBean.getTotalElectricityPvToday());//浠婃棩鍙戠數閲�
+        gatewayBean.setDevice_model(cloudInverterDeviceBean.getOmodel());//璁惧鍨嬪彿
+        gatewayBean.setSpk(cloudInverterDeviceBean.getSpk());//璁惧spk
+
+
+    }
+
+
+    /**
+     * 鑾峰彇缃戝叧鏀寔spk鍒楄〃
+     *
+     * @return -
+     */
+    public List<String> getGatewaySpk() {
+        List<String> spks = new ArrayList<>();
+        spks.add(DEVICE_SPK);
+        return spks;
+    }
+
+    public boolean isGatewaySpk(String spk) {
+        if (TextUtils.isEmpty(spk)) {
+            return false;
+        }
+        for (int i = 0; i < this.getGatewaySpk().size(); i++) {
+            if (this.getGatewaySpk().get(i).equals(spk)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public final String DEVICE_SPK = "energy.hdl_inverter";
 }

--
Gitblit v1.8.0