From 5e2e1fc7fc23d5fa035608bc415e9eac73ce2e37 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 27 十一月 2024 13:11:20 +0800
Subject: [PATCH] 2024年11月27日13:11:17
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 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 3c96a8f..fa5cce0 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -724,11 +724,15 @@
String s = HdlESLocalJsonLogic.getInstance().readHdlESLocalJson(url, deviceModel);
//鏈湴缂撳瓨鏁版嵁
if (callback != null) {
- 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 {
+ 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);
}
}
@@ -744,11 +748,15 @@
} else {
//鏈湴缂撳瓨鏁版嵁
if (callback != null) {
- if (json.startsWith("{")) {
- uniSuccessCallback(type, new Gson().fromJson(json, JsonObject.class), callback);
- } else if (json.startsWith("[")) {
- uniSuccessCallback(type, new Gson().fromJson(json, JsonArray.class), callback);
- } else {
+ try {
+ if (json.startsWith("{")) {
+ uniSuccessCallback(type, new Gson().fromJson(json, JsonObject.class), callback);
+ } else if (json.startsWith("[")) {
+ uniSuccessCallback(type, new Gson().fromJson(json, JsonArray.class), callback);
+ } else {
+ uniSuccessCallback(type, json, callback);
+ }
+ } catch (Exception e) {
uniSuccessCallback(type, json, callback);
}
}
--
Gitblit v1.8.0