From e1577f14dc7ac4fe8b8df851e63ae7e3aebf72a7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 31 十月 2024 16:02:14 +0800
Subject: [PATCH] 2024年10月31日16:02:10
---
app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java | 111 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 89 insertions(+), 22 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..4c0d8ec 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) {
@@ -60,7 +62,40 @@
}
/**
- * 璇锋眰鏈嶅姟鍣�
+ * 璇锋眰鏈嶅姟鍣�(get)
+ * 搴曞眰鏂规硶,寮曠敤搴撶殑鏂规硶
+ *
+ * @param requestUrl 璇锋眰缁濆鍦板潃鎺ュ彛
+ * @param callBack 鍥炶皟
+ * @return -
+ */
+ private Disposable requestGet(String requestUrl, CloudCallBeak<String> callBack) {
+ HdlLogLogic.print("http---鍙戦��---" + requestUrl + "\r\n", isAddToMemory);
+ //寮�鍙戠幆澧冮渶瑕佸姞(鐢ㄦ潵鍖哄垎onpro鍜屽厜浼廰pp浠ｇ爜):HxHttp.builder().headers("x-lbs-version", "hdl-yt")
+ return HxHttp.builder().url(requestUrl).build().get().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, isAddToMemory);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ HDLExceptionSubmitUtils.submit(requestUrl, "", e);
+ if (callBack != null) {
+ callBack.onFailure(e);
+ HdlLogLogic.print("http---鍥炲---" + requestUrl + "\r\n" + "\"{code=\"" + e.getCode() + "," + "\"message=\"" + e.getMsg() + "}", isAddToMemory);
+ }
+ }
+ });
+
+ }
+
+ /**
+ * 璇锋眰鏈嶅姟鍣�(post)
* 搴曞眰鏂规硶,寮曠敤搴撶殑鏂规硶
*
* @param api 璇锋眰鎺ュ彛
@@ -69,18 +104,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);
+// System.out.println("http---鍥炲---" + requestUrl + "\r\n" + gson.fromJson(str, JsonObject.class).toString());
+ HdlLogLogic.print("http---鍥炲---" + requestUrl + "\r\n" + str, isAddToMemory);
}
}
@@ -89,7 +122,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 +142,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);
+// System.out.println("http---鍥炲---" + requestUrl + "\r\n" + gson.fromJson(str, JsonObject.class).toString());
+ HdlLogLogic.print("http---鍥炲---" + requestUrl + "\r\n" + str, isAddToMemory);
}
}
@@ -126,7 +158,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);
}
}
});
@@ -167,9 +199,18 @@
});
}
+ /**
+ * 璇锋眰(get)鏈嶅姟鍣�
+ *
+ * @param requestUrl 璇锋眰缁濆鍦板潃鎺ュ彛
+ * @param callBack 鍥炶皟
+ */
+ public Disposable requestHttpGet(String requestUrl, CloudCallBeak<String> callBack) {
+ return requestGet(requestUrl, callBack);
+ }
/**
- * 璇锋眰鏈嶅姟鍣�
+ * 璇锋眰(post)鏈嶅姟鍣�
*
* @param api 璇锋眰鎺ュ彛
* @param body 璇锋眰鍙傛暟(json)
@@ -219,6 +260,7 @@
this.requestHttpServer(fullUrl, json, isBasicService, isExecute, baseSuccessCallBeak);
}
+
/**
* 璇锋眰鏈嶅姟鍣ㄧ殑鏂规硶
*
@@ -232,7 +274,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 +284,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 +297,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 +307,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 +316,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 +410,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