From 68d9078b49cfa8e83ed553835b05d4042c183969 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 16 三月 2023 09:39:34 +0800
Subject: [PATCH] 云台不显示问题修复，LC问题
---
AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java
index d08582c..1af77fd 100644
--- a/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java
+++ b/AndroidOpenDemo/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java
@@ -1,5 +1,6 @@
package com.mm.android.deviceaddmodule.openapi;
+import android.content.Intent;
import android.text.TextUtils;
import com.google.gson.Gson;
@@ -7,12 +8,14 @@
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.reflect.TypeToken;
+import hdl.onpro.HdlData;
import com.mm.android.deviceaddmodule.LCDeviceEngine;
import com.mm.android.deviceaddmodule.mobilecommon.AppConsume.BusinessException;
import com.mm.android.deviceaddmodule.mobilecommon.utils.LogUtil;
import com.mm.android.deviceaddmodule.mobilecommon.utils.MD5Helper;
import org.apache.http.conn.ConnectTimeoutException;
+import org.greenrobot.eventbus.EventBus;
import org.json.JSONObject;
import java.io.IOException;
@@ -53,8 +56,17 @@
}
String code = jsonResult.get("code").getAsString();
if (!"0".equals(code)) {
- String msg = jsonResult.get("msg").getAsString();
- throw new BusinessException(code + msg);
+ try {
+ String msg = jsonResult.get("msg").getAsString();
+ EventBus.getDefault().post("InterfaceException");
+ hdl.onpro.HdlData.getInstance().getiRegisterDeviceFeedback().feedback(method,jsonResult.toString());
+ throw new BusinessException(code + msg);
+ }catch (Exception exception){
+ String msg = jsonResult.get("message").getAsString();
+ EventBus.getDefault().post("InterfaceException");
+ hdl.onpro.HdlData.getInstance().getiRegisterDeviceFeedback().feedback(method,jsonResult.toString());
+ throw new BusinessException(code + msg);
+ }
}
JsonObject jsonData = new JsonObject();
@@ -106,7 +118,11 @@
LogUtil.debugLog(TAG, "reqest: " + url + " data:" + json);
String openApi = HttpClient.post(url, json, "application/json", "OpenApi",timeOut);
LogUtil.debugLog(TAG, "杩斿洖缁撴灉: \r\n" + openApi);
- jsonObject = new JsonParser().parse(openApi).getAsJsonObject();
+ try {
+ jsonObject = new JsonParser().parse(openApi).getAsJsonObject();
+ }catch (Exception exception){
+ jsonObject = new Gson().fromJson(openApi,JsonObject.class);
+ }
} catch (IOException e) {
BusinessException b = new BusinessException(e);
if (e instanceof ConnectTimeoutException || e instanceof SocketTimeoutException
--
Gitblit v1.8.0