From facf399aa49ac37def7ea00221c5bbd056765df2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 一月 2025 09:21:21 +0800
Subject: [PATCH] 2025年01月07日09:21:18
---
app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java | 145 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 115 insertions(+), 30 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..9ffd9f9 100644
--- a/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
+++ b/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
@@ -20,7 +20,10 @@
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.listener.BaseSuccessFailureCallBeak;
import com.hdl.photovoltaic.listener.CloudCallBeak;
+import com.hdl.photovoltaic.other.HdlESLocalJsonLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
+import com.hdl.photovoltaic.other.HdlThreadLogic;
+import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.utils.Md5Utils;
import java.io.File;
@@ -47,6 +50,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 +65,91 @@
}
/**
- * 璇锋眰鏈嶅姟鍣�
+ * 鑾峰彇json璧勬簮鐢ㄧ殑
+ *
+ * @param url 鍦板潃
+ * @param callBack 鍥炶皟
+ */
+ public void requestJsonHttpGet(String url, CloudCallBeak<String> callBack) {
+ if (TextUtils.isEmpty(url)) {
+ if (callBack != null) {
+ callBack.onSuccess("");
+ }
+ }
+
+ HdlThreadLogic.runSubThread(new Runnable() {
+ @Override
+ public void run() {
+ OkHttpClient client = new OkHttpClient();
+ Request request = new Request.Builder()
+ .url(url)
+ .addHeader("Accept-Language", UserConfigManage.getInstance().getCurrentAppLanguage())
+ .build();
+
+ try (Response response = client.newCall(request).execute()) {
+ if (response.isSuccessful()) {
+ if (response.body() == null) {
+ if (callBack != null) {
+ callBack.onSuccess("");
+ }
+ } else {
+ String str = response.body().string();
+ if (callBack != null) {
+ callBack.onSuccess(str);
+ }
+ }
+
+ } else {
+ if (callBack != null) {
+ callBack.onSuccess("");
+ }
+ }
+ } catch (Exception e) {
+ if (callBack != null) {
+ callBack.onFailure(new HDLException(-20002, e.getMessage()));
+ }
+ }
+ }
+ });
+
+ }
+
+
+ /**
+ * 璇锋眰鏈嶅姟鍣�(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 璇锋眰鎺ュ彛
@@ -70,15 +159,15 @@
*/
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);
}
}
@@ -87,7 +176,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 +196,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);
}
}
@@ -124,7 +212,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);
}
}
});
@@ -165,9 +253,18 @@
});
}
+ /**
+ * 璇锋眰(get)鏈嶅姟鍣�
+ *
+ * @param requestUrl 璇锋眰缁濆鍦板潃鎺ュ彛
+ * @param callBack 鍥炶皟
+ */
+ public Disposable requestHttpGet(String requestUrl, CloudCallBeak<String> callBack) {
+ return requestGet(requestUrl, callBack);
+ }
/**
- * 璇锋眰鏈嶅姟鍣�
+ * 璇锋眰(post)鏈嶅姟鍣�
*
* @param api 璇锋眰鎺ュ彛
* @param body 璇锋眰鍙傛暟(json)
@@ -217,16 +314,6 @@
this.requestHttpServer(fullUrl, json, isBasicService, isExecute, baseSuccessCallBeak);
}
- /**
- * get鏂规硶璇锋眰
- *
- * @param url http鍦板潃
- * @param cloudCallBeak 鍥炶皟
- */
- public void requestHttpGet(String url, CloudCallBeak<String> cloudCallBeak) {
- this.requestHttpServer(url, cloudCallBeak);
- }
-
/**
* 璇锋眰鏈嶅姟鍣ㄧ殑鏂规硶
@@ -241,7 +328,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 +338,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 +351,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 +361,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 +370,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);
}
}
@@ -377,8 +464,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