From 80f2ca2df62ff1cd03046864af504245be078eb2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 05 六月 2025 10:37:28 +0800
Subject: [PATCH] 2025年06月05日10:37:26
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 1403 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 1,160 insertions(+), 243 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 414c268..dfdbde9 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -1,27 +1,16 @@
package com.hdl.photovoltaic.other;
+import android.os.SystemClock;
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.hdlhttp.HxHttp;
-import com.hdl.linkpm.sdk.core.api.HDLCloudHomeApi;
-import com.hdl.linkpm.sdk.core.callback.IDefaultCallBack;
-import com.hdl.linkpm.sdk.core.callback.IResponseCallBack;
import com.hdl.linkpm.sdk.core.exception.HDLException;
-import com.hdl.linkpm.sdk.core.response.HDLResponse;
-import com.hdl.linkpm.sdk.device.bean.DeviceOidInfoBean;
-import com.hdl.linkpm.sdk.device.bean.GatewayCloudBean;
-import com.hdl.linkpm.sdk.ota.HDLLinkPMOta;
-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.linkpm.sdk.project.HDLLinkPMProject;
-import com.hdl.linkpm.sdk.utils.HDLExceptionSubmitUtils;
+import com.hdl.photovoltaic.bean.InverterBean;
+import com.hdl.photovoltaic.bean.LocalResponse;
+import com.hdl.photovoltaic.bean.PageNumberObject;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpClient;
@@ -32,10 +21,11 @@
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.DeviceInfoBean;
import com.hdl.photovoltaic.ui.bean.DeviceRemoteInfo;
import com.hdl.photovoltaic.ui.bean.DeviceTimeBean;
+import com.hdl.photovoltaic.ui.bean.NotRunBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
-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;
@@ -45,15 +35,14 @@
import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
import com.hdl.sdk.link.gateway.type.GatewayMasterType;
-import org.json.JSONException;
import java.lang.reflect.Type;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
-
-import io.dcloud.feature.unimp.DCUniMPJSCallback;
-import io.reactivex.rxjava3.disposables.Disposable;
/**
@@ -79,85 +68,425 @@
return sHdlDeviceLogic;
}
+
+ private List<CloudInverterDeviceBean> mListDevice = new ArrayList<>();
+
+
+ public void clearDeviceList() {
+ if (mListDevice == null) {
+ return;
+ }
+ if (mListDevice.size() > 0) {
+ mListDevice.clear();
+ }
+ }
+
+ public List<CloudInverterDeviceBean> getDeviceList() {
+ if (mListDevice == null) {
+ return new ArrayList<>();
+ }
+ return mListDevice;
+ }
+
/**
- * 鑾峰彇褰撳墠浣忓畢鐨勯�嗗彉鍣ㄥ垪琛�
+ * 鑾峰彇褰撳墠浣忓畢鐨勯�嗗彉鍣ㄥ垪琛�(鍖呮嫭浠庣殑閫嗗彉鍣�)
+ *
+ * @param homeId 鐢电珯ID
*/
- 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);
+ public List<GatewayBean> getCurrentHomeGatewayList(String homeId) {
+ try {
+
+ List<GatewayBean> newList = new ArrayList<>();
+ //浜戠鏈夎澶囧垪琛紝鏈湴娌℃湁锛屽嵆HDLLinkLocalGateway.getInstance().getGatewayList()娌℃湁锛岄噷闈細璋冪敤refreshGatewayCacheData()鏂规硶铏氭嫙涓�涓�嗗彉鍣ㄥ疄浣撴坊鍔犳湰鍦板垪琛ㄩ噷闈紱
+ List<GatewayBean> list = HDLLinkLocalGateway.getInstance().getGatewayList();
+ if (list.size() > 0) {
+ for (int i = 0; i < list.size(); i++) {
+ GatewayBean gatewayBean = list.get(i);
+ if (!getGatewaySpk().contains(gatewayBean.getGatewayType())) {
+ continue;
+ }
+ if (TextUtils.isEmpty(gatewayBean.getDevice_mac())
+ || TextUtils.isEmpty(gatewayBean.getSid())
+ || TextUtils.isEmpty(gatewayBean.getOid())) {
+ continue;
+ }
+ //鐢╤omeId绛涢�夊綋鍓嶄綇瀹呯殑閫嗗彉鍣ㄥ垪琛�
+ if (gatewayBean.getHomeId().equals(homeId)) {
+ newList.add(gatewayBean);
+ }
}
}
+
+
+ return newList;
+ } catch (Exception e) {
+ return new ArrayList<>();
}
- return newList;
+ }
+
+
+ /**
+ * 鑾峰彇褰撳墠浣忓畢鐨勯�嗗彉鍣ㄥ垪琛�(鍖呮嫭浠庣殑閫嗗彉鍣�)
+ * 鍙互璁剧疆鏄惁鏁村悎鏈湴閫嗗彉鍣ㄥ垪琛ㄦ暟鎹�
+ *
+ * @param homeId 鐢电珯ID
+ * @param cloudInverterDeviceList 浜戠涓婄殑閫嗗彉鍣ㄥ垪琛紙骞剁綉锛岀缃戯紝璐熻浇涓績锛�
+ * @param isIntegrateLocalData 鏄惁寮哄埗鏁村悎鏈湴閫嗗彉鍣ㄦ暟鎹紙false锛氫笉闇�瑕侊紙浠ヤ簯绔垪琛ㄤ负涓�(閫嗗彉鍣紝璐熻浇涓績)澶氬皯涓樉绀哄灏戜釜锛�,true锛氶渶瑕侊紙鏈夊缃戯紝浠ヤ簯绔澶囧垪琛ㄤ负鍑�;浜戠娌℃湁锛屾湰鍦板瓨鍦紝鍒欏垹闄ゆ湰鍦帮紱鍚﹀垯锛屾病鏈夊缃戝彧鏈夊眬鍩熺綉锛屼互鏈湴鍒楄〃涓轰富,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓級锛�
+ */
+ public List<GatewayBean> IntegrateCloudAndLocalData(String homeId, List<CloudInverterDeviceBean> cloudInverterDeviceList, boolean isIntegrateLocalData) {
+ try {
+ List<GatewayBean> newList = new ArrayList<>();
+ //浜戠鏈夎澶囧垪琛紝鏈湴娌℃湁锛屽嵆HDLLinkLocalGateway.getInstance().getGatewayList()娌℃湁锛岄噷闈細璋冪敤refreshGatewayCacheData()鏂规硶铏氭嫙涓�涓�嗗彉鍣ㄥ疄浣撴坊鍔犳湰鍦板垪琛ㄩ噷闈紱
+ List<GatewayBean> list = getCurrentHomeGatewayList(homeId);
+ if (list != null && list.size() > 0) {
+ newList.addAll(list);
+ }
+
+ //鏈夊缃戯紝浠ヤ簯绔澶囧垪琛ㄤ负鍑�;浜戠娌℃湁锛屾湰鍦板瓨鍦紝鍒欏垹闄ゆ湰鍦帮紱鍚﹀垯锛屾病鏈夊缃戝彧鏈夊眬鍩熺綉锛屼互鏈湴newList鍒楄〃涓轰富,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓�
+ if (cloudInverterDeviceList != null && cloudInverterDeviceList.size() > 0) {
+ List<GatewayBean> checkNewList = new ArrayList<>();
+ for (int i = 0; i < cloudInverterDeviceList.size(); i++) {
+ CloudInverterDeviceBean cloudInverterDevice = cloudInverterDeviceList.get(i);
+ for (GatewayBean gatewayBean : newList) {
+ if (cloudInverterDevice.getOsn().equals(gatewayBean.getDevice_mac())) {
+ checkNewList.add(gatewayBean);
+ break;
+ }
+ }
+ }
+ newList.clear();
+ newList.addAll(checkNewList);
+ }
+
+
+
+// //妯℃嫙璁惧鍒楄〃鏁版嵁
+// List<GatewayBean> mockData = getGatewayDeviceListMockData(3);
+// if (mockData.size() > 0) {
+// for (GatewayBean mockDatum : mockData) {
+// newList.add(0, mockDatum);
+// }
+// }
+
+ //鑳″浆瑕佹眰鐨� 2025骞�05鏈�19鏃�13:28:47 鍗充娇閫嗗彉鍣ㄥ垹闄や簡浜戠涓婃垚鍔燂紝鏈湴閫嗗彉鍣ㄥ垵濮嬪寲涓嶆垚鍔燂紙鏂紑锛変緷鐒朵笉鏄剧ず锛�
+ if (!isIntegrateLocalData) {
+ //寮哄埗浠ヤ簯绔负涓伙紝浜戠鏈夊氨鏄剧ず閫嗗彉鍣ㄥ垪琛紝娌℃湁灏变笉鏄剧ず
+ if (cloudInverterDeviceList == null || cloudInverterDeviceList.size() == 0) {
+ newList.clear();
+ }
+ }
+ return newList;
+ } catch (Exception e) {
+ return new ArrayList<>();
+ }
}
/**
- * 鑾峰彇褰撳墠浣忓畢鐨勩�愪富銆戦�嗗彉鍣ㄥ垪琛�
+ * 娣诲姞閫嗗彉鍣ㄥ埌缂撳瓨鍒楄〃閲岄潰鍘�
+ *
+ * @param homeId 鐢电珯id
+ * @param newGatewayBean 閫嗗彉鍣ㄥ璞�
*/
- public GatewayBean getCurrentHomeMainGateway() {
- return queryCurrentHomeMainGateway(this.getCurrentHomeGatewayList());
- }
-
- /**
- * 鏌ヨ褰撳墠浣忓畢鐨勩�愪富銆戦�嗗彉鍣ㄥ垪琛�
- */
- public GatewayBean queryCurrentHomeMainGateway(List<GatewayBean> list) {
+ public void addGatewayToLocalCacheMemory(String homeId, GatewayBean newGatewayBean) {
+ if (newGatewayBean == null || TextUtils.isEmpty(homeId)) {
+ return;
+ }
+ List<GatewayBean> list = getCurrentHomeGatewayList(homeId);
if (list == null || list.size() == 0) {
- return null;
+ return;
}
- GatewayBean findGatewayBean = null;
+ int index = -1;
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;
+ if (gatewayBean.getDevice_mac().equals(newGatewayBean.getDevice_mac())) {
+ index = i;
break;
}
}
- return findGatewayBean;
+ if (index > 0) {
+ list.remove(index);
+ list.add(index, newGatewayBean);
+
+ }
}
+ /**
+ * 绉婚櫎缂撳瓨鍒楄〃閲岄潰閫嗗彉鍣�
+ *
+ * @param homeId 鐢电珯id
+ * @param mac 閫嗗彉鍣╩ac
+ */
+ public void removeLocalCacheMemoryGatewayToMac(String homeId, String mac) {
+ if (TextUtils.isEmpty(mac)) {
+ return;
+ }
+ List<GatewayBean> list = getCurrentHomeGatewayList(homeId);
+ if (list == null || list.size() == 0) {
+ return;
+ }
+ int index = -1;
+ for (int i = 0; i < list.size(); i++) {
+ GatewayBean gatewayBean = list.get(i);
+ if (gatewayBean.getDevice_mac().equals(mac)) {
+ index = i;
+ break;
+ }
+ }
+ if (index > 0) {
+ list.remove(index);
+ }
+ }
+
+ /**
+ * 绉婚櫎缂撳瓨鍒楄〃閲岄潰閫嗗彉鍣�
+ *
+ * @param homeId 鐢电珯id
+ * @param deviceId 閫嗗彉鍣╠eviceId
+ */
+ public void removeLocalCacheMemoryGatewayToDeviceId(String homeId, String deviceId) {
+ if (TextUtils.isEmpty(deviceId)) {
+ return;
+ }
+ List<GatewayBean> list = getCurrentHomeGatewayList(homeId);
+ if (list == null || list.size() == 0) {
+ return;
+ }
+ int index = -1;
+ for (int i = 0; i < list.size(); i++) {
+ GatewayBean gatewayBean = list.get(i);
+ if (gatewayBean.getDeviceId().equals(deviceId)) {
+ index = i;
+ break;
+ }
+ }
+ if (index > 0) {
+ list.remove(index);
+ }
+ }
+
+ /**
+ * 娣诲姞銆愯澶囧垪琛ㄣ�戝埌鏈湴缂撳瓨
+ *
+ * @param list -璁惧鍒楄〃
+ */
+ public void setListDevice(List<CloudInverterDeviceBean> list) {
+ try {
+ if (list == null || list.size() == 0) {
+ return;
+ }
+ if (this.mListDevice.size() == 0) {
+ this.mListDevice.addAll(list);
+ return;
+ }
+ for (int i = 0; i < list.size(); i++) {
+ this.setSingleDevice(list.get(i));
+ }
+ } catch (Exception ignored) {
+ }
+ }
+
+
+ /**
+ * 鑾峰彇璁惧鍒楄〃(瀹夎鍟�)
+ *
+ * @param searchTxt 鎼滅储鍐呭
+ * @param pageNo 椤电爜
+ * @param pageSize 椤垫暟
+ */
+ public void getPowerStationDeviceList(String searchTxt, long pageNo, long pageSize, CloudCallBeak<PageNumberObject<CloudInverterDeviceBean>> cloudCallBeak) {
+ String requestUrl = HttpApi.POST_deviceList;
+ JsonObject json = new JsonObject();
+ if (!TextUtils.isEmpty(searchTxt)) {
+ json.addProperty("searchTxt", searchTxt);
+ }
+ json.addProperty("pageNo", pageNo);//椤电爜
+ json.addProperty("pageSize", pageSize);//椤垫暟
+// json.addProperty("zoneType", zoneType);//鍖哄煙
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String jsonStr) {
+ if (TextUtils.isEmpty(jsonStr)) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(new PageNumberObject<>());
+ }
+ }
+ Gson gson = new Gson();
+ Type type = new TypeToken<PageNumberObject<CloudInverterDeviceBean>>() {
+ }.getType();
+ PageNumberObject<CloudInverterDeviceBean> pageNumberObject = gson.fromJson(jsonStr, type);
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(pageNumberObject);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ }
+ });
+ }
+
+ /**
+ * 娣诲姞璁惧鍒板垪琛ㄩ噷闈�
+ *
+ * @param deviceBean -璁惧瀵硅薄
+ */
+ public void setSingleDevice(CloudInverterDeviceBean deviceBean) {
+ try {
+ if (deviceBean == null) {
+ return;
+ }
+ boolean if_boolean = false;
+ for (int i = 0; i < mListDevice.size(); i++) {
+ if (mListDevice.get(i).getOsn().equals(deviceBean.getOsn())) {
+ //瀛樺湪鏇挎崲
+ mListDevice.remove(i);
+ mListDevice.add(i, deviceBean);
+ if_boolean = true;
+ break;
+ }
+ }
+ if (!if_boolean) {
+ //娌℃湁娣诲姞
+ this.mListDevice.add(deviceBean);
+ }
+ } catch (Exception e) {
+ String mes = e.getMessage();
+ HdlLogLogic.print("---" + mes);
+ }
+ }
/**
* 閫嗗彉鍣ㄤ笂浼犳暟鎹埌浜戠(鍖呮嫭:sid锛宱id)
*
- * @param mac 璁惧mac
+ * @param homeId 浣忓畢id
+ * @param list 閫嗗彉鍣ㄥ垪琛�
+ * @param whetherToAdd true琛ㄧず鐢ㄥ閲�,false琛ㄧず鐢ㄥ叏閲�
*/
- public void uploadDataToCloud(String mac, CloudCallBeak<Boolean> callBeak) {
- getInverterOidList(mac, new LinkCallBack<List<OidBean>>() {
- @Override
- public void onSuccess(List<OidBean> obj) {
- if (obj == null) {
- return;
+ public void uploadOidDataToCloud(String homeId, List<GatewayBean> list, boolean whetherToAdd, CloudCallBeak<Boolean> callBeak) {
+
+ if (list == null || list.isEmpty()) {
+ return;
+ }
+ if (whetherToAdd) {
+ for (int i = 0; i < list.size(); i++) {
+ GatewayBean gatewayBean = list.get(i);
+ if (gatewayBean == null || TextUtils.isEmpty(gatewayBean.getDevice_mac())) {
+ continue;
}
- fullUpdateOid(obj, new CloudCallBeak<Boolean>() {
+ getInverterOidList(gatewayBean.getDevice_mac(), new LinkCallBack<List<OidBean>>() {
@Override
- public void onSuccess(Boolean obj) {
+ public void onSuccess(List<OidBean> oidBeanList) {
+ if (oidBeanList == null) {
+ HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔垚鍔�---浣忓畢id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "---鏁版嵁鏄痭ull", true);
+ return;
+ }
+ //澧為噺娣诲姞oid
+ updateOidAdd(homeId, oidBeanList, new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔垚鍔�(澧為噺)---浣忓畢id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "---\r\n鏁版嵁---" + new Gson().toJson(oidBeanList), true);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�(澧為噺)---浣忓畢id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
+ }
+ });
}
@Override
- public void onFailure(HDLException e) {
-
+ public void onError(HDLLinkException e) {
+ HdlLogLogic.print("鑾峰彇oid鍒楄〃澶辫触---浣忓畢id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
}
});
+ SystemClock.sleep(200);
}
+ } else {
+ //鍙湁杩涘叆璇︽儏鐣岄潰
+ List<OidBean> newOidList = new ArrayList<>();
+ //琛ㄧず涓棿浠讳綍涓�涓幏鍙杘id澶辫触銆傞兘瑕佹敼鍙樼敤澧為噺涓婁紶oid鍒楄〃
+ AtomicBoolean isIncrementalOidAddition = new AtomicBoolean(false);
+ AtomicInteger atomicInteger = new AtomicInteger(0);
+ for (int i = 0; i < list.size(); i++) {
+ GatewayBean gatewayBean = list.get(i);
+ if (gatewayBean == null || TextUtils.isEmpty(gatewayBean.getDevice_mac())) {
+// isIncrementalOidAddition.set(true);
+ continue;
+ }
+ getInverterOidList(gatewayBean.getDevice_mac(), new LinkCallBack<List<OidBean>>() {
+ @Override
+ public void onSuccess(List<OidBean> oidBeanList) {
+ atomicInteger.set(atomicInteger.get() + 1);
+ if (oidBeanList == null) {
+// isIncrementalOidAddition.set(true);
+ return;
+ }
+ newOidList.addAll(oidBeanList);
+ if (atomicInteger.get() == list.size()) {
+ if (newOidList.isEmpty()) {
+ return;
+ }
+ if (isIncrementalOidAddition.get()) {
+ //澧為噺娣诲姞oid
+ updateOidAdd(homeId, newOidList, new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔垚鍔�(澧為噺)---浣忓畢id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "---\r\n鏁版嵁---" + new Gson().toJson(oidBeanList), true);
+ }
- @Override
- public void onError(HDLLinkException e) {
+ @Override
+ public void onFailure(HDLException e) {
+ HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�---浣忓畢id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
+ }
+ });
+ } else {
+ //鍏ㄩ儴鑾峰彇鍚庡啀涓婁紶
+ fullUpdateOid(homeId, newOidList, new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔垚鍔�(鍏ㄩ噺)---浣忓畢id:" + homeId + "---\r\n鏁版嵁---" + new Gson().toJson(newOidList), true);
+ }
+ @Override
+ public void onFailure(HDLException e) {
+ HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�(鍏ㄩ噺)---浣忓畢id:" + homeId + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
+ }
+ });
+ }
+ }
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ isIncrementalOidAddition.set(true);
+ atomicInteger.set(atomicInteger.get() + 1);
+ if (atomicInteger.get() == list.size()) {
+ if (newOidList.isEmpty()) {
+ HdlLogLogic.print("鑾峰彇閫嗗彉鍣╫id鍒楄〃澶辫触---浣忓畢id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
+ return;
+ }
+ //澧為噺娣诲姞oid
+ updateOidAdd(homeId, newOidList, new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔垚鍔�(澧為噺)---浣忓畢id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "---\r\n鏁版嵁---" + new Gson().toJson(newOidList), true);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�(澧為噺)---浣忓畢id:" + homeId + "---mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
+ }
+ });
+ }
+ }
+ });
+ SystemClock.sleep(200);
}
- });
-
+ }
}
/**
@@ -170,11 +499,11 @@
* @param name -
* @param cloudCallBeak -
*/
- public void addInverterDeviceToCloud(String mac, String spk, String sid, String oid, String name, CloudCallBeak<Boolean> cloudCallBeak) {
+ public void addInverterDeviceToCloud(String homeId, 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("homeId", homeId);
json.addProperty("mac", mac);
json.addProperty("spk", spk);
json.addProperty("sid", sid);
@@ -187,16 +516,86 @@
public void onSuccess(String str) {
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(true);
- //涓存椂鐨勯�昏緫锛屼笂浼爋id鍒楄〃鍒颁簯绔�
- uploadDataToCloud(mac, null);
+ List<GatewayBean> list = new ArrayList<>();
+ GatewayBean gatewayBean = new GatewayBean();
+ gatewayBean.setHomeId(homeId);
+ gatewayBean.setDevice_mac(mac);
+ gatewayBean.setSpk(spk);
+ gatewayBean.setSid(sid);
+ gatewayBean.setOid(oid);
+ gatewayBean.setDevice_name(name);
+ list.add(gatewayBean);
+ //娣诲姞璁惧鎴愬姛鍚庯紝涓婁紶oid鍒楄〃鍒颁簯绔�
+ uploadOidDataToCloud(homeId, list, true, null);
}
}
@Override
public void onFailure(HDLException e) {
+ //娣诲姞閫嗗彉鍣ㄥけ璐ュ悗鍒濆鍖栭�嗗彉鍣�
+ HdlLogLogic.print("娣诲姞閫嗗彉鍣ㄥけ璐ュ悗寮�濮嬪垵濮嬪寲閫嗗彉鍣�-->", true);
+ HdlDeviceLogic.getInstance().initializeInverter(mac, new LinkCallBack<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ HdlLogLogic.print("鍒濆鍖栭�嗗彉鍣ㄦ垚鍔�-->mac:" + mac, true);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ HdlLogLogic.print("鍒濆鍖栭�嗗彉鍣ㄥけ璐�-->mac:" + mac, true);
+ }
+ });
+
if (cloudCallBeak != null) {
cloudCallBeak.onFailure(e);
}
+ }
+ });
+ }
+
+ /**
+ * 娣诲姞澶氫釜閫嗗彉鍣ㄥ埌浜戠涓�
+ *
+ * @param list 閫嗗彉鍣ㄥ垪琛�
+ * @param cloudCallBeak -
+ */
+ public void addAllInverterDeviceToCloud(String homeId, List<GatewayBean> list, CloudCallBeak<Boolean> cloudCallBeak) {
+
+ String requestUrl = HttpApi.POST_Device_Add_All;
+ JsonObject json = new JsonObject();
+ json.addProperty("homeId", homeId);
+ JsonArray ary = new JsonArray();
+ for (int i = 0; i < list.size(); i++) {
+ GatewayBean gatewayBean = list.get(i);
+ JsonObject inverterInfo = new JsonObject();
+ inverterInfo.addProperty("mac", gatewayBean.getDevice_mac());
+ inverterInfo.addProperty("spk", gatewayBean.getGatewayType());
+ inverterInfo.addProperty("sid", gatewayBean.getSid());
+ inverterInfo.addProperty("oid", gatewayBean.getOid());
+ inverterInfo.addProperty("name", gatewayBean.getDevice_name());
+ ary.add(inverterInfo);
+ }
+ json.add("devices", ary);
+ // json.addProperty("zoneType", "password");//鍖哄煙
+
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String str) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(true);
+ //涓存椂鐨勯�昏緫锛屼笂浼爋id鍒楄〃鍒颁簯绔�
+ uploadOidDataToCloud(homeId, list, true, null);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+
+
}
});
}
@@ -245,10 +644,10 @@
* @param deviceId 璁惧id
* @param cloudCallBeak 鍥炶皟
*/
- public void delInverterDevice(String deviceId, CloudCallBeak<Boolean> cloudCallBeak) {
+ public void delInverterDevice(String homeId, String deviceId, CloudCallBeak<Boolean> cloudCallBeak) {
String requestUrl = HttpApi.POST_Device_Remove;
JsonObject json = new JsonObject();
- json.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
+ json.addProperty("homeId", homeId);
json.addProperty("deviceId", deviceId);
// json.addProperty("zoneType", "password");//鍖哄煙
@@ -275,10 +674,10 @@
* @param parentOid 涓婄骇璁惧鐨凮id
* @param cloudCallBeak 鍥炶皟
*/
- public void getInverterDeviceChildDeviceList(String parentOid, CloudCallBeak<List<CloudInverterChildDeviceBean>> cloudCallBeak) {
+ public void getInverterDeviceChildDeviceList(String homeId, String parentOid, CloudCallBeak<List<CloudInverterChildDeviceBean>> cloudCallBeak) {
String requestUrl = HttpApi.POST_Device_ChildDevices_List;
JsonObject json = new JsonObject();
- json.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
+ json.addProperty("homeId", homeId);
json.addProperty("parentOid", parentOid);
// json.addProperty("zoneType", "password");//鍖哄煙
@@ -312,17 +711,88 @@
/**
* 鍏ㄩ噺鏇存柊OID
*
+ * @param homeId 浣忓畢id
* @param oidList oid鍒楄〃
* @param cloudCallBeak 鍥炶皟update
*/
- public void fullUpdateOid(List<OidBean> oidList, CloudCallBeak<Boolean> cloudCallBeak) {
+ public void fullUpdateOid(String homeId, List<OidBean> oidList, CloudCallBeak<Boolean> cloudCallBeak) {
+ if (!UserConfigManage.getInstance().getHomeId().equals(homeId)) {
+ HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�---褰撳墠浣忓畢id:" + UserConfigManage.getInstance().getHomeId() + "---涓婁紶浣忓畢id:" + homeId, true);
+ return;
+ }
+ if (oidList == null || oidList.isEmpty()) {
+ HdlLogLogic.print("oid鍒楄〃涓虹┖锛屾棤娉曞叏閲忔洿鏂皁id鍒颁簯绔�---", true);
+ return;
+ }
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.getDevice_mac());
+ jsonObject.addProperty("oid", oidBean.getOid());
+ jsonObject.addProperty("device_name", oidBean.getDevice_name());
+ jsonObject.addProperty("device_model", oidBean.getDevice_model());
+ jsonObject.addProperty("addresses", oidBean.getAddresses());
+ jsonObject.addProperty("parentOid", oidBean.getParentOid());
+ jsonArray.add(jsonObject);
+
+ }
+ json.add("devices", jsonArray);
+ // json.addProperty("zoneType", "password");//鍖哄煙
+
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String str) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(true);
+ }
+
+
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ }
+ });
+
+ }
+
+
+ /**
+ * (oid)澧為噺娣诲姞
+ *
+ * @param homeId 浣忓畢id
+ * @param oidList oid鍒楄〃
+ * @param cloudCallBeak 鍥炶皟update
+ */
+ public void updateOidAdd(String homeId, List<OidBean> oidList, CloudCallBeak<Boolean> cloudCallBeak) {
+ if (!UserConfigManage.getInstance().getHomeId().equals(homeId)) {
+ HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�---褰撳墠浣忓畢id:" + UserConfigManage.getInstance().getHomeId() + "---涓婁紶浣忓畢id:" + homeId, true);
+ return;
+ }
+ if (oidList == null || oidList.isEmpty()) {
+ HdlLogLogic.print("oid鍒楄〃涓虹┖锛屾棤娉曞閲忔坊鍔爋id鍒颁簯绔�---", true);
+ return;
+ }
+ String requestUrl = HttpApi.POST_Device_IncrAdd;
+ JsonObject json = new JsonObject();
+ json.addProperty("homeId", homeId);
+ JsonArray jsonArray = new JsonArray();
+ for (int i = 0; i < oidList.size(); i++) {
+ OidBean oidBean = oidList.get(i);
+ if (TextUtils.isEmpty(oidBean.getDevice_model())) {
+ //涓虹┖杩囨护鎺�;
+ continue;
+ }
JsonObject jsonObject = new JsonObject();
jsonObject.addProperty("protocolType", oidBean.getProtocolType());
jsonObject.addProperty("deviceType", oidBean.getDeviceType());
@@ -345,7 +815,44 @@
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(true);
}
+ HdlLogLogic.print("澧為噺娣诲姞oid鍒颁簯绔垚鍔�---", true);
+ }
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ HdlLogLogic.print("澧為噺娣诲姞oid鍒颁簯绔け璐�---" + e.getMsg() + "(" + e.getCode() + ")", true);
+ }
+ });
+
+ }
+
+ /**
+ * 淇敼璁惧鍚嶇О閫嗗彉鍣˙MS鐢垫睜鍖�
+ * 鎻忚堪: 淇敼璁惧鍚嶇О锛屾敮鎸侀�嗗彉鍣紝BMS锛岀數姹犲寘璁惧鍚嶇О淇敼
+ *
+ * @param homeId 浣忓畢id
+ * @param deviceType 璁惧绫诲瀷(INV:閫嗗彉鍣�,BMS:BMS鎺у埗鐩�,BATTERY:鐢垫睜鍗曞厓)
+ * @param deviceId 璁惧id(deviceType = INV 鏄�嗗彉鍣╠eviceId;deviceType = BMS 鏄疊MS鐨刣eviceOidId;deviceType = BATTERY 鏄數姹犲寘鐨刣eviceOidId)
+ * @param cloudCallBeak 鍥炶皟update
+ */
+ public void setRename(String homeId, String deviceType, String deviceId, String name, CloudCallBeak<Boolean> cloudCallBeak) {
+ String requestUrl = HttpApi.POST_Device_Rename;
+ JsonObject json = new JsonObject();
+ json.addProperty("homeId", homeId);
+ json.addProperty("name", name);
+ json.addProperty("deviceType", deviceType);//璁惧绫诲瀷(INV:閫嗗彉鍣�,BMS:BMS鎺у埗鐩�,BATTERY:鐢垫睜鍗曞厓)
+ json.addProperty("deviceId", deviceId);//璁惧id(deviceType = INV 鏄�嗗彉鍣╠eviceId;deviceType = BMS 鏄疊MS鐨刣eviceOidId;deviceType = BATTERY 鏄數姹犲寘鐨刣eviceOidId)
+ // json.addProperty("zoneType", "password");//鍖哄煙
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String str) {
+
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(true);
+ }
}
@Override
@@ -365,10 +872,10 @@
* @param mac 璁惧mac
* @param linkCallBack 鍥炶皟update
*/
- public void setGatewayRemoteParam(String mac, LinkCallBack<Boolean> linkCallBack) {
+ public void setGatewayRemoteParam(String homeId, String mac, LinkCallBack<Boolean> linkCallBack) {
String requestUrl = TopicApi.SET_GATEWAY_REMOTE_EDIT;
JsonObject json = new JsonObject();
- json.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
+ json.addProperty("homeId", homeId);
json.addProperty("server_addr", AppConfigManage.getUserRegionUrl());
json.addProperty("local_secret", UserConfigManage.getInstance().getLocalSecret());
//瑙ｅ瘑璐熻浇鏁版嵁(鍐欏瘑閽ョ粰缃戝叧涓�瀹氭槸鏄庢枃锛屽洜涓洪偅鏃剁綉鍏宠繕娌℃湁瀵嗛挜)
@@ -400,7 +907,7 @@
* 缃戝叧鏃堕棿璇诲彇
*
* @param mac 璁惧mac
- * @param linkCallBack 鍥炶皟update
+ * @param linkCallBack 鍥炶皟updatetime
*/
public void getGatewayTime(String mac, LinkCallBack<DeviceTimeBean> linkCallBack) {
String requestUrl = TopicApi.GET_GATEWAY_TIME;
@@ -440,13 +947,22 @@
* @param mac 璁惧mac
* @param date 鏃ユ湡
* @param time 鏃堕棿
+ * @param timezone 鏃跺尯
* @param linkCallBack 鍥炶皟update
*/
- public void editGatewayTime(String mac, String date, String time, LinkCallBack<Boolean> linkCallBack) {
+ public void editGatewayTime(String mac, String date, String time, String timezone, 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"
+ if (!TextUtils.isEmpty(date)) {
+ json.addProperty("date", date);// "2020-08-15"
+ }
+ if (!TextUtils.isEmpty(time)) {
+ json.addProperty("time", time);//"17:25:20"
+ }
+ if (!TextUtils.isEmpty(timezone)) {
+ json.addProperty("timezone", timezone);//鏃跺尯(璇泙https://hdl-gz.yuque.com/wnkbmh/cdrglh/yckkyp#qWOPS)
+ }
+
TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, json, "", new HDLLinkCallBack() {
@Override
public void onSuccess(String msg) {
@@ -499,21 +1015,91 @@
* @param mac 缃戝叧mac
* @param linkCallBack 鍥炶皟
*/
- public void getGatewayInfo(String mac, LinkCallBack<GatewayBean> linkCallBack) {
+ public void getGatewayInfo(String mac, LinkCallBack<InverterBean> linkCallBack) {
String requestUrl = TopicApi.GET_GATEWAY_INFO;
- TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, null, "", new HDLLinkCallBack() {
+ JsonObject json = new JsonObject();
+ json.addProperty("device_mac", mac);
+ TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, json, "", new HDLLinkCallBack() {
@Override
public void onSuccess(String json) {
- if (TextUtils.isEmpty(json)) {
- if (linkCallBack != null) {
- linkCallBack.onSuccess(null);
- }
+ if (linkCallBack == null) {
return;
}
+ if (TextUtils.isEmpty(json)) {
+ linkCallBack.onSuccess(null);
+ return;
+ }
+
Gson gson = new Gson();
- GatewayBean gatewayBean = gson.fromJson(json, GatewayBean.class);
+ Type typeOfT = new TypeToken<BaseLocalResponse<InverterBean>>() {
+ }.getType();
+ BaseLocalResponse<InverterBean> baseLocalResponse = gson.fromJson(json, typeOfT);
+ if (baseLocalResponse == null || baseLocalResponse.getObjects() == null) {
+ linkCallBack.onSuccess(new InverterBean());
+ } else {
+ linkCallBack.onSuccess(baseLocalResponse.getObjects());
+ }
+
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
if (linkCallBack != null) {
- linkCallBack.onSuccess(gatewayBean);
+ linkCallBack.onError(e);
+ }
+ }
+ });
+
+ }
+
+ /**
+ * 鍒濆鍖栭�嗗彉鍣�
+ *
+ * @param mac 閫嗗彉鍣╩ac
+ */
+ public void initializeInverter(String mac, LinkCallBack<Boolean> linkCallBack) {
+ String requestUrl = TopicApi.GATEWAY_INITIALIZE_REMOTE;
+ JsonObject jObject = new JsonObject();
+ jObject.addProperty("device_mac", mac);
+ jObject.addProperty("reset_factory", "true");//涓篺alse鎴栨棤姝ゅ瓧娈碉紝鍒欎负"娓呴櫎鏁版嵁"
+ TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, jObject, "", new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String json) {
+ if (linkCallBack != null) {
+ linkCallBack.onSuccess(true);
+ }
+ HdlLogLogic.print("鍒濆鍖栭�嗗彉鍣ㄦ垚鍔�-->mac:" + mac, true);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ if (linkCallBack != null) {
+ linkCallBack.onError(e);
+ }
+ HdlLogLogic.print("鍒濆鍖栭�嗗彉鍣ㄥけ璐�-->mac:" + mac + "---" + e.getMsg() + "(" + e.getCode() + ")", true);
+ }
+ });
+
+ }
+
+
+ /**
+ * 鍒犻櫎oid
+ *
+ * @param mac 缃戝叧mac
+ * @param oid 璁惧oid
+ */
+ public void deleteOid(String mac, String oid, LinkCallBack<Boolean> linkCallBack) {
+ String requestUrl = TopicApi.DELETING_GATEWAY_SLAVE;
+ JsonArray jsonArray = new JsonArray();
+ JsonObject jsonObject = new JsonObject();
+ jsonObject.addProperty("oid", oid);//璁惧oid
+ jsonArray.add(jsonObject);
+ TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, jsonArray, "", new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String json) {
+ if (linkCallBack != null) {
+ linkCallBack.onSuccess(true);
}
}
@@ -526,6 +1112,7 @@
});
}
+
/**
* 鑾峰彇閫嗗彉鍣╫id鍒楄〃
@@ -570,169 +1157,201 @@
}
/**
- * 鑾峰彇閫嗗彉鍣ㄥ垪琛�(鏁村悎浜戠鍜屾湰鍦板垪琛�)
- * 娉ㄦ剰:鏈夊缃戯紝浠ヤ簯绔澶囦负鍑�,鏈湴瀛樺湪锛屼簯绔病鏈夊垯鍒犻櫎锛涘唴缃戯紝浠ユ湰鍦颁负涓�,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓紱
+ * 鑾峰彇閫嗗彉鍣ㄥ垪琛�,鏁村悎浜戠閫嗗彉鍣ㄥ垪琛ㄥ拰鏈湴閫嗗彉鍣ㄥ垪琛�(璁惧绫诲瀷鏈�:骞剁綉閫嗗彉鍣紝绂荤嚎閫嗗彉鍣紝璐熻浇涓績璁惧);
+ * 娉ㄦ剰:鏈夊缃戯紝浠ヤ簯绔澶囧垪琛ㄤ负鍑�;浜戠娌℃湁锛屾湰鍦板瓨鍦紝鍒欏垹闄ゆ湰鍦帮紱鍚﹀垯锛屾病鏈夊缃戝彧鏈夊眬鍩熺綉锛屼互鏈湴涓轰富,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓�
*
+ * @param homeId 浣忓畢id
* @param cloudCallBeak 杩斿洖閫嗗彉鍣ㄥ垪琛�
*/
- public void getCurrentHomeLocalAndCloudGatewayList(CloudCallBeak<List<GatewayBean>> cloudCallBeak) {
- HdlDeviceLogic.getInstance().searchCurrentHomeGateway(new GatewayCallBack() {
+ public void getCurrentHomeLocalAndCloudGatewayList(String homeId, CloudCallBeak<List<GatewayBean>> cloudCallBeak) {
+ searchCurrentHomeGateway(homeId, new GatewayCallBack() {
@Override
public void onSuccess(List<GatewayBean> gatewayBeanList) {
- //灞�鍩熺綉鏈�2绉嶆儏鍐�(1:鏈夊眬鍩熺綉锛屾湁澶栫綉锛�2:鏈夊眬鍩熺綉锛屾病鏈夊缃�);
- HdlDeviceLogic.getInstance().getCloudInverterDeviceList(UserConfigManage.getInstance().getHomeId(), new CloudCallBeak<List<CloudInverterDeviceBean>>() {
+ //鍚戜簯绔幏鍙栭�嗗彉鍣ㄥ垪琛�
+ 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());
+ public void onSuccess(List<CloudInverterDeviceBean> inverterDeviceList) {
+ //鍚戜簯绔幏鍙栬礋杞戒腑蹇冨垪琛�
+ getLoadCentreDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
+ @Override
+ public void onSuccess(List<CloudInverterDeviceBean> loadCentreDeviceList) {
+ if (loadCentreDeviceList != null) {
+ //鍚堝苟璐熻浇涓績璁惧鍒楄〃锛岀劧鍚庡湪涓�璧峰仛澶勭悊
+ inverterDeviceList.addAll(loadCentreDeviceList);
+ }
+ //璁剧疆璁惧鐨勮繙绋嬩俊鎭�
+ setDeviceRemoteInfo(inverterDeviceList, homeId, cloudCallBeak);
}
- return;
- }
- //璁板綍鏉℃暟
- AtomicInteger atomicInteger = new AtomicInteger(0);
- for (int i = 0; i < list.size(); i++) {
- CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
- //鑾峰彇杩滅▼璁惧閫氳淇℃伅(鎷垮埌缃戝叧ID锛宮qtt閫氳绉橀挜)
- getDeviceRemoteInfo(UserConfigManage.getInstance().getHomeId(), 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) {
+ //鍚戜簯绔幏鍙栬礋杞戒腑蹇冭澶囧垪琛ㄥけ璐ュ悗锛屼粛鐒跺鐞嗛�嗗彉鍣ㄨ澶囧垪琛�
+ //璁剧疆璁惧鐨勮繙绋嬩俊鎭�
+ setDeviceRemoteInfo(inverterDeviceList, homeId, cloudCallBeak);
+ }
+ });
}
@Override
public void onFailure(HDLException e) {
- ///鎯呭喌2:鏈夊眬鍩熺綉锛屾病鏈夊缃�;
//鏈湴鏈夐�嗗彉鍣ㄥ垪琛�,鑾峰彇浜戠缁戝畾閫嗗彉鍣ㄥけ璐�,榛樿杩斿洖鏈湴閫嗗彉鍣ㄥ垪琛�;
- if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
- }
+ //鍚戜簯绔幏鍙栬礋杞戒腑蹇冨垪琛�
+ getLoadCentreDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
+ @Override
+ public void onSuccess(List<CloudInverterDeviceBean> loadCentreDeviceList) {
+ if (loadCentreDeviceList == null) {
+ if (cloudCallBeak != null) {
+ //娌℃湁鏁版嵁锛岄粯璁よ繑鍥炴湰鍦伴�嗗彉鍣ㄥ垪琛�;
+ cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, null,false));
+ }
+ return;
+ }
+ //璁剧疆璁惧鐨勮繙绋嬩俊鎭�
+ setDeviceRemoteInfo(loadCentreDeviceList, homeId, cloudCallBeak);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ //鍚戜簯绔幏鍙栬礋杞戒腑蹇冭澶囧垪琛ㄥけ璐ュ悗锛岄粯璁よ繑鍥炴湰鍦伴�嗗彉鍣ㄥ垪琛�;
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, null,false));
+ }
+ }
+ });
+
}
});
}
@Override
public void onError(HDLLinkException e) {
- //澶栫綉鍙湁1绉嶆儏鍐�(鏈湴鎼滅储閫嗗彉鍣ㄥ垪琛ㄥけ璐ヤ簡)
- HdlDeviceLogic.getInstance().getCloudInverterDeviceList(UserConfigManage.getInstance().getHomeId(), new CloudCallBeak<List<CloudInverterDeviceBean>>() {
+// //澶栫綉杩涙潵鍏堛�愰粯璁ゃ�戞竻绌烘湰鍦伴�嗗彉鍣ㄥ垪琛�
+// HDLLinkLocalGateway.getInstance().getGatewayList().clear();
+ //鍚戜簯绔幏鍙栭�嗗彉鍣ㄥ垪琛�
+ 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<>());
+ public void onSuccess(List<CloudInverterDeviceBean> cloudInverterList) {
+ //鍐嶅悜浜戠鑾峰彇璐熻浇涓績鍒楄〃
+ getLoadCentreDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
+ @Override
+ public void onSuccess(List<CloudInverterDeviceBean> loadCentreDeviceList) {
+
+ List<CloudInverterDeviceBean> newList = new ArrayList<>();
+ if (cloudInverterList != null) {
+ //娣诲姞閫嗗彉鍣ㄨ澶囧垪琛�
+ newList.addAll(cloudInverterList);
+ }
+ if (loadCentreDeviceList != null) {
+ //娣诲姞璐熻浇涓績璁惧鍒楄〃
+ newList.addAll(loadCentreDeviceList);
+ }
+ //鏁村悎璁惧鍒楄〃鍚�,鍐嶄竴璧疯缃澶囩殑杩滅▼淇℃伅
+ setDeviceRemoteInfo(newList, homeId, cloudCallBeak);
}
- return;
- }
- //璁板綍鏉℃暟
- AtomicInteger atomicInteger = new AtomicInteger(0);
- for (int i = 0; i < list.size(); i++) {
- CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
- //鑾峰彇杩滅▼璁惧閫氳淇℃伅(鎷垮埌缃戝叧ID锛宮qtt閫氳绉橀挜)
- getDeviceRemoteInfo(UserConfigManage.getInstance().getHomeId(), 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) {
+ //璁剧疆璁惧鐨勮繙绋嬩俊鎭�
+ setDeviceRemoteInfo(cloudInverterList, homeId, cloudCallBeak);
+ }
+ });
}
@Override
public void onFailure(HDLException e) {
- if (cloudCallBeak != null) {
- cloudCallBeak.onFailure(e);
- }
+ //鍚戜簯绔幏鍙栭�嗗彉鍣ㄥ垪琛ㄥけ璐�
+ //鍐嶅悜浜戠鑾峰彇璐熻浇涓績鍒楄〃
+ getLoadCentreDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
+ @Override
+ public void onSuccess(List<CloudInverterDeviceBean> loadCentreDeviceList) {
+ //璁剧疆璁惧鐨勮繙绋嬩俊鎭�
+ setDeviceRemoteInfo(loadCentreDeviceList, homeId, cloudCallBeak);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ //閮芥槸鑾峰彇澶辫触鐨勮瘽,鐩存帴杩斿洖绌哄垪琛�;
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(new ArrayList<>());
+ }
+ }
+ });
}
});
}
});
+ }
+
+ /**
+ * 璁剧疆璁惧鐨勮繙绋嬩俊鎭紙鎷垮埌缃戝叧ID锛宮qtt閫氳绉橀挜绛変俊鎭級
+ *
+ * @param list 浜戠涓婄殑閫嗗彉鍣ㄥ垪琛�
+ * @param homeId 浣忓畢id
+ * @param cloudCallBeak 鍥炶皟
+ */
+ public void setDeviceRemoteInfo(List<CloudInverterDeviceBean> list, String homeId, CloudCallBeak<List<GatewayBean>> cloudCallBeak) {
+ if (list == null || list.size() == 0) {
+ //浜戠娌℃湁缁戝畾閫嗗彉鍣�,榛樿杩斿洖鏈湴閫嗗彉鍣ㄥ垪琛�;
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, list,false));
+ }
+ 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, homeId);
+ //鍒版渶鍚庝竴鏉★紝鎵嶅鐞嗗洖璋�
+ if (atomicInteger.get() == list.size()) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, list,false));
+ }
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ atomicInteger.set(atomicInteger.get() + 1);
+ //娉ㄦ剰:杩欎釜閫嗗彉鍣ㄥ彧鑳芥湰鍦版帶鍒�(鍥犱负鎷夸笉鍒癿qtt閫氳绉橀挜浠ュ強GatewayID,鏃犳硶杩滅▼鎺у埗)
+ //鏇存柊閫嗗彉鍣ㄦ湰鍦扮紦瀛樹俊鎭�
+ refreshGatewayCacheData(false, cloudInverterDeviceBean, null, homeId);
+ //鍒版渶鍚庝竴鏉★紝鎵嶅鐞嗗洖璋�
+ if (atomicInteger.get() == list.size()) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(IntegrateCloudAndLocalData(homeId, list,false));
+ }
+ }
+ HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触(mac:" + cloudInverterDeviceBean.getOsn() + ")------" + e.getMsg() + "(" + e.getCode() + ")", true);
+ }
+ });
+ }
+
+ }
+
+ /**
+ * 閫氳繃mac鏌ヨ閫嗗彉鍣ㄦ槸鍚﹀瓨缁戝畾鍦ㄤ簯绔�
+ *
+ * @param list 浜戠涓婇�嗗彉鍣ㄥ垪琛�
+ * @return true涓嶅瓨鍦紝鍚﹀垯瀛樺湪
+ */
+ private boolean queryMacInverter(List<CloudInverterDeviceBean> list, String mac) {
+ int exists_value = -1;
+ for (int i = 0; i < list.size(); i++) {
+ CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
+ if (mac.equals(cloudInverterDeviceBean.getOsn())) {
+ exists_value = 1;
+ break;
+ }
+ }
+ return exists_value == -1;
}
/**
@@ -777,13 +1396,23 @@
/**
* 鍒犻櫎鏈湴缂撳瓨閫嗗彉鍣�
*
- * @param sid 璁惧sid
+ * @param mac 璁惧mac
*/
- private void removeLocalInverter(String sid) {
- GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(sid);
+ private void removeLocalInverter(String mac) {
+ GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(mac);
if (gatewayBean != null) {
HDLLinkLocalGateway.getInstance().getGatewayList().remove(gatewayBean);
}
+ }
+
+ /**
+ * 鍒ゆ柇spk鏄惁鏄礋杞戒腑蹇�
+ *
+ * @param spk spk
+ * @return 鐪�=true锛屽惁鍒欒繑鍥瀎alse
+ */
+ private boolean isLoadCenterSpk(String spk) {
+ return Objects.equals(spk, LC_SPK);
}
/**
@@ -796,6 +1425,7 @@
JsonObject json = new JsonObject();
json.addProperty("homeId", "");
json.addProperty("server_addr", "");
+ json.addProperty("local_secret", "");
TcpClient.getInstance().sendDataToLinkGateway(mac, true, requestUrl, json, "", new HDLLinkCallBack() {
@Override
public void onSuccess(String msg) {
@@ -826,10 +1456,10 @@
*
* @param gatewayCallBack -
*/
- public void searchCurrentHomeGateway(GatewayCallBack gatewayCallBack) {
+ public void searchCurrentHomeGateway(String homeId, GatewayCallBack gatewayCallBack) {
List<String> spks = this.getGatewaySpk();
//缃戝叧鎼滅储
- HDLLinkLocalGateway.getInstance().refreshGatewayByHomeIdAndSpk(UserConfigManage.getInstance().getHomeId(), spks, true, gatewayCallBack);
+ HDLLinkLocalGateway.getInstance().refreshGatewayByHomeIdAndSpk(homeId, spks, true, gatewayCallBack);
}
/**
@@ -838,20 +1468,69 @@
*
* @param gatewayCallBack -
*/
- public void searchAllGateway(GatewayCallBack gatewayCallBack) {
+ public void searchAllNetworkGateway(GatewayCallBack gatewayCallBack) {
+ List<String> spks = this.getGatewaySpk();
//缃戝叧鎼滅储
- HDLLinkLocalSdk.getInstance().refreshGateway(gatewayCallBack, this.getGatewaySpk());
+ HDLLinkLocalGateway.getInstance().refreshGatewayBySpk(spks, true, gatewayCallBack);
}
/**
- * 鍒ゆ柇鏄湰鍦拌繛鎺�
+ * 妫�娴嬫湰鍦拌繛鎺ョ姸鎬�
*
- * @param deviceMac 璁惧mac
- * @return true=鏈湴杩炴帴
+ * @param deviceMac 璁惧mac锛�
+ * @param callBeak 杩斿洖 true=鏈湴杩炴帴;false=杩滅▼;
*/
- public boolean isLocalConnect(String deviceMac) {
- GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(deviceMac);
- return gatewayBean == null;
+ public void isLocalConnect(String homeId, String deviceMac, CloudCallBeak<Boolean> callBeak) {
+ searchCurrentHomeGateway(homeId, 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璁㈤槄锛屽姞瑙ｅ瘑浼氱敤鍒拌鍙傛暟;
+ 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);
+ }
+ }
+ });
}
/**
@@ -859,8 +1538,8 @@
*
* @param deviceMac 璁惧mac
*/
- public void checkInverterConnectedCloud(String deviceMac, CloudCallBeak<CloudInverterDeviceBean> cloudCallBeak) {
- this.getCloudInverterDeviceList(UserConfigManage.getInstance().getHomeId(), new CloudCallBeak<List<CloudInverterDeviceBean>>() {
+ public void checkInverterConnectedCloud(String homeId, String deviceMac, CloudCallBeak<CloudInverterDeviceBean> cloudCallBeak) {
+ this.getCloudInverterDeviceList(homeId, new CloudCallBeak<List<CloudInverterDeviceBean>>() {
@Override
public void onSuccess(List<CloudInverterDeviceBean> list) {
CloudInverterDeviceBean cloudInverterDeviceBean = null;
@@ -889,15 +1568,198 @@
/**
+ * 鑾峰彇鏈繍琛岄�嗗彉鍣ㄥ垪琛�
+ *
+ * @param homeId 鐢电珯id
+ */
+ public void getListNotRun(String homeId, CloudCallBeak<List<NotRunBean>> cloudCallBeak) {
+ String requestUrl = HttpApi.POST_Device_listNotRun;
+ JsonObject json = new JsonObject();
+ json.addProperty("homeId", homeId);
+ // json.addProperty("zoneType", "password");//鍖哄煙
+
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String jsonStr) {
+ if (TextUtils.isEmpty(jsonStr)) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(new ArrayList<>());
+ }
+ }
+ Type type = new TypeToken<List<NotRunBean>>() {
+ }.getType();
+ List<NotRunBean> list = new Gson().fromJson(jsonStr, type);
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(list);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ }
+ });
+ }
+
+ /**
+ * 閫嗗彉鍣ㄥ紑鏈�
+ *
+ * @param homeId 鐢电珯id
+ * @param arrayList 璁惧id鏁扮粍
+ */
+ public void setDeviceStartup(String homeId, JsonArray arrayList, CloudCallBeak<Boolean> cloudCallBeak) {
+ String requestUrl = HttpApi.POST_Device_startup;
+ JsonObject json = new JsonObject();
+ json.addProperty("homeId", homeId);
+ json.add("deviceIds", arrayList);
+ // json.addProperty("zoneType", "password");//鍖哄煙
+
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String jsonStr) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(true);
+ }
+
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ }
+ });
+ }
+
+ /**
+ * 鑾峰彇璁惧璇︽儏
+ *
+ * @param homeId 鐢电珯id
+ * @param arrayList 璁惧id鏁扮粍
+ */
+ public void getDeviceInfo(String homeId, JsonArray arrayList, CloudCallBeak<List<DeviceInfoBean>> cloudCallBeak) {
+ String requestUrl = HttpApi.POST_Device_info;
+ JsonObject json = new JsonObject();
+ json.addProperty("homeId", homeId);
+ json.add("deviceIds", arrayList);
+ // json.addProperty("zoneType", "password");//鍖哄煙
+
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String jsonStr) {
+ if (TextUtils.isEmpty(jsonStr)) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(new ArrayList<>());
+ }
+ return;
+ }
+ Gson gson = new Gson();
+ List<DeviceInfoBean> list = gson.fromJson(jsonStr, new TypeToken<List<DeviceInfoBean>>() {
+ }.getType());
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(list);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ }
+ });
+ }
+
+
+ /**
+ * 鑾峰彇鐢电珯涓嬭礋杞芥帶鍒朵腑蹇冨垪琛�
+ *
+ * @param homeId 鐢电珯id
+ */
+ public void getLoadCentreDeviceList(String homeId, CloudCallBeak<List<CloudInverterDeviceBean>> cloudCallBeak) {
+ String requestUrl = HttpApi.POST_Device_loadCentreDevices;
+ JsonObject json = new JsonObject();
+ json.addProperty("homeId", homeId);
+ // json.addProperty("zoneType", "password");//鍖哄煙
+
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String jsonStr) {
+ if (TextUtils.isEmpty(jsonStr)) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(new ArrayList<>());
+ }
+ }
+ 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(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ }
+ });
+ }
+
+ /**
+ * 閫嗗彉鍣ㄥ瘑鐮佺櫥褰�
+ *
+ * @param mac 閫嗗彉鍣╩ac
+ * @param password 閫嗗彉鍣ㄥ瘑鐮�
+ */
+ public void getPasswordVerification(String mac, String password, LinkCallBack<LocalResponse> callBeak) {
+ String requestUrl = TopicApi.DELETING_GATEWAY_password_verifiy;
+ JsonObject json = new JsonObject();
+ json.addProperty("password", password);
+ json.addProperty("mac", mac);
+ TcpClient.getInstance().sendDataToLinkGateway(mac, false, requestUrl, json, "", new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String msg) {
+ try {
+
+ Gson gson = new Gson();
+ LocalResponse localResponse = gson.fromJson(msg, LocalResponse.class);
+ if (localResponse == null) {
+ localResponse = new LocalResponse();
+ }
+ if (callBeak != null) {
+ callBeak.onSuccess(localResponse);
+ }
+ } catch (Exception e) {
+ if (callBeak != null) {
+ callBeak.onSuccess(new LocalResponse());
+ }
+ }
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ if (callBeak != null) {
+ callBeak.onError(e);
+ }
+ }
+ });
+ }
+
+ /**
* 鍒锋柊閫嗗彉鍣ㄧ紦瀛樹俊鎭�(鍖呮嫭璁剧疆mqtt绉橀挜锛�
- * 娉�:
+ * 娉�: //鐩殑鏄负浜嗚幏鍙栨嬁鍒扮綉鍏矷D锛宮qtt閫氳绉橀挜绛変俊鎭紝缂撳瓨鏈湴閫嗗彉鍣ㄥ垪琛ㄩ噷闈紝鍙戦�佹暟鎹暟鎹椂鑷姩鍘荤紦瀛樺垪琛ㄩ噷闈㈠幓鏌ユ壘锛�
* 1:鏈湴瀛樺湪,鏇存柊淇℃伅鍗冲彲;
* 2:鏈湴涓嶅瓨鍦�,鍒欒櫄鎷熶竴涓�嗗彉鍣ㄥ璞℃坊鍔犲湪鏈湴;
*
* @param deviceRemoteInfo 璁惧杩滅▼閫氳淇℃伅
* @param cloudInverterDeviceBean 閫嗗彉鍣�
*/
- private void refreshGatewayCacheData(boolean isLocal, CloudInverterDeviceBean cloudInverterDeviceBean, DeviceRemoteInfo deviceRemoteInfo) {
+ private void refreshGatewayCacheData(boolean isLocal, CloudInverterDeviceBean cloudInverterDeviceBean, DeviceRemoteInfo deviceRemoteInfo, String homeId) {
//鏈湴鏌ユ壘閫嗗彉鍣�
GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(cloudInverterDeviceBean.getOsn());
if (gatewayBean == null) {
@@ -914,8 +1776,9 @@
HDLLinkConfig.getInstance().setGatewayId(deviceRemoteInfo.getGatewayId());//璁剧疆gatewayId
}
- gatewayBean.setHomeId(UserConfigManage.getInstance().getHomeId());//浣忓畢id
- gatewayBean.setDeviceStatus(cloudInverterDeviceBean.getDeviceStatus());//璁剧疆缃戝叧鐘舵��
+
+ gatewayBean.setHomeId(homeId);//浣忓畢id
+ gatewayBean.setDeviceStatus(cloudInverterDeviceBean.getDeviceStatus());//璁剧疆缃戝叧鐘舵��(1 锛� 杩炴帴涓�,2 锛� 鏁呴殰, 3 锛� 杩愯,4 锛� 绂荤嚎)
gatewayBean.setDeviceId(cloudInverterDeviceBean.getDeviceId());//璁剧疆link璁惧id
gatewayBean.setDevice_mac(cloudInverterDeviceBean.getOsn());//璁剧疆mac
gatewayBean.setOid(cloudInverterDeviceBean.getOid());//璁惧oid
@@ -923,14 +1786,23 @@
gatewayBean.setDevice_name(cloudInverterDeviceBean.getName());//璁惧鍚嶇О
gatewayBean.setGatewayType(cloudInverterDeviceBean.getSpk());//璁剧疆spk
gatewayBean.setLocalEncrypt(true);
+ //绂荤綉閫嗗彉鍣�
+ gatewayBean.setOgMaster(cloudInverterDeviceBean.isOgMaster());
+ //閫嗗彉鍣�
gatewayBean.setMaster(GatewayMasterType.MasterTrue);//榛樿閮芥槸涓婚�嗗彉鍣�(浠ュ悗鏀寔浠庨�嗗彉鍣ㄨ鏇存敼)
- gatewayBean.setSystemStatusDesc(cloudInverterDeviceBean.getSystemStatusDesc());//璁惧鐘舵��
+ gatewayBean.setSystemStatusDesc(cloudInverterDeviceBean.getSystemStatusDesc());//璁惧鐘舵�侊紙閫嗗彉鍣ㄨ澶囷級
+ gatewayBean.setWorkStatusDesc(cloudInverterDeviceBean.getWorkStatusDesc());//宸ヤ綔鐘舵�侊紙璐熻浇涓績璁惧锛�
gatewayBean.setHwVersion(cloudInverterDeviceBean.getHwVersion());//杞欢鐗堟湰鍙�
gatewayBean.setCategorySecondName(cloudInverterDeviceBean.getCategorySecondName());//璁惧绫诲瀷(浜у搧浜岀骇鍒嗙被鍚嶇О
- gatewayBean.setAddresses(cloudInverterDeviceBean.getAddresses());//瀛愮綉鍙�/璁惧鍙�
+ gatewayBean.setDeviceType(cloudInverterDeviceBean.getDeviceType());//璁惧绫诲瀷(INV:閫嗗彉鍣�;BMS:BMS鎺у埗鐩�;BATTERY:鐢垫睜鍗曞厓)
+ gatewayBean.setAddresses(cloudInverterDeviceBean.getAddresses());//瀛愮綉鍙�/璁惧鍙�,閫嗗彉鍣ㄥ湴鍧�
gatewayBean.setPowerPvNow(cloudInverterDeviceBean.getPowerPvNow());//鍙戠數鍔熺巼
+ gatewayBean.setOutputActivePower(cloudInverterDeviceBean.getOutputActivePower());//閫嗗彉鍣ㄨ緭鍑烘湁鍔熷姛鐜�
gatewayBean.setTotalElectricityPvToday(cloudInverterDeviceBean.getTotalElectricityPvToday());//浠婃棩鍙戠數閲�
- gatewayBean.setDevice_model(cloudInverterDeviceBean.getOmodel());//璁惧鍨嬪彿
+ if (!TextUtils.isEmpty(cloudInverterDeviceBean.getOmodel())) {
+ //鍙兘璁惧娌℃湁涓婃姤缁欎簯绔�,寤鸿缁戝畾閫嗗彉鍣ㄦ椂鍊欒拷鍔犱竴涓弬鏁�;
+ gatewayBean.setDevice_model(cloudInverterDeviceBean.getOmodel());//璁惧鍨嬪彿
+ }
gatewayBean.setSpk(cloudInverterDeviceBean.getSpk());//璁惧spk
@@ -944,7 +1816,9 @@
*/
public List<String> getGatewaySpk() {
List<String> spks = new ArrayList<>();
- spks.add(DEVICE_SPK);
+ spks.add(INVERTER_DEVICE_SPK);
+ spks.add(LC_SPK);
+ spks.add(OFF_INVERTER_OG_SPK);
return spks;
}
@@ -960,5 +1834,48 @@
return false;
}
- public final String DEVICE_SPK = "energy.hdl_inverter";
+ /**
+ * 妯℃嫙閫嗗彉鍣ㄨ澶囧垪琛�
+ *
+ * @param sum 妯℃嫙澶氬皯涓�
+ * @return 杩斿洖閫嗗彉鍣ㄥ垪琛�
+ */
+ public List<GatewayBean> getGatewayDeviceListMockData(int sum) {
+
+ try {
+ List<GatewayBean> list = new ArrayList<>();
+ for (int i = 0; i < sum; i++) {
+ String spk = getGatewaySpk().get(i % getGatewaySpk().size());
+ GatewayBean gatewayBean = new GatewayBean();
+ gatewayBean.setHomeId("100000000" + i);
+ gatewayBean.setDevice_mac("200000000" + i);
+ gatewayBean.setSpk(spk);
+ gatewayBean.setGateway_type(spk);
+ gatewayBean.setMaster("true");
+ gatewayBean.setSid("300000000" + i);
+ gatewayBean.setOid("400000000" + i);
+ gatewayBean.setGatewayId("500000000" + i);
+ gatewayBean.setDevice_name("妯℃嫙-" + i + "(" + spk + ")");
+ gatewayBean.setDeviceStatus(5);//榛樿閮芥槸绂荤嚎卢
+ list.add(gatewayBean);
+ }
+ return list;
+ } catch (Exception ignored) {
+ return new ArrayList<>();
+ }
+
+ }
+
+ /**
+ * 閫嗗彉鍣╯pk
+ */
+ public final String INVERTER_DEVICE_SPK = "energy.hdl_inverter";
+ /**
+ * 璐熻浇涓績spk
+ */
+ public final String LC_SPK = "energy.hdl_lc";
+ /**
+ * 绂荤嚎閫嗗彉鍣╯pk
+ */
+ public final String OFF_INVERTER_OG_SPK = "energy.inverter_og";
}
--
Gitblit v1.8.0