From 636c4bb04e4fcd723766b82732990cdb4ae4ea2e Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 22 二月 2024 15:48:23 +0800
Subject: [PATCH] 删除掉本地库
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 159 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 115 insertions(+), 44 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 ed1ca49..49cdca5 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -63,7 +63,7 @@
/**
* 鑾峰彇褰撳墠浣忓畢鐨勯�嗗彉鍣ㄥ垪琛�(鍖呮嫭浠庣殑閫嗗彉鍣�)
*/
- 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) {
@@ -73,7 +73,7 @@
continue;
}
//鐢╤omeId绛涢�夊綋鍓嶄綇瀹呯殑閫嗗彉鍣ㄥ垪琛�
- if (gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
+ if (gatewayBean.getHomeId().equals(homeId)) {
newList.add(gatewayBean);
}
}
@@ -84,21 +84,21 @@
/**
* 鑾峰彇褰撳墠浣忓畢鐨勩�愪富銆戦�嗗彉鍣�
*/
- public GatewayBean getCurrentHomeMainGateway() {
- return queryCurrentHomeMainGateway(this.getCurrentHomeGatewayList());
+ public GatewayBean getCurrentHomeMainGateway(String homeId) {
+ return queryCurrentHomeMainGateway(this.getCurrentHomeGatewayList(homeId), homeId);
}
/**
* 鏌ヨ褰撳墠浣忓畢鐨勩�愪富銆戦�嗗彉鍣�
*/
- public GatewayBean queryCurrentHomeMainGateway(List<GatewayBean> list) {
+ public GatewayBean queryCurrentHomeMainGateway(List<GatewayBean> list, String homeId) {
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())) {
+ if (gatewayBean.getMaster().equals(GatewayMasterType.MasterTrue) && gatewayBean.getHomeId().equals(homeId)) {
//鎵惧埌杩斿洖
findGatewayBean = gatewayBean;
break;
@@ -111,31 +111,32 @@
/**
* 閫嗗彉鍣ㄤ笂浼犳暟鎹埌浜戠(鍖呮嫭:sid锛宱id)
*
- * @param mac 璁惧mac
+ * @param homeId 浣忓畢id
+ * @param mac 璁惧mac
*/
- public void uploadDataToCloud(String mac, CloudCallBeak<Boolean> callBeak) {
+ 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) {
+ public void onSuccess(List<OidBean> oidBeanList) {
+ if (oidBeanList == null) {
return;
}
- fullUpdateOid(obj, new CloudCallBeak<Boolean>() {
+ fullUpdateOid(homeId, oidBeanList, new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
- HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔垚鍔�-->" + mac, true);
+ HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔垚鍔�--->浣忓畢id:" + homeId + "--->mac:" + mac, true);
}
@Override
public void onFailure(HDLException e) {
- HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�-->" + mac + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
+ HdlLogLogic.print("涓婁紶oid鍒楄〃鍒颁簯绔け璐�--->浣忓畢id:" + homeId + "--->mac:" + mac + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
}
});
}
@Override
public void onError(HDLLinkException e) {
- HdlLogLogic.print("鑾峰彇閫嗗彉鍣╫id鍒楄〃澶辫触-->" + mac + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
+ HdlLogLogic.print("鑾峰彇閫嗗彉鍣╫id鍒楄〃澶辫触--->浣忓畢id:" + homeId + "--->mac:" + mac + "-->" + e.getMsg() + "(" + e.getCode() + ")", true);
}
});
@@ -151,11 +152,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);
@@ -169,7 +170,7 @@
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(true);
//涓存椂鐨勯�昏緫锛屼笂浼爋id鍒楄〃鍒颁簯绔�
- uploadDataToCloud(mac, null);
+ uploadDataToCloud(UserConfigManage.getInstance().getHomeId(), mac, null);
}
}
@@ -226,10 +227,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");//鍖哄煙
@@ -256,10 +257,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");//鍖哄煙
@@ -293,14 +294,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);
@@ -326,7 +386,7 @@
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(true);
}
-
+ HdlLogLogic.print("澧為噺娣诲姞oid鍒颁簯绔垚鍔�--->");
}
@Override
@@ -334,6 +394,7 @@
if (cloudCallBeak != null) {
cloudCallBeak.onFailure(e);
}
+ HdlLogLogic.print("澧為噺娣诲姞oid鍒颁簯绔け璐�--->" + e.getMsg() + "(" + e.getCode() + ")", true);
}
});
@@ -346,10 +407,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());
//瑙ｅ瘑璐熻浇鏁版嵁(鍐欏瘑閽ョ粰缃戝叧涓�瀹氭槸鏄庢枃锛屽洜涓洪偅鏃剁綉鍏宠繕娌℃湁瀵嗛挜)
@@ -381,7 +442,7 @@
* 缃戝叧鏃堕棿璇诲彇
*
* @param mac 璁惧mac
- * @param linkCallBack 鍥炶皟update
+ * @param linkCallBack 鍥炶皟updatetime
*/
public void getGatewayTime(String mac, LinkCallBack<DeviceTimeBean> linkCallBack) {
String requestUrl = TopicApi.GET_GATEWAY_TIME;
@@ -421,13 +482,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) {
@@ -569,7 +639,7 @@
if (list == null || list.size() == 0) {
//浜戠娌℃湁缁戝畾閫嗗彉鍣�,榛樿杩斿洖鏈湴閫嗗彉鍣ㄥ垪琛�;
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
}
return;
}
@@ -583,7 +653,7 @@
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
@@ -604,7 +674,7 @@
removeLocalInverter(removeSidList.get(i));
}
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
}
}
}
@@ -632,7 +702,7 @@
removeLocalInverter(removeSidList.get(i));
}
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
}
}
HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触->msg->" + e.getMsg() + "(" + e.getCode() + ")");
@@ -648,7 +718,7 @@
///鎯呭喌2:鏈夊眬鍩熺綉锛屾病鏈夊缃�;
//鏈湴鏈夐�嗗彉鍣ㄥ垪琛�,鑾峰彇浜戠缁戝畾閫嗗彉鍣ㄥけ璐�,榛樿杩斿洖鏈湴閫嗗彉鍣ㄥ垪琛�;
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(getCurrentHomeGatewayList());
+ cloudCallBeak.onSuccess(getCurrentHomeGatewayList(homeId));
}
}
});
@@ -682,11 +752,11 @@
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));
}
}
}
@@ -697,10 +767,10 @@
//褰撴渶鍚庝竴鏉¤姹傚け璐ヤ簡锛屾墠鏈夊洖璋�
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() + ")");
}
});
}
@@ -780,6 +850,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) {
@@ -822,7 +893,7 @@
*
* @param gatewayCallBack -
*/
- public void searchAllGateway(GatewayCallBack gatewayCallBack) {
+ public void searchAllNetworkGateway(GatewayCallBack gatewayCallBack) {
//缃戝叧鎼滅储
HDLLinkLocalSdk.getInstance().refreshGateway(gatewayCallBack, this.getGatewaySpk());
}
@@ -891,8 +962,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;
@@ -929,7 +1000,7 @@
* @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) {
@@ -946,7 +1017,7 @@
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
--
Gitblit v1.8.0