From 3ec7de773bff5582411c6f1f659d35cf8fb1734a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 16 七月 2024 15:13:51 +0800
Subject: [PATCH] Merge branch 'feature/v1.4.1'
---
app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java | 56 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 12 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 a74978c..4c0d8ec 100644
--- a/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
+++ b/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
@@ -62,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 璇锋眰鎺ュ彛
@@ -166,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)
@@ -216,16 +258,6 @@
@Deprecated
private void requestFullHttp(String fullUrl, String json, boolean isBasicService, boolean isExecute, BaseSuccessFailureCallBeak baseSuccessCallBeak) {
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);
}
--
Gitblit v1.8.0