From b8209d15d915f72d9abe3a68b76e1f4cfd21eac3 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期六, 23 九月 2023 14:37:00 +0800
Subject: [PATCH] 2023年09月23日14:36:51
---
app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java b/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
index 69222d3..fe8fa9b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
+++ b/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
@@ -9,6 +9,7 @@
import com.google.gson.JsonObject;
import com.google.gson.reflect.TypeToken;
import com.hdl.hdlhttp.HxHttp;
+import com.hdl.hdlhttp.HxHttpBuilder;
import com.hdl.hdlhttp.utils.GsonConvert;
import com.hdl.linkpm.sdk.core.api.HDLCloudUserApi;
import com.hdl.linkpm.sdk.core.exception.HDLException;
@@ -35,6 +36,7 @@
import okhttp3.Call;
import okhttp3.Callback;
import okhttp3.FormBody;
+import okhttp3.Headers;
import okhttp3.MediaType;
import okhttp3.OkHttpClient;
import okhttp3.Request;
@@ -62,12 +64,16 @@
* 搴曞眰鏂规硶,寮曠敤搴撶殑鏂规硶
*
* @param api 璇锋眰鎺ュ彛
- * @param body 璇锋眰鍙傛暟
+ * @param body 璇锋眰鍙傛暟(appKey,timestamp,sign杩欎笁涓弬鏁板唴閮ㄤ細鑷姩娣诲姞))
* @param callBack 鍥炶皟
* @return -
*/
private Disposable request(String api, String body, CloudCallBeak<String> callBack) {
+
+
String requestUrl = HDLCloudUserApi.getRequestUrl(api);
+ Gson gson = new Gson();
+ System.out.println("鍙戦��->" + requestUrl + "\r\n" + body);
return HxHttp.builder()
.url(requestUrl)
.raw(body)
@@ -78,6 +84,8 @@
public void onResponse(String str) {
if (callBack != null) {
callBack.onSuccess(str);
+// System.out.println("鍥炲->" + requestUrl + "\r\n" + gson.fromJson(str, JsonObject.class).toString());
+ System.out.println("鍥炲->" + requestUrl + "\r\n" + str);
}
}
@@ -86,11 +94,13 @@
HDLExceptionSubmitUtils.submit(requestUrl, body, e);
if (callBack != null) {
callBack.onFailure(e);
+ System.out.println("鍥炲->" + requestUrl + "\r\n" + "{code=" + e.getCode() + ",message=" + e.getMessage() + "}");
}
}
});
}
+
/**
* 璇锋眰鏈嶅姟鍣�
@@ -114,7 +124,7 @@
@Deprecated
private void requestHttp(String requestUrl, String json, boolean isBasicService, boolean isExecute, BaseSuccessFailureCallBeak baseSuccessCallBeak) {
String fullUrl = AppConfigManage.getUserRegionUrl() + requestUrl;
- this.requestHttps(fullUrl, json, isBasicService, isExecute, baseSuccessCallBeak);
+ this.requestHttpServer(fullUrl, json, isBasicService, isExecute, baseSuccessCallBeak);
}
/**
@@ -128,7 +138,7 @@
*/
@Deprecated
private void requestFullHttp(String fullUrl, String json, boolean isBasicService, boolean isExecute, BaseSuccessFailureCallBeak baseSuccessCallBeak) {
- this.requestHttps(fullUrl, json, isBasicService, isExecute, baseSuccessCallBeak);
+ this.requestHttpServer(fullUrl, json, isBasicService, isExecute, baseSuccessCallBeak);
}
/**
@@ -139,7 +149,7 @@
* @param isBasicService 鏄惁鏄熀纭�鏈嶅姟鐨勬帴鍙�(鍩虹鏈嶅姟鐨勬帴鍙ｉ渶瑕� appKey,timestamp,sign杩欎笁涓弬鏁�,褰撲负true鏃�,鍐呴儴浼氳嚜鍔ㄦ坊鍔�)
* @param isExecute 鏄惁鏄悓姝�(true=鍚屾,false=寮傛)
*/
- private void requestHttps(String fullUrl, String json, boolean isBasicService, boolean isExecute, BaseSuccessFailureCallBeak baseSuccessCallBeak) {
+ private void requestHttpServer(String fullUrl, String json, boolean isBasicService, boolean isExecute, BaseSuccessFailureCallBeak baseSuccessCallBeak) {
new Thread(new Runnable() {
@Override
public void run() {
--
Gitblit v1.8.0