From c7c07eaa32ca7b137b1ac028d17beee0ebcf9a0b Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 26 三月 2024 15:22:15 +0800
Subject: [PATCH] 2024年03月26日15:22:09
---
app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java | 71 ++++++++++++++++++++++++++---------
1 files changed, 53 insertions(+), 18 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 7ab633b..a72776c 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) {
@@ -69,18 +71,16 @@
* @return -
*/
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);
+ //寮�鍙戠幆澧冮渶瑕佸姞(鐢ㄦ潵鍖哄垎onpro鍜屽厜浼廰pp浠ｇ爜):HxHttp.builder().headers("x-lbs-version", "hdl-yt")
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);
}
}
@@ -89,7 +89,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);
}
}
});
@@ -109,15 +109,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);
}
}
@@ -126,7 +125,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);
}
}
});
@@ -220,6 +219,17 @@
}
/**
+ * get鏂规硶璇锋眰
+ *
+ * @param url http鍦板潃
+ * @param cloudCallBeak 鍥炶皟
+ */
+ public void requestHttpGet(String url, CloudCallBeak<String> cloudCallBeak) {
+ this.requestHttpServer(url, cloudCallBeak);
+ }
+
+
+ /**
* 璇锋眰鏈嶅姟鍣ㄧ殑鏂规硶
*
* @param fullUrl 缁濆璇锋眰鍦板潃
@@ -232,7 +242,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
@@ -242,7 +252,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 {
@@ -255,7 +265,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
@@ -265,7 +275,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()));
}
@@ -274,9 +284,36 @@
}
} 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);
}
+ }
+ }).start();
+ }
+
+ /**
+ * 璇锋眰鏈嶅姟鍣ㄧ殑鏂规硶
+ *
+ * @param url 缁濆璇锋眰鍦板潃
+ */
+ private void requestHttpServer(String url, CloudCallBeak<String> cloudCallBeak) {
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ OkHttpClient okHttpClient = new OkHttpClient();
+ final Request request = new Request.Builder().url(url).build();
+ try {
+ Response response = okHttpClient.newCall(request).execute();
+ String s = Objects.requireNonNull(response.body()).string();
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(s);
+ }
+ } catch (Exception e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(e.getMessage());
+ }
+
+ }
}
}).start();
}
@@ -341,8 +378,6 @@
final char[] strChar = valueStr.substring(0, 1).toCharArray();
final char firstChar = strChar[0];
//System.out.println("getJSONType firstChar = "+firstChar);
- if (firstChar != '{' && firstChar != '[') return true;
-
- return false;
+ return firstChar != '{' && firstChar != '[';
}
}
--
Gitblit v1.8.0