From 3aa86eda8f416bec308d065689d39c847d2d9cc7 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期二, 30 一月 2024 19:48:26 +0800 Subject: [PATCH] 2024年01月30日19:44:13 --- app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 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 24b8088..d1ddd99 100644 --- a/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java +++ b/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java @@ -47,6 +47,8 @@ private static volatile HttpClient sHttpClient; + private static final boolean isAddToMemory=false; + public static synchronized HttpClient getInstance() { if (sHttpClient == null) { synchronized (HttpClient.class) { @@ -70,15 +72,14 @@ */ private Disposable requestPost(String api, String body, CloudCallBeak<String> callBack) { String requestUrl = HDLCloudUserApi.getRequestUrl(api); - Gson gson = new Gson(); - System.out.println("http->鍙戦��->" + requestUrl + "\r\n" + body); + HdlLogLogic.print("http->鍙戦��->" + requestUrl + "\r\n" + body, isAddToMemory); return HxHttp.builder().url(requestUrl).raw(body).build().post().subscribeWith(new HDLResponse<String>() { @Override public void onResponse(String str) { if (callBack != null) { callBack.onSuccess(str); // System.out.println("http->鍥炲->" + requestUrl + "\r\n" + gson.fromJson(str, JsonObject.class).toString()); - System.out.println("http->鍥炲->" + requestUrl + "\r\n" + str); + HdlLogLogic.print("http->鍥炲->" + requestUrl + "\r\n" + str, isAddToMemory); } } @@ -87,7 +88,7 @@ HDLExceptionSubmitUtils.submit(requestUrl, body, e); if (callBack != null) { callBack.onFailure(e); - System.out.println("http->鍥炲->" + requestUrl + "\r\n" + "\"{code=\"" + e.getCode() + "," + "\"message=\"" + e.getMsg() + "}"); + HdlLogLogic.print("http->鍥炲->" + requestUrl + "\r\n" + "\"{code=\"" + e.getCode() + "," + "\"message=\"" + e.getMsg() + "}", isAddToMemory); } } }); @@ -107,15 +108,14 @@ String requestUrl = HDLCloudUserApi.getRequestUrl(api); - Gson gson = new Gson(); - System.out.println("http->鍙戦��->" + requestUrl + "\r\n" + body); + HdlLogLogic.print("http->鍙戦��->" + requestUrl + "\r\n" + body, isAddToMemory); return HxHttp.builder().url(requestUrl).file(body).build().post().subscribeWith(new HDLResponse<String>() { @Override public void onResponse(String str) { if (callBack != null) { callBack.onSuccess(str); // System.out.println("http->鍥炲->" + requestUrl + "\r\n" + gson.fromJson(str, JsonObject.class).toString()); - HdlLogLogic.print("http->鍥炲->" + requestUrl + "\r\n" + str, true); + HdlLogLogic.print("http->鍥炲->" + requestUrl + "\r\n" + str, isAddToMemory); } } @@ -124,7 +124,7 @@ HDLExceptionSubmitUtils.submit(requestUrl, body, e); if (callBack != null) { callBack.onFailure(e); - HdlLogLogic.print("http->鍥炲->" + requestUrl + "\r\n" + "\"{code=\"" + e.getCode() + "," + "\"message=\"" + e.getMsg() + "}", true); + HdlLogLogic.print("http->鍥炲->" + requestUrl + "\r\n" + "\"{code=\"" + e.getCode() + "," + "\"message=\"" + e.getMsg() + "}", isAddToMemory); } } }); @@ -241,7 +241,7 @@ @Override public void run() { try { - HdlLogLogic.print("http->鍙戦��->" + fullUrl + "\r\n" + json, false); + HdlLogLogic.print("http->鍙戦��->" + fullUrl + "\r\n" + json, isAddToMemory); 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 @@ -251,7 +251,7 @@ if (response.isSuccessful()) { String s = Objects.requireNonNull(response.body()).string(); HttpResponsePack httpResponsePack = new Gson().fromJson(s, HttpResponsePack.class); - HdlLogLogic.print("http->鍥炲->" + response.request().url() + "\r\n" + s, false); + HdlLogLogic.print("http->鍥炲->" + response.request().url() + "\r\n" + s, isAddToMemory); baseSuccessCallBeak.onSuccess(httpResponsePack); } else { @@ -264,7 +264,7 @@ call.enqueue(new Callback() {//寮傛 @Override public void onFailure(@NonNull Call call, @NonNull IOException e) { - HdlLogLogic.print("http->鍥炲->" + "\r\n" + e.getMessage(), false); + HdlLogLogic.print("http->鍥炲->" + "\r\n" + e.getMessage(), isAddToMemory); } @Override @@ -274,7 +274,7 @@ String s = Objects.requireNonNull(response.body()).string(); HttpResponsePack httpResponsePack = new Gson().fromJson(s, HttpResponsePack.class); baseSuccessCallBeak.onSuccess(httpResponsePack); - HdlLogLogic.print("http->鍥炲->" + "\r\n" + s, false); + HdlLogLogic.print("http->鍥炲->" + "\r\n" + s, isAddToMemory); } else { baseSuccessCallBeak.onFailure(new HDLException(response.code(), response.message())); } @@ -283,7 +283,7 @@ } } catch (Exception e) { baseSuccessCallBeak.onFailure(new HDLException(-100, e.getMessage())); - HdlLogLogic.print("http->鍥炲->" + "\r\n" + e.getMessage(), false); + HdlLogLogic.print("http->鍥炲->" + "\r\n" + e.getMessage(), isAddToMemory); } } -- Gitblit v1.8.0