From a8a25a3ae373115f9342c766a7ee241e8ca8f479 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 七月 2025 15:20:34 +0800
Subject: [PATCH] 2025年07月15日15:20:32
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 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 340bb75..417e4ef 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;
@@ -395,6 +396,11 @@
this.uniGetGatewayInfo(mode_type, data, callback);
}
break;
+ //鍒犻櫎BMS/鐢垫睜鍖�
+ case HDLUniMP.UNI_EVENT_REPLY_DEVICE_del_oid: {
+ this.uniDeleteOid(mode_type, data, callback);
+ }
+ break;
}
} else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(topic)) {
@@ -709,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;
//鏈湴瀵嗛挜鑾峰彇
@@ -770,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);
}
}
}
@@ -794,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));
@@ -2852,6 +2859,30 @@
});
}
+ /**
+ * 鍒犻櫎璁惧oid
+ *
+ * @param type 绫诲瀷
+ * @param data uni璇锋眰鏁版嵁
+ * @param callback uni鍥炶皟
+ */
+ public void uniDeleteOid(String type, Object data, DCUniMPJSCallback callback) {
+ String mac = getKeyValue("mac", getKeyValue("data", data));
+ String oid_json = getKeyValue("attribute_data", getKeyValue("data", data));
+ JsonArray jsonArray = new Gson().fromJson(oid_json, JsonArray.class);
+ HdlDeviceLogic.getInstance().deleteOid(mac, jsonArray, new LinkCallBack<Boolean>() {
+ @Override
+ public void onSuccess(Boolean obj) {
+ uniSuccessCallback(type, obj, callback);
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+ }
+ });
+ }
+
/**
* 鍙戦�乵odbus鍗忚鏁版嵁
--
Gitblit v1.8.0