From 70c1ba24af27ba64e1d9ad50eb722541212ed8b6 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 30 六月 2023 17:26:54 +0800
Subject: [PATCH] 2023年06月30日17:26:51
---
app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 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 8d2c3cd..7b88b11 100644
--- a/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
+++ b/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
@@ -9,9 +9,11 @@
import com.google.gson.JsonObject;
import com.google.gson.reflect.TypeToken;
import com.hdl.hdlhttp.utils.GsonConvert;
-import com.hdl.photovoltaic.bean.ResponsePack;
-import com.hdl.photovoltaic.config.ConfigManagement;
+import com.hdl.photovoltaic.bean.HttpResponsePack;
+import com.hdl.photovoltaic.config.AppConfigManage;
+import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.listener.BaseSuccessFailureCallBeak;
+import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.utils.HDLMD5Utils;
import java.io.IOException;
@@ -55,7 +57,7 @@
* @param isExecute 鏄惁鏄悓姝�(true=鍚屾,false=寮傛)
*/
public void requestHttp(String requestUrl, String json, boolean isBasicService, boolean isExecute, BaseSuccessFailureCallBeak baseSuccessCallBeak) {
- String fullUrl = ConfigManagement.getUserRegionUrl() + requestUrl;
+ String fullUrl = AppConfigManage.getUserRegionUrl() + requestUrl;
this.requestHttps(fullUrl, json, isBasicService, isExecute, baseSuccessCallBeak);
}
@@ -71,7 +73,6 @@
this.requestHttps(fullUrl, json, isBasicService, isExecute, baseSuccessCallBeak);
}
-
/**
* 璇锋眰鏈嶅姟鍣ㄧ殑鏂规硶
*
@@ -85,19 +86,22 @@
@Override
public void run() {
try {
+ HdlLogLogic.print("http->鍙戦��->", fullUrl + "\r\n" + json);
OkHttpClient okHttpClient = new OkHttpClient();
RequestBody requestBody = FormBody.create(MediaType.parse("application/json; charset=utf-8"), getJson(json));
final Request request = new Request.Builder()
- .url(fullUrl)//璇锋眰鐨剈rl//
- .addHeader("Authorization", "accessToken")
+ .url(fullUrl)//璇锋眰鐨剈rl
+ .addHeader("Authorization", UserConfigManage.getInstance().getHeaderPrefix() + UserConfigManage.getInstance().getToken())
.post(requestBody)
.build();
if (isExecute) {
Response response = okHttpClient.newCall(request).execute();//鍚屾
if (response.isSuccessful()) {
String s = Objects.requireNonNull(response.body()).string();
- ResponsePack responsePack = new Gson().fromJson(s, ResponsePack.class);
- baseSuccessCallBeak.onSuccess(responsePack);
+ HttpResponsePack httpResponsePack = new Gson().fromJson(s, HttpResponsePack.class);
+ HdlLogLogic.print("http->鍥炲->", response.request().url() + "\r\n" + s);
+ baseSuccessCallBeak.onSuccess(httpResponsePack);
+
} else {
//throw new IOException("Unexpected code " + response);
baseSuccessCallBeak.onFailure(new Exception());
@@ -108,7 +112,7 @@
call.enqueue(new Callback() {//寮傛
@Override
public void onFailure(@NonNull Call call, @NonNull IOException e) {
- System.out.println("澶辫触" + e.toString());
+ HdlLogLogic.print("http->鍥炲->", "\r\n" + e.getMessage());
}
@Override
@@ -116,8 +120,9 @@
System.out.println("url杩炴帴淇℃伅" + response.code());
if (response.code() == 200) {
String s = Objects.requireNonNull(response.body()).string();
- ResponsePack responsePack = new Gson().fromJson(s, ResponsePack.class);
- baseSuccessCallBeak.onSuccess(responsePack);
+ HttpResponsePack httpResponsePack = new Gson().fromJson(s, HttpResponsePack.class);
+ baseSuccessCallBeak.onSuccess(httpResponsePack);
+ HdlLogLogic.print("http->鍥炲->", "\r\n" + s);
} else {
baseSuccessCallBeak.onFailure(new Exception());
}
@@ -126,10 +131,10 @@
}
} catch (Exception e) {
baseSuccessCallBeak.onFailure(e);
+ HdlLogLogic.print("http->鍥炲->", "\r\n" + e.getMessage());
}
}
-
}).start();
}
@@ -138,8 +143,8 @@
*/
private String getJson(String json) {
final String timestamp = String.valueOf(System.currentTimeMillis());
- final String appKey = ConfigManagement.getAppKey();
- final String appSecret = ConfigManagement.getAppSecret();
+ final String appKey = AppConfigManage.getAppKey();
+ final String appSecret = AppConfigManage.getAppSecret();
JsonObject jsonObject = new Gson().fromJson(json, JsonObject.class);
if (jsonObject == null) {
jsonObject = new JsonObject();
--
Gitblit v1.8.0