From fdcfe6ef562cc3e8bbd6fcf2faedfbd9571f4490 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期一, 01 四月 2024 14:33:42 +0800
Subject: [PATCH] 解决小程序白屏的问题
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 548 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 449 insertions(+), 99 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 85993cc..43a4fde 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -2,6 +2,7 @@
import android.text.TextUtils;
+import com.facebook.imagepipeline.image.OriginalEncodedImageInfo;
import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
@@ -20,14 +21,21 @@
import com.hdl.photovoltaic.ui.bean.DeviceRemoteInfo;
import com.hdl.photovoltaic.ui.bean.DeviceTimeBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
+import com.hdl.sdk.link.HDLLinkLocalSdk;
+import com.hdl.sdk.link.common.config.TopicConstant;
+import com.hdl.sdk.link.common.exception.HDLLinkCode;
import com.hdl.sdk.link.common.exception.HDLLinkException;
+import com.hdl.sdk.link.common.utils.IdUtils;
+import com.hdl.sdk.link.core.bean.LinkRequest;
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.core.connect.HDLConnectHelper;
import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
import com.hdl.sdk.link.gateway.type.GatewayMasterType;
+
import java.lang.reflect.Type;
import java.util.ArrayList;
@@ -58,10 +66,11 @@
return sHdlDeviceLogic;
}
+
/**
- * 鑾峰彇褰撳墠浣忓畢鐨勯�嗗彉鍣ㄥ垪琛�
+ * 鑾峰彇褰撳墠浣忓畢鐨勯�嗗彉鍣ㄥ垪琛�(鍖呮嫭浠庣殑閫嗗彉鍣�)
*/
- public List<GatewayBean> getCurrentHomeGatewayList() {
+ public List<GatewayBean> getCurrentHomeGatewayList(String homeId) {
List<GatewayBean> newList = new ArrayList<>();
List<GatewayBean> list = HDLLinkLocalGateway.getInstance().getGatewayList();
if (list.size() > 0) {
@@ -70,7 +79,8 @@
if (TextUtils.isEmpty(gatewayBean.getDevice_mac())) {
continue;
}
- if (gatewayBean.getMaster().equals(GatewayMasterType.MasterTrue) && gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
+ //鐢╤omeId绛涢�夊綋鍓嶄綇瀹呯殑閫嗗彉鍣ㄥ垪琛�
+ if (gatewayBean.getHomeId().equals(homeId)) {
newList.add(gatewayBean);
}
}
@@ -78,36 +88,55 @@
return newList;
}
+
/**
* 閫嗗彉鍣ㄤ笂浼犳暟鎹埌浜戠(鍖呮嫭:sid锛宱id)
*
- * @param mac 璁惧mac
+ * @param homeId 浣忓畢id
+ * @param list 閫嗗彉鍣ㄥ垪琛�
*/
- 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 uploadDataToCloud(String homeId, List<GatewayBean> list, CloudCallBeak<Boolean> callBeak) {
+ if (list == null || list.size() == 0) {
+ return;
+ }
+ List<OidBean> oidList = new ArrayList<>();
+ AtomicInteger atomicInteger = new AtomicInteger(0);
+ for (int i = 0; i < list.size(); i++) {
+ atomicInteger.set(atomicInteger.get() + 1);
+ GatewayBean gatewayBean = list.get(i);
+ if (gatewayBean == null || TextUtils.isEmpty(gatewayBean.getDevice_mac())) {
+ continue;
+ }
+ getInverterOidList(gatewayBean.getDevice_mac(), new LinkCallBack<List<OidBean>>() {
+ @Override
+ public void onSuccess(List<OidBean> oidBeanList) {
+ if (oidBeanList == null) {
+ return;
+ }
+ oidList.addAll(oidBeanList);
+ if (atomicInteger.get() == list.size()) {
+ //鍏ㄩ儴鑾峰彇鍚庡啀涓婁紶
+ fullUpdateOid(homeId, oidList, new CloudCallBeak<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔垚鍔�--->浣忓畢id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac(), true);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�--->浣忓畢id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
+ }
+ });
+ }
}
- fullUpdateOid(obj, new CloudCallBeak<Boolean>() {
- @Override
- public void onSuccess(Boolean obj) {
- }
+ @Override
+ public void onError(HDLLinkException e) {
+ HdlLogLogic.print("鑾峰彇閫嗗彉鍣╫id鍒楄〃澶辫触--->浣忓畢id:" + homeId + "--->mac:" + gatewayBean.getDevice_mac() + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
+ }
+ });
+ }
- @Override
- public void onFailure(HDLException e) {
-
- }
- });
- }
-
- @Override
- public void onError(HDLLinkException e) {
-
- }
- });
}
@@ -121,11 +150,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);
@@ -139,7 +168,52 @@
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(true);
//涓存椂鐨勯�昏緫锛屼笂浼爋id鍒楄〃鍒颁簯绔�
- uploadDataToCloud(mac, null);
+ List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(homeId);
+ uploadDataToCloud(UserConfigManage.getInstance().getHomeId(), list, null);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ 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鍒楄〃鍒颁簯绔紙鍘绘帀锛屽師鍥犳槸鎴戜笂浼犳垚鍔熷悗锛岀綉鍏冲啀娆″叏閲忎笂浼爋id鍒楄〃锛屼細鎶婁箣鍓峯id鍒楄〃瑕嗙洊鎺夛級
+// uploadDataToCloud(homeId, list, null);
}
}
@@ -196,10 +270,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");//鍖哄煙
@@ -226,10 +300,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");//鍖哄煙
@@ -263,14 +337,73 @@
/**
* 鍏ㄩ噺鏇存柊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 (oidList == null || oidList.size() == 0) {
+ 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 (oidList == null || oidList.size() == 0) {
+ 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);
@@ -296,7 +429,7 @@
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(true);
}
-
+ HdlLogLogic.print("澧為噺娣诲姞oid鍒颁簯绔垚鍔�--->");
}
@Override
@@ -304,6 +437,7 @@
if (cloudCallBeak != null) {
cloudCallBeak.onFailure(e);
}
+ HdlLogLogic.print("澧為噺娣诲姞oid鍒颁簯绔け璐�--->" + e.getMsg() + "(" + e.getCode() + ")", true);
}
});
@@ -316,13 +450,13 @@
* @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());
- //瑙ｅ瘑璐熻浇鏁版嵁(鍥犱负鍐欏瘑閽ョ粰缃戝叧涓�瀹氭槑鏂囷紝鍥犱负閭ｆ椂缃戝叧杩樻病鏈夊瘑閽�)
+ //瑙ｅ瘑璐熻浇鏁版嵁(鍐欏瘑閽ョ粰缃戝叧涓�瀹氭槸鏄庢枃锛屽洜涓洪偅鏃剁綉鍏宠繕娌℃湁瀵嗛挜)
TcpClient.getInstance().sendDataToLinkGateway(mac, false, requestUrl, json, "", new HDLLinkCallBack() {
@Override
public void onSuccess(String msg) {
@@ -351,7 +485,7 @@
* 缃戝叧鏃堕棿璇诲彇
*
* @param mac 璁惧mac
- * @param linkCallBack 鍥炶皟update
+ * @param linkCallBack 鍥炶皟updatetime
*/
public void getGatewayTime(String mac, LinkCallBack<DeviceTimeBean> linkCallBack) {
String requestUrl = TopicApi.GET_GATEWAY_TIME;
@@ -365,10 +499,13 @@
}
return;
}
+
Gson gson = new Gson();
- DeviceTimeBean deviceTimeBean = gson.fromJson(json, DeviceTimeBean.class);
+ Type typeOfT = new TypeToken<BaseLocalResponse<DeviceTimeBean>>() {
+ }.getType();
+ BaseLocalResponse<DeviceTimeBean> baseLocalResponse = gson.fromJson(json, typeOfT);
if (linkCallBack != null) {
- linkCallBack.onSuccess(deviceTimeBean);
+ linkCallBack.onSuccess(baseLocalResponse.getObjects());
}
}
@@ -388,13 +525,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) {
@@ -476,6 +622,68 @@
}
/**
+ * 鍒濆鍖栭�嗗彉鍣�
+ *
+ * @param mac 缃戝叧mac
+ */
+ public void initializeGateway(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);
+ }
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ if (linkCallBack != null) {
+ linkCallBack.onError(e);
+ }
+ }
+ });
+
+ }
+
+
+ /**
* 鑾峰彇閫嗗彉鍣╫id鍒楄〃
*
* @param mac 缃戝叧mac
@@ -518,24 +726,25 @@
}
/**
- * 鑾峰彇閫嗗彉鍣ㄥ垪琛�
- * 娉ㄦ剰:鏈夊缃戜互浜戠璁惧涓哄噯,鏈湴瀛樺湪锛屼簯绔病鏈夊垯鍒犻櫎锛涘唴缃戜互鏈湴涓轰富,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓紱
+ * 鑾峰彇閫嗗彉鍣ㄥ垪琛�(鏁村悎浜戠鍜屾湰鍦板垪琛�)
+ * 娉ㄦ剰:鏈夊缃戯紝浠ヤ簯绔澶囦负鍑�,鏈湴瀛樺湪锛屼簯绔病鏈夊垯鍒犻櫎锛涘唴缃戯紝浠ユ湰鍦颁负涓�,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓紱
*
+ * @param homeId 浣忓畢id
* @param cloudCallBeak 杩斿洖閫嗗彉鍣ㄥ垪琛�
*/
- public void getCurrentHomeLocalAndCloudGatewayList(CloudCallBeak<List<GatewayBean>> cloudCallBeak) {
- HdlDeviceLogic.getInstance().searchGateway(new GatewayCallBack() {
+ public void getCurrentHomeLocalAndCloudGatewayList(String homeId, CloudCallBeak<List<GatewayBean>> cloudCallBeak) {
+ HdlDeviceLogic.getInstance().searchCurrentHomeGateway(new GatewayCallBack() {
@Override
public void onSuccess(List<GatewayBean> gatewayBeanList) {
- //灞�鍩熺綉鎯呭喌
- HdlDeviceLogic.getInstance().getCloudInverterDeviceList(UserConfigManage.getInstance().getHomeId(), new CloudCallBeak<List<CloudInverterDeviceBean>>() {
+ //灞�鍩熺綉鏈�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) {
-// //浜戠娌℃湁缁戝畾閫嗗彉鍣�,浠ユ湰鍦颁负涓�;
-// HDLLinkLocalGateway.getInstance().getGatewayList().clear();
+ //浜戠娌℃湁缁戝畾閫嗗彉鍣�,榛樿杩斿洖鏈湴閫嗗彉鍣ㄥ垪琛�;
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
}
return;
}
@@ -543,23 +752,22 @@
AtomicInteger atomicInteger = new AtomicInteger(0);
for (int i = 0; i < list.size(); i++) {
CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
- getDeviceRemoteInfo(UserConfigManage.getInstance().getHomeId(), cloudInverterDeviceBean.getSpk(), cloudInverterDeviceBean.getOsn(), new CloudCallBeak<DeviceRemoteInfo>() {
+ //鑾峰彇杩滅▼璁惧閫氳淇℃伅(鎷垮埌缃戝叧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);
+ //鏇存柊閫嗗彉鍣ㄦ湰鍦扮紦瀛樹俊鎭�
+ refreshGatewayCacheData(true, cloudInverterDeviceBean, deviceRemoteInfo, homeId);
+ //鏈�鍚庝竴鏉℃墠鍋氬垹闄ら�嗗彉鍣ㄩ�昏緫澶勭悊
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 j = 0; j < HDLLinkLocalGateway.getInstance().getGatewayList().size(); j++) {
+ GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getGatewayList().get(j);
+ if (!querySidInverter(list, gatewayBean.getSid())) {
+ //鏈湴鏈夛紝浜戠娌℃湁,鍒犻櫎鏈湴锛�
+ removeSidList.add(gatewayBean.getSid());
}
}
for (int i = 0; i < removeSidList.size(); i++) {
@@ -567,7 +775,7 @@
removeLocalInverter(removeSidList.get(i));
}
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
}
}
}
@@ -575,19 +783,15 @@
@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 j = 0; j < HDLLinkLocalGateway.getInstance().getGatewayList().size(); j++) {
+ GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getGatewayList().get(j);
+ if (!querySidInverter(list, gatewayBean.getSid())) {
+ //鏈湴鏈夛紝浜戠娌℃湁,鍒犻櫎鏈湴锛�
+ removeSidList.add(gatewayBean.getSid());
}
}
for (int i = 0; i < removeSidList.size(); i++) {
@@ -595,7 +799,7 @@
removeLocalInverter(removeSidList.get(i));
}
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
}
}
HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触->msg->" + e.getMsg() + "(" + e.getCode() + ")");
@@ -608,8 +812,10 @@
@Override
public void onFailure(HDLException e) {
+ ///鎯呭喌2:鏈夊眬鍩熺綉锛屾病鏈夊缃�;
+ //鏈湴鏈夐�嗗彉鍣ㄥ垪琛�,鑾峰彇浜戠缁戝畾閫嗗彉鍣ㄥけ璐�,榛樿杩斿洖鏈湴閫嗗彉鍣ㄥ垪琛�;
if (cloudCallBeak != null) {
- cloudCallBeak.onFailure(e);
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
}
}
});
@@ -617,30 +823,37 @@
@Override
public void onError(HDLLinkException e) {
- //澶栫綉鎯呭喌
- HdlDeviceLogic.getInstance().getCloudInverterDeviceList(UserConfigManage.getInstance().getHomeId(), new CloudCallBeak<List<CloudInverterDeviceBean>>() {
+ //澶栫綉鍙湁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(getCurrentHomeGatewayList());
+ //浜戠涔熸病鏈夐�嗗彉鍣ㄥ垪琛�,杩斿洖绌哄垪琛ㄥ洖鍘�
+ 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);
- getDeviceRemoteInfo(UserConfigManage.getInstance().getHomeId(), cloudInverterDeviceBean.getSpk(), cloudInverterDeviceBean.getOsn(), new CloudCallBeak<DeviceRemoteInfo>() {
+
+ //鑾峰彇杩滅▼璁惧閫氳淇℃伅(鎷垮埌缃戝叧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);
+ //鏇存柊閫嗗彉鍣ㄦ湰鍦扮紦瀛樹俊鎭�
+ refreshGatewayCacheData(false, cloudInverterDeviceBean, deviceRemoteInfo, homeId);
+ //鍒版渶鍚庝竴鏉★紝鎵嶆湁鍥炶皟
if (atomicInteger.get() == list.size()) {
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
}
}
}
@@ -648,12 +861,13 @@
@Override
public void onFailure(HDLException e) {
atomicInteger.set(atomicInteger.get() + 1);
+ //褰撴渶鍚庝竴鏉¤姹傚け璐ヤ簡锛屾墠鏈夊洖璋�
if (atomicInteger.get() == list.size()) {
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
}
}
- HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触->msg->" + e.getMsg() + "(" + e.getCode() + ")");
+ HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触--->msg--->" + e.getMsg() + "(" + e.getCode() + ")");
}
});
}
@@ -673,13 +887,28 @@
}
/**
+ * 閫氳繃sid鏌ヨ閫嗗彉鍣�
+ *
+ * @param list 浜戠涓婇�嗗彉鍣ㄥ垪琛�
+ * @return 瀛樺湪涓簍rue, 鍚﹀垯涓篺alse
+ */
+ private boolean querySidInverter(List<CloudInverterDeviceBean> list, String sid) {
+ for (int i = 0; i < list.size(); i++) {
+ CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
+ if (sid.equals(cloudInverterDeviceBean.getSid())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
* 鑾峰彇璁惧杩滅▼閫氳淇℃伅
*
* @param homeId 浣忓畢Id
* @param spk spk
* @param mac 璁惧mac
* @param cloudCallBeak 鍥炶皟
- * @return -
*/
public void getDeviceRemoteInfo(String homeId, String spk, String mac, CloudCallBeak<DeviceRemoteInfo> cloudCallBeak) {
String requestUrl = HttpApi.POST_Device_RemoteInfo;
@@ -734,6 +963,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) {
@@ -760,25 +990,131 @@
/**
* 鎼滅储閫嗗彉鍣ㄥ垪琛�
+ * 娉ㄦ剰:鍙悳绱㈠綋鍓嶄綇瀹呴�嗗彉鍣ㄥ拰娌℃湁琚粦瀹氱殑閫嗗彉鍣�
*
* @param gatewayCallBack -
*/
- public void searchGateway(GatewayCallBack gatewayCallBack) {
+ public void searchCurrentHomeGateway(GatewayCallBack gatewayCallBack) {
List<String> spks = this.getGatewaySpk();
//缃戝叧鎼滅储
HDLLinkLocalGateway.getInstance().refreshGatewayByHomeIdAndSpk(UserConfigManage.getInstance().getHomeId(), spks, true, gatewayCallBack);
}
/**
+ * 鎼滅储灞�鍩熺綉鎵�鏈夐�嗗彉鍣ㄥ垪琛�
+ * 娉ㄦ剰:鍖呮嫭宸茬粡琚粦瀹氬埌浣忓畢鐨勯�嗗彉鍣�
+ *
+ * @param gatewayCallBack -
+ */
+ public void searchAllNetworkGateway(GatewayCallBack gatewayCallBack) {
+ List<String> spks = this.getGatewaySpk();
+ //缃戝叧鎼滅储
+ HDLLinkLocalGateway.getInstance().refreshGatewayBySpk(spks, true, gatewayCallBack);
+ }
+
+ /**
+ * 妫�娴嬫湰鍦拌繛鎺ョ姸鎬�
+ *
+ * @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璁㈤槄锛屽姞瑙ｅ瘑浼氱敤鍒拌鍙傛暟;
+ 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 homeId, String deviceMac, CloudCallBeak<CloudInverterDeviceBean> cloudCallBeak) {
+ this.getCloudInverterDeviceList(homeId, 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:浜戠鏈夋湰鍦颁笉瀛樺湪,鍒欒櫄鎷熶竴涓�嗗彉鍣ㄥ璞℃坊鍔犲湪鏈湴;
+ * 1:鏈湴瀛樺湪,鏇存柊淇℃伅鍗冲彲;
+ * 2:鏈湴涓嶅瓨鍦�,鍒欒櫄鎷熶竴涓�嗗彉鍣ㄥ璞℃坊鍔犲湪鏈湴;
*
* @param deviceRemoteInfo 璁惧杩滅▼閫氳淇℃伅
* @param cloudInverterDeviceBean 閫嗗彉鍣�
*/
- private static 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) {
@@ -790,12 +1126,12 @@
if (deviceRemoteInfo != null) {
gatewayBean.setAesKey(deviceRemoteInfo.getSecret());//璁剧疆mqtt閫氳绉橀挜
gatewayBean.setGatewayId(deviceRemoteInfo.getGatewayId());//璁剧疆gatewayId
- //鐢ㄤ箣鍓嶇殑搴�,搴曞眰mqtt璁㈤槄锛屽姞瑙ｅ瘑浼氱敤鍒拌鍙傛暟;
+ //todo 璁剧疆鍒般�愬簱銆戦噷闈�,搴曞眰mqtt璁㈤槄锛屽姞瑙ｅ瘑浼氱敤鍒拌鍙傛暟;
HDLLinkConfig.getInstance().setAesKey(deviceRemoteInfo.getSecret());//璁剧疆mqtt閫氳绉橀挜搴�
HDLLinkConfig.getInstance().setGatewayId(deviceRemoteInfo.getGatewayId());//璁剧疆gatewayId
}
- gatewayBean.setHomeId(UserConfigManage.getInstance().getHomeId());//浣忓畢id
+ gatewayBean.setHomeId(homeId);//浣忓畢id
gatewayBean.setDeviceStatus(cloudInverterDeviceBean.getDeviceStatus());//璁剧疆缃戝叧鐘舵��
gatewayBean.setDeviceId(cloudInverterDeviceBean.getDeviceId());//璁剧疆link璁惧id
gatewayBean.setDevice_mac(cloudInverterDeviceBean.getOsn());//璁剧疆mac
@@ -804,14 +1140,16 @@
gatewayBean.setDevice_name(cloudInverterDeviceBean.getName());//璁惧鍚嶇О
gatewayBean.setGatewayType(cloudInverterDeviceBean.getSpk());//璁剧疆spk
gatewayBean.setLocalEncrypt(true);
- gatewayBean.setMaster(GatewayMasterType.MasterTrue);
+ gatewayBean.setMaster(GatewayMasterType.MasterTrue);//榛樿閮芥槸涓婚�嗗彉鍣�(浠ュ悗鏀寔浠庨�嗗彉鍣ㄨ鏇存敼)
gatewayBean.setSystemStatusDesc(cloudInverterDeviceBean.getSystemStatusDesc());//璁惧鐘舵��
gatewayBean.setHwVersion(cloudInverterDeviceBean.getHwVersion());//杞欢鐗堟湰鍙�
gatewayBean.setCategorySecondName(cloudInverterDeviceBean.getCategorySecondName());//璁惧绫诲瀷(浜у搧浜岀骇鍒嗙被鍚嶇О
- gatewayBean.setAddresses(cloudInverterDeviceBean.getAddresses());//瀛愮綉鍙�/璁惧鍙�
+ gatewayBean.setAddresses(cloudInverterDeviceBean.getAddresses());//瀛愮綉鍙�/璁惧鍙�,閫嗗彉鍣ㄥ湴鍧�
gatewayBean.setPowerPvNow(cloudInverterDeviceBean.getPowerPvNow());//鍙戠數鍔熺巼
gatewayBean.setTotalElectricityPvToday(cloudInverterDeviceBean.getTotalElectricityPvToday());//浠婃棩鍙戠數閲�
- gatewayBean.setDevice_model(cloudInverterDeviceBean.getOmodel());//璁惧鍨嬪彿
+ if (!TextUtils.isEmpty(cloudInverterDeviceBean.getOmodel())) {
+ gatewayBean.setDevice_model(cloudInverterDeviceBean.getOmodel());//璁惧鍨嬪彿
+ }
gatewayBean.setSpk(cloudInverterDeviceBean.getSpk());//璁惧spk
@@ -819,15 +1157,27 @@
/**
- * 鑾峰彇缃戝叧spk鍒楄〃
+ * 鑾峰彇缃戝叧鏀寔spk鍒楄〃
*
* @return -
*/
- private List<String> getGatewaySpk() {
+ 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