From e10685706d2bacf0da27b8393c04a1f7a4df2bad Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 09 十月 2023 18:06:52 +0800
Subject: [PATCH] 2023年10月09日18:06:49
---
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java | 4
app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java | 10 -
app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java | 3
app/src/main/java/com/hdl/photovoltaic/ui/bean/DeviceRemoteInfo.java | 63 +++++++++
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 27 ++-
HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java | 53 +++++-
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 221 ++++++++++++++++++++++++------
7 files changed, 302 insertions(+), 79 deletions(-)
diff --git a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java
index 9bb9383..c94bd40 100644
--- a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java
+++ b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java
@@ -77,15 +77,10 @@
private String deviceId;
/**
- * 姣背娉id
+ * sid
*/
private String sid;
-
- /**
- * 璁惧鏉ユ簮(鑷畾涔�:0=琛ㄧず缃戝叧;1=琛ㄧず骞冲彴)
- */
- private String src;
private String systemStatusDesc;//浜戠-鐘舵��
@@ -93,13 +88,15 @@
private String categorySecondName;//浜戠-璁惧绫诲瀷(浜у搧浜岀骇鍒嗙被鍚嶇О)
- public String getSrc() {
- return src == null ? "" : this.src;
- }
+ //瀛愮綉鍙�/璁惧鍙�
+ private String addresses;
- public void setSrc(String src) {
- this.src = src;
- }
+ //缃戝叧鐘舵��:1:寰呮満,2:杩炴帴涓�,3:鏁呴殰,4:杩愯,5:绂荤嚎
+ private int deviceStatus;
+
+ private String powerPvNow;//鍙戠數鍔熺巼
+ private String totalElectricityPvToday;//浠婃棩鍙戠數閲�
+
public String getAesKey() {
return aesKey == null ? "" : aesKey;
@@ -394,4 +391,36 @@
public void setCategorySecondName(String categorySecondName) {
this.categorySecondName = categorySecondName;
}
+
+ public String getAddresses() {
+ return addresses == null ? "" : addresses;
+ }
+
+ public void setAddresses(String addresses) {
+ this.addresses = addresses;
+ }
+
+ public int getDeviceStatus() {
+ return deviceStatus;
+ }
+
+ public void setDeviceStatus(int deviceStatus) {
+ this.deviceStatus = deviceStatus;
+ }
+
+ public String getPowerPvNow() {
+ return powerPvNow == null ? "" : powerPvNow;
+ }
+
+ public void setPowerPvNow(String powerPvNow) {
+ this.powerPvNow = powerPvNow;
+ }
+
+ public String getTotalElectricityPvToday() {
+ return totalElectricityPvToday == null ? "" : totalElectricityPvToday;
+ }
+
+ public void setTotalElectricityPvToday(String totalElectricityPvToday) {
+ this.totalElectricityPvToday = totalElectricityPvToday;
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java b/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
index 6400d93..cc842ec 100644
--- a/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
+++ b/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
@@ -229,4 +229,7 @@
private static final String FILENAME = "UserConfigManage.json";
+
+
+
}
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 6462ac8..2db7010 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -7,7 +7,12 @@
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.IResponseCallBack;
import com.hdl.linkpm.sdk.core.exception.HDLException;
+import com.hdl.linkpm.sdk.core.response.HDLResponse;
+import com.hdl.linkpm.sdk.device.bean.FunctionInfoBean;
+import com.hdl.linkpm.sdk.utils.HDLExceptionSubmitUtils;
import com.hdl.photovoltaic.bean.HttpResponsePack;
import com.hdl.photovoltaic.bean.LocalResponse;
import com.hdl.photovoltaic.config.AppConfigManage;
@@ -21,6 +26,7 @@
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.DeviceRemoteInfo;
import com.hdl.photovoltaic.ui.bean.InverterDeviceBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
import com.hdl.photovoltaic.uni.HDLUniMP;
@@ -32,11 +38,15 @@
import com.hdl.sdk.link.core.bean.response.BaseLocalResponse;
import com.hdl.sdk.link.core.callback.GatewayCallBack;
import com.hdl.sdk.link.core.callback.HDLLinkCallBack;
+import com.hdl.sdk.link.core.config.HDLLinkConfig;
import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import io.reactivex.rxjava3.disposables.Disposable;
/**
@@ -59,8 +69,6 @@
}
if (gatewayBean.getMaster().equals("true")
&& gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
-// if ("0101050217BBC400".equals(gatewayBean.getOid()))//娴嬭瘯鏃惰繃婊ゆ帀鏃犳晥鐨勶紝杩欒鍚庨潰浠ｇ爜瑕佸垹闄�
-// continue;
newList.add(gatewayBean);
}
}
@@ -507,7 +515,7 @@
}
/**
- * 鑾峰彇鏈湴璁惧鍒楄〃
+ * 鑾峰彇鏈湴閫嗗彉鍣ㄥ垪琛�
* 娉ㄦ剰:鏈夊缃戜互浜戠璁惧涓哄噯,鏈湴瀛樺湪锛屼簯绔病鏈夊垯鍒犻櫎锛涘唴缃戜互鏈湴涓轰富,鎼滅储澶氬皯涓澶囧氨鏄剧ず澶氬皯涓紱
*
* @param cloudCallBeak -
@@ -527,33 +535,71 @@
}
return;
}
- //鏀堕泦鍒犻櫎閫嗗彉鍣╯id
- List<String> removeSidList = new ArrayList<>();
+ //璁板綍鏉℃暟
+ AtomicInteger atomicInteger = new AtomicInteger(0);
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());
+ 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++) {
+ //鍒犻櫎鏈湴鐨勯�嗗彉鍣�
+ removeInverter(removeSidList.get(i));
+ }
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(true);
+ }
+ }
}
- }
- }
- for (int i = 0; i < removeSidList.size(); i++) {
- //鍒犻櫎鏈湴鐨勯�嗗彉鍣�
- removeInverter(removeSidList.get(i));
+ @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++) {
+ //鍒犻櫎鏈湴鐨勯�嗗彉鍣�
+ removeInverter(removeSidList.get(i));
+ }
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(true);
+ }
+ }
+ HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触->msg->" + e.getMsg() + "(" + e.getCode() + ")");
+ }
+ });
}
- for (int i = 0; i < list.size(); i++) {
- CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
- GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(cloudInverterDeviceBean.getSid());
- objectAssignment(cloudInverterDeviceBean, gatewayBean);
- }
- if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(true);
- }
}
@Override
@@ -572,24 +618,42 @@
public void onSuccess(List<CloudInverterDeviceBean> list) {
//娓呮鏈湴缃戝叧鍒楄〃
HDLLinkLocalGateway.getInstance().getGatewayList().clear();
+
if (list == null || list.size() == 0) {
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(true);
}
return;
}
+ //璁板綍鏉℃暟
+ AtomicInteger atomicInteger = new AtomicInteger(0);
for (int i = 0; i < list.size(); i++) {
CloudInverterDeviceBean cloudInverterDeviceBean = list.get(i);
- //浜戠瀵硅薄鏁版嵁浜ゆ崲鍒版湰鍦板璞�
- GatewayBean gatewayBean = new GatewayBean();
- objectAssignment(cloudInverterDeviceBean, gatewayBean);
+ 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(true);
+ }
+ }
+ }
- //娣诲姞缃戝叧
- HDLLinkLocalGateway.getInstance().getGatewayList().add(gatewayBean);
+ @Override
+ public void onFailure(HDLException e) {
+ atomicInteger.set(atomicInteger.get() + 1);
+ if (atomicInteger.get() == list.size()) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(true);
+ }
+ }
+ HdlLogLogic.print("鑾峰彇璁惧杩滅▼閫氳淇℃伅澶辫触->msg->" + e.getMsg() + "(" + e.getCode() + ")");
+ }
+ });
}
- if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(true);
- }
+
}
@@ -600,6 +664,46 @@
}
}
});
+ }
+ });
+ }
+
+ /**
+ * 鑾峰彇璁惧杩滅▼閫氳淇℃伅
+ *
+ * @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;
+ JsonObject json = new JsonObject();
+ json.addProperty("homeId", homeId);
+ json.addProperty("spk", spk);
+ json.addProperty("mac", mac);
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String jsonStr) {
+ if (TextUtils.isEmpty(jsonStr)) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(null);
+ }
+ }
+ Type type = new TypeToken<DeviceRemoteInfo>() {
+ }.getType();
+ DeviceRemoteInfo deviceRemoteInfo = new Gson().fromJson(jsonStr, type);
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(deviceRemoteInfo);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
}
});
}
@@ -627,26 +731,47 @@
HDLLinkLocalGateway.getInstance().refreshGatewayByHomeIdAndSpk(UserConfigManage.getInstance().getHomeId(), spks, true, gatewayCallBack);
}
-
- private void objectAssignment(CloudInverterDeviceBean cloudInverterDeviceBean, GatewayBean gatewayBean) {
- if (cloudInverterDeviceBean == null || gatewayBean == null) {
- return;
+ /**
+ * 鍒锋柊閫嗗彉鍣ㄧ紦瀛樹俊鎭�(鍖呮嫭璁剧疆mqtt绉橀挜锛�
+ * 娉�:
+ * 1:鏈湴瀛樺湪鏇存柊淇℃伅鍗冲彲;
+ * 2:浜戠鏈夋湰鍦颁笉瀛樺湪,鍒欒櫄鎷熶竴涓�嗗彉鍣ㄥ璞℃坊鍔犲湪鏈湴;
+ *
+ * @param deviceRemoteInfo 璁惧杩滅▼閫氳淇℃伅
+ * @param cloudInverterDeviceBean 閫嗗彉鍣�
+ */
+ private static void refreshGatewayCacheData(boolean isLocal, CloudInverterDeviceBean cloudInverterDeviceBean, DeviceRemoteInfo deviceRemoteInfo) {
+ //鏈湴鏌ユ壘閫嗗彉鍣�
+ GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(cloudInverterDeviceBean.getOsn());
+ if (gatewayBean == null) {
+ //涓嶅瓨鍦紝铏氭嫙涓�涓�嗗彉鍣ㄥ璞�;
+ gatewayBean = new GatewayBean();
+ HDLLinkLocalGateway.getInstance().getGatewayList().add(gatewayBean);//娣诲姞閫嗗彉鍣ㄨ澶�
}
- gatewayBean.setOid(cloudInverterDeviceBean.getOid());
- gatewayBean.setSid(cloudInverterDeviceBean.getSid());
- gatewayBean.setGatewayId(cloudInverterDeviceBean.getGatewayId());
- gatewayBean.setOnline(cloudInverterDeviceBean.isOnline());
- gatewayBean.setDevice_mac(cloudInverterDeviceBean.getOsn());//璁惧mac
- gatewayBean.setDevice_name(cloudInverterDeviceBean.getGatewayName());
- gatewayBean.setHomeId(UserConfigManage.getInstance().getHomeId());
+ //鏇存柊灞炴��
+ if (deviceRemoteInfo != null) {
+ gatewayBean.setAesKey(deviceRemoteInfo.getSecret());//璁剧疆mqtt閫氳绉橀挜
+ gatewayBean.setGatewayId(deviceRemoteInfo.getGatewayId());//璁剧疆gatewayId
+ }
+ gatewayBean.setHomeId(UserConfigManage.getInstance().getHomeId());//浣忓畢id
+ gatewayBean.setDeviceStatus(cloudInverterDeviceBean.getDeviceStatus());//璁剧疆缃戝叧鐘舵��
+ gatewayBean.setDeviceId(cloudInverterDeviceBean.getDeviceId());//璁剧疆link璁惧id
+ gatewayBean.setDevice_mac(cloudInverterDeviceBean.getOsn());//璁剧疆mac
+ gatewayBean.setOid(cloudInverterDeviceBean.getOid());//璁惧oid
+ gatewayBean.setSid(cloudInverterDeviceBean.getSid());//璁惧sid
+ gatewayBean.setDevice_name(cloudInverterDeviceBean.getName());//璁惧鍚嶇О
+ gatewayBean.setGatewayType(cloudInverterDeviceBean.getSpk());//璁剧疆spk
gatewayBean.setLocalEncrypt(true);
gatewayBean.setMaster("true");
- gatewayBean.setSystemStatusDesc(cloudInverterDeviceBean.getSystemStatusDesc());
- gatewayBean.setHwVersion(cloudInverterDeviceBean.getHwVersion());
- gatewayBean.setCategorySecondName(cloudInverterDeviceBean.getCategorySecondName());
- gatewayBean.setDeviceId(cloudInverterDeviceBean.getDeviceId());
+ gatewayBean.setSystemStatusDesc(cloudInverterDeviceBean.getSystemStatusDesc());//璁惧鐘舵��
+ gatewayBean.setHwVersion(cloudInverterDeviceBean.getHwVersion());//杞欢鐗堟湰鍙�
+ gatewayBean.setCategorySecondName(cloudInverterDeviceBean.getCategorySecondName());//璁惧绫诲瀷(浜у搧浜岀骇鍒嗙被鍚嶇О
+ gatewayBean.setAddresses(cloudInverterDeviceBean.getAddresses());//瀛愮綉鍙�/璁惧鍙�
+ gatewayBean.setPowerPvNow(cloudInverterDeviceBean.getPowerPvNow());//鍙戠數鍔熺巼
+ gatewayBean.setTotalElectricityPvToday(cloudInverterDeviceBean.getTotalElectricityPvToday());//浠婃棩鍙戠數閲�
}
+
/**
* 鑾峰彇缃戝叧spk鍒楄〃
@@ -655,7 +780,9 @@
*/
private List<String> getGatewaySpk() {
List<String> spks = new ArrayList<>();
- spks.add("energy.hdl_inverter");
+ spks.add(DEVICE_SPK);
return spks;
}
+
+ public final String DEVICE_SPK = "energy.hdl_inverter";
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
index cacc88b..8a02ce0 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -57,7 +57,7 @@
return sHdlUniLogic;
}
- //region ******銆愬師鐢熴�戝拰銆愬皬绋嬪簭銆戦�氳鐨勬柟娉� onOtherUniMPEventReceive();openUniMP();sendUni();******
+ //region ******銆愬師鐢熴�戝拰銆愬皬绋嬪簭銆戦�氳鐨�3涓柟娉曞悕 onOtherUniMPEventReceive();openUniMP();sendUni();******
/**
* 鍘熺敓鎺ユ敹鍒皍ni鍙戞潵鐨勬暟鎹�
@@ -77,8 +77,9 @@
if (HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL.equals(event)) {
//浣忓畢妯″潡
switch (type) {
+ //鍒涘缓鐢电珯
case HDLUniMP.UNI_EVENT_REPLY_HOME_CREATION: {
- //鍒涘缓
+
//EventBus浜嬩欢鍒嗗彂
BaseEventBus baseEventBus = new BaseEventBus();
baseEventBus.setType(ConstantManage.EVENTBUS_POST_HOME_CREATED);
@@ -88,6 +89,10 @@
break;
case HDLUniMP.UNI_EVENT_REPLY_HOME_DETAILS: {
//璇︽儏
+ }
+ break;
+ case HDLUniMP.UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE: {
+ //鍏抽棴璇︽儏椤�
}
break;
@@ -162,8 +167,9 @@
});
}
break;
+ //鑾峰彇閫嗗彉鍣ㄥ垪琛�
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST: {
- //鑾峰彇缃戝叧璁惧鍒楄〃
+
HdlDeviceLogic.getInstance().getLocalGatewayList(new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
@@ -186,10 +192,10 @@
}
break;
+ //鑾峰彇oid鍒楄〃
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_OID: {
- //娣诲姞璁惧鍒颁簯绔�
+
String mac = getKeyValue("mac", getKeyValue("data", data));
- //鑾峰彇oid鍒楄〃
HdlDeviceLogic.getInstance().getGatewayOidList(mac, new LinkCallBack<List<OidBean>>() {
@Override
public void onSuccess(List<OidBean> list) {
@@ -222,12 +228,10 @@
}
});
}
- //璁惧鏃堕棿缂栬緫
break;
+ //璁惧鏃堕棿缂栬緫
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_TIME_EDIT: {
- //娣诲姞璁惧鍒颁簯绔�
String mac = getKeyValue("mac", getKeyValue("data", data));
- //鑾峰彇oid鍒楄〃
HdlDeviceLogic.getInstance().getGatewayOidList(mac, new LinkCallBack<List<OidBean>>() {
@Override
public void onSuccess(List<OidBean> obj) {
@@ -248,22 +252,23 @@
WifiUtils wifiUtils = new WifiUtils(HDLApp.getInstance());
//wifi妯″潡
switch (type) {
+ //鑾峰彇wifi鍒楄〃
case HDLUniMP.UNI_EVENT_REPLY_WIFI_LIST: {
- //鑾峰彇wifi鍒楄〃
if (callback != null) {
uniCallbackData(wifiUtils.getScanResult(), callback);
}
}
break;
+ //褰撳墠wifi璇︽儏
case HDLUniMP.UNI_EVENT_REPLY_WIFI_INFO: {
- //褰撳墠wifi璇︽儏
if (callback != null) {
uniCallbackData(wifiUtils.getCurrentConnectWifiInfo(), callback);
}
}
break;
+ //wifi杩炴帴
case HDLUniMP.UNI_EVENT_REPLY_WIFI_CONNECT: {
- //wifi杩炴帴
+
}
break;
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java
index f60369f..1203f6a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java
@@ -15,7 +15,6 @@
*/
private boolean online;
private String gatewayId;//缃戝叧Id
- private String gatewayName;//缃戝叧鍚嶇О
private String deviceId;//璁惧id
private String name;//璁惧鍚嶇О
private String spk;
@@ -35,6 +34,8 @@
private String hwVersion;//杞欢鐗堟湰鍙�
private String categorySecondName;//璁惧绫诲瀷(浜у搧浜岀骇鍒嗙被鍚嶇О)
+
+
public String getSystemStatusDesc() {
return systemStatusDesc == null ? "" : systemStatusDesc;
@@ -69,13 +70,6 @@
this.gatewayId = gatewayId;
}
- public String getGatewayName() {
- return gatewayName == null ? "" : gatewayName;
- }
-
- public void setGatewayName(String gatewayName) {
- this.gatewayName = gatewayName;
- }
public String getDeviceId() {
return deviceId == null ? "" : deviceId;
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/DeviceRemoteInfo.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/DeviceRemoteInfo.java
new file mode 100644
index 0000000..da43e69
--- /dev/null
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/DeviceRemoteInfo.java
@@ -0,0 +1,63 @@
+package com.hdl.photovoltaic.ui.bean;
+
+import java.io.Serializable;
+
+/**
+ * 璁惧杩滅▼閫氳淇℃伅瀵硅薄
+ */
+public class DeviceRemoteInfo implements Serializable {
+ public String getGatewayId() {
+ return gatewayId;
+ }
+
+ public void setGatewayId(String gatewayId) {
+ this.gatewayId = gatewayId;
+ }
+
+ public boolean isEncrypt() {
+ return encrypt;
+ }
+
+ public void setEncrypt(boolean encrypt) {
+ this.encrypt = encrypt;
+ }
+
+ public int getAlgorithmType() {
+ return algorithmType;
+ }
+
+ public void setAlgorithmType(int algorithmType) {
+ this.algorithmType = algorithmType;
+ }
+
+ public String getSpk() {
+ return spk;
+ }
+
+ public void setSpk(String spk) {
+ this.spk = spk;
+ }
+
+ public String getMac() {
+ return mac;
+ }
+
+ public void setMac(String mac) {
+ this.mac = mac;
+ }
+
+ public String getSecret() {
+ return secret == null ? "" : secret;
+ }
+
+ public void setSecret(String secret) {
+ this.secret = secret;
+ }
+
+ private String gatewayId;
+ private boolean encrypt;//鏄惁鍔犲瘑
+ private int algorithmType;//0.SM4 1.AES 2.涓嶅姞瀵�
+ private String spk;
+ private String mac;//璁惧mac
+ private String secret;//绉侀挜
+}
diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
index 2d70800..e23d31f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
@@ -25,7 +25,9 @@
public final static String UNI_EVENT_REPLY_HOME_CREATION = "creation";//浣忓畢銆愮數绔欍�戝垱寤�
public final static String UNI_EVENT_REPLY_HOME_EDIT = "edit";//浣忓畢銆愮數绔欍�戠紪杈�
public final static String UNI_EVENT_REPLY_HOME_DETAILS = "details";//浣忓畢銆愮數绔欍�戣鎯�
- public final static String UNI_EVENT_REPLY_Home_DEl = "del";//浣忓畢銆愮數绔欍�戝垹闄�
+ public final static String UNI_EVENT_REPLY_HOME_DEl = "del";//浣忓畢銆愮數绔欍�戝垹闄�
+
+ public final static String UNI_EVENT_REPLY_HOME_CLOSE_HOME_DETAILS_PAGE= "close_home_details_page";//鍏抽棴璇︽儏椤�
/*********璁惧妯″潡*********/
public final static String UNI_EVENT_REPLY_DEVICE_MODEL = "uni_device_model";//璁惧妯″潡(澶х被)
public final static String UNI_EVENT_REPLY_DEVICE_LIST = "list";//鏈湴閫嗗彉鍣ㄨ澶囧垪琛�
--
Gitblit v1.8.0