From 329a536dc7ee9cb7bff1f59af9b54604b998c9ce Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 18 八月 2025 16:16:52 +0800
Subject: [PATCH] 2025年08月18日16:16:50
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 85 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 77 insertions(+), 8 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 e221983..58bd332 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -38,6 +38,7 @@
import com.hdl.photovoltaic.bean.PageNumberObject;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
+import com.hdl.photovoltaic.enums.LogoutType;
import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
import com.hdl.photovoltaic.internet.TcpClient;
@@ -714,7 +715,8 @@
//uni閫氱煡鍘熺敓閫�鍑虹櫥褰�
case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOGOUT: {
HdlLogLogic.print("uni閫氱煡鍘熺敓閫�鍑虹櫥褰�---", true);
- HDLLinkPMUser.getInstance().logout(0);
+// HDLLinkPMUser.getInstance().logout(0);
+ HdlAccountLogic.getInstance().logout(LogoutType.NormalLogout);
}
break;
//鏈湴瀵嗛挜鑾峰彇
@@ -775,10 +777,10 @@
} else if (s.startsWith("[")) {
uniSuccessCallback(type, new Gson().fromJson(s, JsonArray.class), callback);
} else {
- uniSuccessCallback(type, s, callback);
+ uniSuccessCallback(type, new JsonArray(), callback);
}
} catch (Exception e) {
- uniSuccessCallback(type, s, callback);
+ uniSuccessCallback(type, new JsonArray(), callback);
}
}
}
@@ -799,10 +801,10 @@
} else if (json.startsWith("[")) {
uniSuccessCallback(type, new Gson().fromJson(json, JsonArray.class), callback);
} else {
- uniSuccessCallback(type, json, callback);
+ uniSuccessCallback(type, new JsonArray(), callback);
}
} catch (Exception e) {
- uniSuccessCallback(type, json, callback);
+ uniSuccessCallback(type, new JsonArray(), callback);
}
long endTime = System.currentTimeMillis() - startTime;
Log.d("====鑰楁椂鏃堕棿====", String.valueOf(endTime));
@@ -815,6 +817,11 @@
}
break;
+ //璁惧瀹氫綅
+ case HDLUniMP.UNI_EVENT_REPLY_OTHER_GET_DEVICE_LOCATION: {
+ this.uniGetDeviceFind(mode_type, data, TopicApi.DELETING_GATEWAY_FIND, callback);;
+ }
+ break;
}
} else if (HDLUniMP.UNI_EVENT_REPLY_NO_WORK_MODEL.equals(topic)) {
//鏃犵綉妯″紡
@@ -822,6 +829,7 @@
case HDLUniMP.UNI_EVENT_REPLY_NO_WORK_MODEL_EXIT: {
//閫�鍑烘棤缃戞ā寮忔爣璇�
UserConfigManage.getInstance().setNoNetworkFlag(false);
+ UserConfigManage.getInstance().setAutomaticSkipNoNetworkFlag(false);
UserConfigManage.getInstance().Save();
uniSuccessCallback(mode_type, true, callback);
if (null != HDLUniMPSDKManager.getInstance().getUniMP()) {
@@ -830,6 +838,12 @@
Intent intent = new Intent(HDLApp.getInstance(), LoginActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
HDLApp.getInstance().startActivity(intent);
+ }
+ break;
+ case HDLUniMP.UNI_EVENT_REPLY_NO_WORK_MODEL_FROM_OFFLINE: {
+ //璁惧绂荤綉鏃舵湁鍏ュ彛杩涘叆鏃犵綉妯″紡
+ uniSuccessCallback(mode_type, true, callback);
+ HdlAccountLogic.getInstance().logout(LogoutType.UniLogout);
}
break;
case HDLUniMP.UNI_EVENT_REPLY_NO_WORK_MODEL_DEVICE_INFO: {
@@ -956,6 +970,49 @@
@Override
public void onError(HDLLinkException e) {
+ if (callback != null) {
+ uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+ }
+ }
+ });
+ }
+
+ /**
+ * 璁惧瀹氫綅
+ */
+ private void uniGetDeviceFind(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 s) {
+ if (callback != null) {
+ try {
+ if (s.startsWith("{")) {
+ uniSuccessCallback(type, new Gson().fromJson(s, JsonObject.class), callback);
+ } else if (s.startsWith("[")) {
+ uniSuccessCallback(type, new Gson().fromJson(s, JsonArray.class), callback);
+ } else {
+ uniSuccessCallback(type, s, callback);
+ }
+ } catch (Exception e) {
+ uniSuccessCallback(type, s, callback);
+ }
+ }
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
if (callback != null) {
uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
}
@@ -2509,14 +2566,25 @@
}
List<GatewayBean> newList = new ArrayList<>();
List<GatewayBean> inverterList = new ArrayList<>();
+ List<GatewayBean> inverterUnactivatedList = new ArrayList<>();
List<GatewayBean> lcList = new ArrayList<>();
for (int i = 0; i < list.size(); i++) {
- if (list.get(i).getSpk().equals(HdlDeviceLogic.getInstance().INVERTER_DEVICE_SPK)) {
- inverterList.add(list.get(i));
+ GatewayBean gatewayBean = list.get(i);
+ if (gatewayBean == null) {
+ continue;
+ }
+ if (gatewayBean.isActivate()) {
+ if (gatewayBean.getSpk().equals(HdlDeviceLogic.getInstance().INVERTER_DEVICE_SPK)
+ || gatewayBean.getSpk().equals(HdlDeviceLogic.getInstance().OFF_INVERTER_OG_SPK)) {
+ inverterList.add(gatewayBean);
+ } else {
+ lcList.add(gatewayBean);
+ }
} else {
- lcList.add(list.get(i));
+ inverterUnactivatedList.add(gatewayBean);
}
}
+ newList.addAll(inverterUnactivatedList);
newList.addAll(inverterList);
newList.addAll(lcList);
return newList;
@@ -2722,6 +2790,7 @@
inverterDeviceBean.setDeviceStatus(gatewayBean.getDeviceStatus());
inverterDeviceBean.setSpk(gatewayBean.getSpk());
inverterDeviceBean.setDeviceType(gatewayBean.getDeviceType());
+ inverterDeviceBean.setActivate(gatewayBean.isActivate());
newList.add(inverterDeviceBean);
}
}
--
Gitblit v1.8.0