From 31de722a45e886eae89cfea2f1740c1f4d3b0216 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 05 六月 2024 15:22:34 +0800
Subject: [PATCH] Merge branch 'dev' into feature/v1.4.1
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 367 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 255 insertions(+), 112 deletions(-)
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 1975031..174df66 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -34,6 +34,7 @@
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
import com.hdl.photovoltaic.internet.TcpClient;
+import com.hdl.photovoltaic.internet.api.HttpApi;
import com.hdl.photovoltaic.internet.api.TopicApi;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.listener.LinkCallBack;
@@ -43,8 +44,9 @@
import com.hdl.photovoltaic.ui.bean.Geolocation;
import com.hdl.photovoltaic.ui.bean.LinkBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
+import com.hdl.photovoltaic.ui.bean.UnCountBean;
import com.hdl.photovoltaic.ui.me.AsRegardsActivity;
-import com.hdl.photovoltaic.ui.me.PersonalDataActivity;
+import com.hdl.photovoltaic.ui.me.CPersonalDataActivity;
import com.hdl.photovoltaic.ui.me.SetActivity;
import com.hdl.photovoltaic.ui.newC.MessageCenterList;
import com.hdl.photovoltaic.ui.newC.PowerStationsListEdit;
@@ -63,6 +65,7 @@
import com.hdl.sdk.link.core.connect.HDLModBusConnect;
import com.hdl.sdk.link.core.connect.HDLUdpConnect;
import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
+import com.huawei.hms.api.Api;
import org.greenrobot.eventbus.EventBus;
import org.json.JSONObject;
@@ -89,6 +92,8 @@
*/
public class HdlUniLogic implements HDLUniMPSDKManager.IOnOtherUniMPEventCallBack {
private static volatile HdlUniLogic sHdlUniLogic;
+
+ public final static String separator = "---";
/**
* 鑾峰彇褰撳墠瀵硅薄
@@ -126,8 +131,8 @@
}
String type = getKeyValue("type", data);//灏忕被
String logTag = getKeyValue("logTag", data);//鏍囪uni鎸囦护
- String mode_type = "澶х被->" + topic + "--->" + "灏忕被->" + type;//鐢ㄦ潵鎵撳嵃鐨�
- HdlLogLogic.print(logTag + ":" + "uni--->鍙戦��--->" + mode_type + "\r\n" + data, true);
+ String mode_type = "澶х被-" + topic + "---" + "灏忕被-" + type;//鐢ㄦ潵鎵撳嵃鐨�
+ HdlLogLogic.print(logTag + ":" + "uni---鍙戦��---" + mode_type + "\r\n" + data, true);
if (HDLUniMP.UNI_EVENT_REPLY_USER_MODEL.equals(topic)) {
//鐢ㄦ埛妯″潡
switch (type) {
@@ -197,6 +202,11 @@
} else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODEL.equals(topic)) {
//璁惧妯″潡
switch (type) {
+ //modBus鍗忚涓撶敤
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND: {
+ sendModBus(mode_type, data, callback);
+ }
+ break;
//娣诲姞閫嗗彉鍣ㄥ埌浜戠
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ADD: {
this.uniAddInverterDeviceToCloud(mode_type, data, callback);
@@ -222,11 +232,6 @@
this.uniGetCurrentHomeLocalAndCloudGatewayList(mode_type, data, callback);
}
break;
- //modBus鍗忚涓撶敤
- case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND: {
- sendModBus(mode_type, data, callback);
- }
- break;
//鑾峰彇oid鍒楄〃
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_OID: {
this.uniGetInverterOidList(mode_type, data, callback);
@@ -236,7 +241,6 @@
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_TIME: {
this.uniGetInverterTime(mode_type, data, callback);
}
-
break;
//閫嗗彉鍣ㄦ椂闂寸紪杈�
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_TIME_EDIT: {
@@ -268,6 +272,16 @@
this.uniGetMessageNumber(mode_type, data, callback);
}
break;
+ //鍒濆鍖栭�嗗彉鍣�
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_INITIALIZEINVERTER: {
+ this.setInitializeGateway(mode_type, data, callback);
+ }
+ break;
+ //璇诲彇璁惧杩滅▼淇℃伅
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_REMOTEINFO: {
+ this.setInverterDeviceRemoteInfo(mode_type, data, callback);
+ }
+ break;
}
@@ -275,36 +289,57 @@
WifiUtils wifiUtils = WifiUtils.getInstance();
//wifi妯″潡
switch (type) {
- //鑾峰彇wifi鍒楄〃
- case HDLUniMP.UNI_EVENT_REPLY_WIFI_LIST: {
+ //鑾峰彇鎵嬫満wifi鍒楄〃
+ case HDLUniMP.UNI_EVENT_REPLY_PHONE_WIFI_LIST: {
if (callback != null) {
uniCallbackData(mode_type, wifiUtils.getScanResult(), callback);
}
}
break;
- //褰撳墠wifi璇︽儏
- case HDLUniMP.UNI_EVENT_REPLY_WIFI_PHONE_INFO: {
+ //鑾峰彇鎵嬫満褰撳墠wifi璇︽儏
+ case HDLUniMP.UNI_EVENT_REPLY_PHONE_WIFI_INFO: {
if (callback != null) {
uniCallbackData(mode_type, wifiUtils.getCurrentConnectWifiInfo(), callback);
}
}
break;
- //閰嶇疆WiFi淇℃伅缁欓�嗗彉鍣�
- case HDLUniMP.UNI_EVENT_REPLY_WIFI_SET_DEVICE: {
- String mac = getKeyValue("mac", getKeyValue("data", data));//
- String wif_type = getKeyValue("wif_type", getKeyValue("data", data));//1锛氱儹鐐�,2锛氭棤绾縲ifi,3锛氫互澶綉
- String ssid = getKeyValue("ssid", getKeyValue("data", data));//
- String password = getKeyValue("password", getKeyValue("data", data));//
- startTcpThreadSendAccountAndPassword(mode_type, ssid, password, callback);
-
- }
- break;
//鎵撳紑鎵嬫満Wifi璁剧疆鐣岄潰
- case HDLUniMP.UNI_EVENT_REPLY_OPEN_WIFI_SETTINGS: {
+ case HDLUniMP.UNI_EVENT_REPLY_PHONE_OPEN_WIFI_SETTINGS: {
Intent intent = new Intent(Settings.ACTION_WIFI_SETTINGS);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
HDLApp.getInstance().startActivity(intent);
}
+ //閫嗗彉鍣╓iFi淇℃伅閰嶇疆
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_WIFI_SET: {
+ uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_WIFI_EDIT, callback);
+ }
break;
+ //閫嗗彉鍣╓iFi淇℃伅鑾峰彇
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_WIFI_GET: {
+ uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_WIFI_GET, callback);
+ }
+ break;
+ //閫嗗彉鍣ㄧ儹鐐归厤缃�
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_HOTSPOT_SET: {
+ uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_HOTSPOT_EDIT, callback);
+ }
+ break;
+ //閫嗗彉鍣ㄧ儹鐐硅幏鍙�
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_HOTSPOT_GET: {
+ uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_HOTSPOT_GET, callback);
+ }
+ break;
+ //閫嗗彉鍣ㄤ互澶綉閰嶇疆
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ETHERNET_SET: {
+ uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_ETHERNET_EDIT, callback);
+ }
+ break;
+ //閫嗗彉鍣ㄤ互澶綉鑾峰彇
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ETHERNET_GET: {
+ uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_ETHERNET_GET, callback);
+ }
+ break;
+
}
} else if (HDLUniMP.UNI_EVENT_REPLY_OTA_MODEL.equals(topic)) {
//OTA鍗囩骇妯″潡
@@ -393,7 +428,7 @@
case HDLUniMP.UNI_EVENT_REPLY_MINE_EDIT_USER_INFO: {
Intent intent = new Intent();
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- intent.setClass(HDLApp.getInstance(), PersonalDataActivity.class);
+ intent.setClass(HDLApp.getInstance(), CPersonalDataActivity.class);
HDLApp.getInstance().startActivity(intent);
}
break;
@@ -427,6 +462,7 @@
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.setClass(HDLApp.getInstance(), SetActivity.class);
HDLApp.getInstance().startActivity(intent);
+
}
break;
@@ -460,17 +496,14 @@
//涓撻棬鏀堕泦uni鏃ュ織
case HDLUniMP.UNI_EVENT_REPLY_OTHER_UNI_LOG: {
String customizeContentFormat = getKeyValue("customizeContentFormat", getKeyValue("data", data));
- HdlLogLogic.print("uni--->log--->" + customizeContentFormat, true);
+ HdlLogLogic.print("uni---log---" + customizeContentFormat, true);
}
break;
//uni涓婚〉鐐瑰嚮杩斿洖閫氱煡
case HDLUniMP.UNI_EVENT_REPLY_OTHER_BACK: {
//EventBus浜嬩欢鍒嗗彂
- BaseEventBus baseEventBus = new BaseEventBus();
- baseEventBus.setTopic(HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL);
- baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_OTHER_BACK);
- EventBus.getDefault().post(baseEventBus);
+ HdlCommonLogic.getInstance().postEventBus(HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL, HDLUniMP.UNI_EVENT_REPLY_OTHER_BACK);
}
break;
@@ -483,7 +516,7 @@
}
} catch (Exception e) {
- HdlLogLogic.print("uni--->鍙戦��--->" + e.getMessage(), true);
+ HdlLogLogic.print("uni---鍙戦��---" + e.getMessage(), true);
}
}
@@ -498,7 +531,13 @@
public void openUniMP(String path, JSONObject jsonObject) {
JSONObject json = this.createdJSONObject(jsonObject, true);
HDLUniMPSDKManager.getInstance().openUniMP(HDLUniMP.UNI_APP_ID, path, json, HdlUniLogic.this);
- HdlLogLogic.print("uni--->缁勮uni鍙戦�佹暟鎹牸寮�--->" + json, false);
+ HdlLogLogic.print("uni---缁勮uni鍙戦�佹暟鎹牸寮�---" + json, false);
+ }
+
+ public void openUniMPDelay(String path, JSONObject jsonObject) {
+ JSONObject json = this.createdJSONObject(jsonObject, true);
+ HDLUniMPSDKManager.getInstance().openUniMPDelay(HDLUniMP.UNI_APP_ID, path, json, HdlUniLogic.this);
+ HdlLogLogic.print("uni---缁勮uni鍙戦�佹暟鎹牸寮�---" + json, false);
}
/**
@@ -512,7 +551,7 @@
try {
HDLUniMPSDKManager.getInstance().sendUniMPEvent(HDLUniMP.UNI_APP_ID, topic, getJSONObject(callBackBaseBean));
} catch (Exception e) {
- HdlLogLogic.print("uni--->鍘熺敓涓诲姩鍚戝皬绋嬪簭鍙戦�侀�氱煡浜嬩欢--->" + e.getMessage(), false);
+ HdlLogLogic.print("uni---鍘熺敓涓诲姩鍚戝皬绋嬪簭鍙戦�侀�氱煡浜嬩欢---" + e.getMessage(), false);
}
}
@@ -525,6 +564,43 @@
//endregion
//region ******uni鎺ュ彛鏂规硶******
+
+
+ /**
+ * 鑾峰彇鎴栬�呴厤缃�嗗彉鍣ㄧ綉缁滐紙鍖呮嫭閫嗗彉鍣ㄧ儹鐐癸紝wifi锛屼互澶綉锛変俊鎭�
+ */
+ private void uniGetAndSetNetwork(String type, Object data, String TopicApi, DCUniMPJSCallback callback) {
+ String mac = getKeyValue("mac", getKeyValue("data", data));
+ JsonArray jsonArray = new JsonArray();
+ JsonObject jObject = null;
+ String attribute_data = getKeyValue("attribute_data", getKeyValue("data", data));
+ if (!TextUtils.isEmpty(attribute_data)) {
+ try {
+ jObject = new Gson().fromJson(attribute_data, JsonObject.class);
+ } catch (Exception ignored) {
+ jObject = new JsonObject();
+ }
+ }
+ jsonArray.add(jObject);
+ //瑙ｅ瘑璐熻浇鏁版嵁(鍐欏瘑閽ョ粰缃戝叧涓�瀹氭槸鏄庢枃锛屽洜涓洪偅鏃剁綉鍏宠繕娌℃湁瀵嗛挜)
+ TcpClient.getInstance().sendDataToLinkGateway(mac, false, TopicApi, jsonArray, "", new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String msg) {
+ if (callback != null) {
+ uniCallbackData(type, msg, callback);
+ }
+
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ if (callback != null) {
+ uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+ }
+ }
+ });
+ }
+
/**
* 鑾峰彇浣嶇疆淇℃伅,鍖呮嫭缁忕含搴�
@@ -726,11 +802,11 @@
String module = "FW#" + imageId;//妯″潡淇℃伅(HW锛氱‖浠�)
//鍗囩骇鏈湴浼樺厛->浜戠鍗囩骇
- HdlDeviceLogic.getInstance().isLocalConnect(deviceMac, new CloudCallBeak<Boolean>() {
+ HdlDeviceLogic.getInstance().isLocalConnect(homeId,deviceMac, new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean b) {
if (b) {
- HdlLogLogic.print("鏈湴鍗囩骇--->", true);
+ HdlLogLogic.print("鏈湴鍗囩骇---", true);
//鏈湴
//1,寤虹珛鏈湴鏈嶅姟锛�
//2,鍛婅瘔缃戝叧鎵嬫満ip鍜岀鍙ｏ紱
@@ -768,7 +844,7 @@
}
});
} else {
- HdlLogLogic.print("鍦ㄧ嚎鍗囩骇--->", true);
+ HdlLogLogic.print("鍦ㄧ嚎鍗囩骇---", true);
//杩滅▼鍗囩骇闇�瑕佹娴嬪湪閫嗗彉鍣ㄦ湁娌℃湁杩炴帴涓婁簯
HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
@Override
@@ -807,7 +883,7 @@
@Override
public void onFailure(HDLException e) {
- HdlLogLogic.print("鍦ㄧ嚎鍗囩骇--->", true);
+ HdlLogLogic.print("鍦ㄧ嚎鍗囩骇---", true);
//杩滅▼鍗囩骇闇�瑕佹娴嬪湪閫嗗彉鍣ㄦ湁娌℃湁杩炴帴涓婁簯
HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
@Override
@@ -978,11 +1054,11 @@
String imageId = getKeyValue("imageId", getKeyValue("data", data));//鍥轰欢闀滃儚id
String module = driverCode + "#" + imageId;
//鍗囩骇鏈湴浼樺厛->浜戠鍗囩骇
- HdlDeviceLogic.getInstance().isLocalConnect(deviceMac, new CloudCallBeak<Boolean>() {
+ HdlDeviceLogic.getInstance().isLocalConnect(homeId,deviceMac, new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean b) {
if (b) {
- HdlLogLogic.print("鏈湴鍗囩骇--->", true);
+ HdlLogLogic.print("鏈湴鍗囩骇---", true);
//鏈湴
//1,寤虹珛鏈湴鏈嶅姟锛�
// 2锛屽憡璇夌綉鍏虫墜鏈篿p鍜岀鍙ｏ紱
@@ -1020,7 +1096,7 @@
}
});
} else {
- HdlLogLogic.print("鍦ㄧ嚎鍗囩骇--->", true);
+ HdlLogLogic.print("鍦ㄧ嚎鍗囩骇---", true);
//杩滅▼鍗囩骇闇�瑕併�愭娴嬨�戝湪閫嗗彉鍣ㄦ湁娌℃湁杩炴帴涓婁簯
HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
@Override
@@ -1059,7 +1135,7 @@
@Override
public void onFailure(HDLException e) {
- HdlLogLogic.print("鍦ㄧ嚎鍗囩骇--->", true);
+ HdlLogLogic.print("鍦ㄧ嚎鍗囩骇---", true);
//杩滅▼鍗囩骇闇�瑕併�愭娴嬨�戝湪閫嗗彉鍣ㄦ湁娌℃湁杩炴帴涓婁簯
HdlDeviceLogic.getInstance().checkInverterConnectedCloud(homeId, deviceMac, new CloudCallBeak<CloudInverterDeviceBean>() {
@Override
@@ -1265,9 +1341,9 @@
*/
private void uniGetMessageNumber(String type, Object data, DCUniMPJSCallback callback) {
String homeId = getKeyValue("homeId", getKeyValue("data", data));
- HdlMessageLogic.getInstance().getMessageUntreatedCount(homeId, new CloudCallBeak<String>() {
+ HdlMessageLogic.getInstance().getMessageUntreatedCount(homeId, new CloudCallBeak<UnCountBean>() {
@Override
- public void onSuccess(String data) {
+ public void onSuccess(UnCountBean data) {
uniCallbackData(type, data, callback);
}
@@ -1423,7 +1499,7 @@
// com.alibaba.fastjson.JSONArray jsonArray = JSON.parseArray(data);
try {
String devices = getKeyValue("devices", getKeyValue("data", data));
- String homeId = UserConfigManage.getInstance().getHomeId(); //缁戝畾鎴愬姛涔嬪悗閫氱煡
+ String homeId = getKeyValue("homeId", getKeyValue("data", data));
Gson gson = new Gson();
Type typeOfT = new TypeToken<List<GatewayBean>>() {
}.getType();
@@ -1651,73 +1727,140 @@
* @param callback uni鍥炶皟
*/
public void startTcpThreadSendAccountAndPassword(String type, String ssid, String password, DCUniMPJSCallback callback) {
- new Thread(
- () -> {
- Socket socket = null;
- OutputStream outputStreamTcp = null;
- InputStream inputStreamTcp = null;
- try {
- socket = new Socket();
- socket.setTcpNoDelay(true);
- socket.setSoTimeout(10 * 1000);//10绉掕秴鏃�
- socket.connect(new InetSocketAddress("192.168.8.1", 8586));
- socket.setKeepAlive(true);
+ new Thread(() -> {
+ Socket socket = null;
+ OutputStream outputStreamTcp = null;
+ InputStream inputStreamTcp = null;
+ try {
+ socket = new Socket();
+ socket.setTcpNoDelay(true);
+ socket.setSoTimeout(10 * 1000);//10绉掕秴鏃�
+ socket.connect(new InetSocketAddress("192.168.8.1", 8586));
+ socket.setKeepAlive(true);
// logMessage("tcp杩炴帴鐘舵�佹垚鍔�", 0, "");
- outputStreamTcp = socket.getOutputStream();
- JsonObject jsonObject = new JsonObject();
- jsonObject.addProperty("id", "102030");
- jsonObject.addProperty("ssid", ssid);
- jsonObject.addProperty("password", password);
- jsonObject.addProperty("server_addr", HDLLinkPMUser.getInstance().getHomeRegionUrl());
- jsonObject.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
- String sendData = "Topic:/user/id/custom/wifi/set\r\n";
- sendData += "Length:" + jsonObject.toString().getBytes().length + "\r\n\r\n";
- sendData += jsonObject.toString();
- outputStreamTcp.write(sendData.getBytes());
- outputStreamTcp.flush();
- Thread.sleep(200);
- inputStreamTcp = socket.getInputStream();
- byte[] bytes = new byte[1204 * 2];
- int len = inputStreamTcp.read(bytes);
- if (len != -1) {
- String str = new String(bytes, 0, bytes.length);
- String[] strings = str.split("\r\n\r\n");
- String[] topicAndLength = strings[0].split("\r\n");
- String topic = topicAndLength[0];
- JSONObject json = new JSONObject(strings[1]);
+ outputStreamTcp = socket.getOutputStream();
+ JsonObject jsonObject = new JsonObject();
+ jsonObject.addProperty("id", "102030");
+ jsonObject.addProperty("ssid", ssid);
+ jsonObject.addProperty("password", password);
+ jsonObject.addProperty("server_addr", HDLLinkPMUser.getInstance().getHomeRegionUrl());
+ jsonObject.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
+ String sendData = "Topic:/user/id/custom/wifi/set\r\n";
+ sendData += "Length:" + jsonObject.toString().getBytes().length + "\r\n\r\n";
+ sendData += jsonObject.toString();
+ outputStreamTcp.write(sendData.getBytes());
+ outputStreamTcp.flush();
+ Thread.sleep(200);
+ inputStreamTcp = socket.getInputStream();
+ byte[] bytes = new byte[1204 * 2];
+ int len = inputStreamTcp.read(bytes);
+ if (len != -1) {
+ String str = new String(bytes, 0, bytes.length);
+ String[] strings = str.split("\r\n\r\n");
+ String[] topicAndLength = strings[0].split("\r\n");
+ String topic = topicAndLength[0];
+ JSONObject json = new JSONObject(strings[1]);
// logMessage("tcp鍥炲鏁版嵁", 0, strings[0] + "\r\n" + json.toString());
- if (topic.endsWith("wifi/set_reply") || topic.endsWith("wifi/result/notify")) {
- if (callback != null) {
- uniCallbackData(type, json, callback);
- }
- if (json.has("mac")) { //鍥炲鎴愬姛鍐嶆嬁璁惧mac
+ if (topic.endsWith("wifi/set_reply") || topic.endsWith("wifi/result/notify")) {
+ if (callback != null) {
+ uniCallbackData(type, json, callback);
+ }
+ if (json.has("mac")) { //鍥炲鎴愬姛鍐嶆嬁璁惧mac
// this.device_mac = json.getString("mac");
// this.isSucceedTcp = true;//琛ㄧず鎴愬姛
- }
- }
- }
-
- } catch (Exception ignored) {
- } finally {
- try {
- if (outputStreamTcp != null) {
- outputStreamTcp.close();
- outputStreamTcp = null;
- }
- if (inputStreamTcp != null) {
- inputStreamTcp.close();
- inputStreamTcp = null;
- }
- if (socket != null) {
- socket.close();
- socket = null;
- }
-
- } catch (Exception ignored) {
}
}
}
- ).start();
+
+ } catch (Exception ignored) {
+ } finally {
+ try {
+ if (outputStreamTcp != null) {
+ outputStreamTcp.close();
+ outputStreamTcp = null;
+ }
+ if (inputStreamTcp != null) {
+ inputStreamTcp.close();
+ inputStreamTcp = null;
+ }
+ if (socket != null) {
+ socket.close();
+ socket = null;
+ }
+
+ } catch (Exception ignored) {
+ }
+ }
+ }).start();
+ }
+
+ /**
+ * 鍒濆鍖栭�嗗彉鍣�
+ *
+ * @param type 璐﹀彿
+ * @param data uni璇锋眰鏁版嵁
+ * @param callback uni鍥炶皟
+ */
+ public void setInitializeGateway(String type, Object data, DCUniMPJSCallback callback) {
+ String mac = getKeyValue("mac", getKeyValue("data", data));
+ HdlDeviceLogic.getInstance().initializeInverter(mac, new LinkCallBack<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ uniCallbackData(type, obj, callback);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+ }
+ });
+ }
+
+ /**
+ * 鍒濆鍖栭�嗗彉鍣�
+ *
+ * @param type 璐﹀彿
+ * @param data uni璇锋眰鏁版嵁
+ * @param callback uni鍥炶皟
+ */
+ public void setInverterDeviceRemoteInfo(String type, Object data, DCUniMPJSCallback callback) {
+ String homeId = getKeyValue("homeId", getKeyValue("data", data));
+ String json = getKeyValue("list", getKeyValue("data", data));
+ List<CloudInverterDeviceBean> newList = new ArrayList<>();
+ try {
+ List<GatewayBean> list = new Gson().fromJson(json, new TypeToken<List<GatewayBean>>() {
+ }.getType());
+ if (list != null && list.size() > 0) {
+ for (int i = 0; i < list.size(); i++) {
+ GatewayBean gatewayBean = list.get(i);
+ CloudInverterDeviceBean inverterDeviceBean = new CloudInverterDeviceBean();
+ inverterDeviceBean.setCategorySecondName(gatewayBean.getCategorySecondName());
+ inverterDeviceBean.setOsn(gatewayBean.getDevice_mac());
+ inverterDeviceBean.setOmodel(gatewayBean.getDevice_model());
+ inverterDeviceBean.setOid(gatewayBean.getOid());
+ inverterDeviceBean.setAddresses(gatewayBean.getAddresses());
+ inverterDeviceBean.setSid(gatewayBean.getSid());
+ inverterDeviceBean.setDeviceId(gatewayBean.getDeviceId());
+ inverterDeviceBean.setName(gatewayBean.getDevice_name());
+ inverterDeviceBean.setDeviceStatus(gatewayBean.getDeviceStatus());
+ inverterDeviceBean.setSpk(gatewayBean.getSpk());
+ inverterDeviceBean.setDeviceType(gatewayBean.getDeviceType());
+ newList.add(inverterDeviceBean);
+ }
+ }
+ } catch (Exception ignored) {
+ }
+ HdlDeviceLogic.getInstance().setDeviceRemoteInfo(newList, homeId, new CloudCallBeak<List<GatewayBean>>() {
+ @Override
+ public void onSuccess(List<GatewayBean> obj) {
+ uniCallbackData(type, obj, callback);
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+ }
+ });
}
@@ -1739,7 +1882,7 @@
String tempData = getKeyValue("data", data);
if (TextUtils.isEmpty(tempData)) {
uniCallbackData(type, null, -2, "data鍐呭涓虹┖", callback);
- //HdlLogLogic.print("data鍐呭涓虹┖--->", false);
+ //HdlLogLogic.print("data鍐呭涓虹┖---", false);
return;
}
ModBusBean modBusBean = new Gson().fromJson(tempData, ModBusBean.class);
@@ -1751,24 +1894,24 @@
// }
if (modBusBean.getMac() == null || modBusBean.getData() == null) {
uniCallbackData(type, null, -2, "鍙戦�佸け璐�,(mac鎴栬�卭id)涓虹┖", callback);
- //HdlLogLogic.print("uni--->鍙戦��--->ModBus--->鍙戦�佸け璐�,(mac鎴栬�卭id)涓虹┖." + Arrays.toString(modBusBean.getData()), true);
+ //HdlLogLogic.print("uni---鍙戦��---ModBus---鍙戦�佸け璐�,(mac鎴栬�卭id)涓虹┖." + Arrays.toString(modBusBean.getData()), true);
return;
}
- //HdlLogLogic.print("uni--->鍙戦��--->ModBus--->" + Arrays.toString(modBusBean.getData()), true);
+ //HdlLogLogic.print("uni---鍙戦��---ModBus---" + Arrays.toString(modBusBean.getData()), true);
//鍙戦�乵odbus鍗忚
HDLModBusConnect.getInstance().Send(modBusBean.getMac(), modBusBean.getData(), new ModbusCallBack() {
@Override
public void onSuccess(int[] data) {
uniCallbackData(type, data, callback);
-// HdlLogLogic.print("uni--->鎺ユ敹--->ModBus--->" + Arrays.toString(data), true);
+// HdlLogLogic.print("uni---鎺ユ敹---ModBus---" + Arrays.toString(data), true);
}
@Override
public void onError(HDLLinkException e) {
uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
-// HdlLogLogic.print("uni--->鎺ユ敹--->ModBus--->" + e.getMsg() + "(" + e.getCode() + ")", true);
+// HdlLogLogic.print("uni---鎺ユ敹---ModBus---" + e.getMsg() + "(" + e.getCode() + ")", true);
}
});
}
@@ -1804,7 +1947,7 @@
uniCallBackBaseBean.setData(data);
return getJSONObject(uniCallBackBaseBean);
} catch (Exception e) {
- HdlLogLogic.print("uni--->缁勮鍙戦�佺粰uni鏁版嵁鏍煎紡鏈夊紓甯�--->" + e.getMessage(), false);
+ HdlLogLogic.print("uni---缁勮鍙戦�佺粰uni鏁版嵁鏍煎紡鏈夊紓甯�---" + e.getMessage(), false);
}
return new JSONObject();
}
@@ -1829,10 +1972,10 @@
if (callback != null) {
callback.invoke(getJSONObject(uniCallBackBaseBean));
// callback.invoke(uniCallBackBaseBean);
- HdlLogLogic.print("uni--->鍥炲--->" + type + "--->" + new Gson().toJson(uniCallBackBaseBean), true);
+ HdlLogLogic.print("uni---鍥炲---" + type + "---" + new Gson().toJson(uniCallBackBaseBean), true);
}
} catch (Exception e) {
- HdlLogLogic.print("uni--->鍥炲--->" + type + "--->" + e.getMessage(), true);
+ HdlLogLogic.print("uni---鍥炲---" + type + "---" + e.getMessage(), true);
}
--
Gitblit v1.8.0