From 88fa5aa9631b263e6e3d99d9ee787f73e78c6fda Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 17 五月 2024 14:54:53 +0800
Subject: [PATCH] 2024年05月17日14:54:51
---
app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java | 191 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 149 insertions(+), 42 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 eab83ff..a74978c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
+++ b/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
@@ -9,13 +9,11 @@
import com.google.gson.JsonObject;
import com.google.gson.reflect.TypeToken;
import com.hdl.hdlhttp.HxHttp;
-import com.hdl.hdlhttp.HxHttpBuilder;
import com.hdl.hdlhttp.utils.GsonConvert;
import com.hdl.linkpm.sdk.core.api.HDLCloudUserApi;
import com.hdl.linkpm.sdk.core.exception.HDLException;
+import com.hdl.linkpm.sdk.core.interceptor.HDLSmartHeader;
import com.hdl.linkpm.sdk.core.response.HDLResponse;
-import com.hdl.linkpm.sdk.user.bean.HDLLoginBean;
-import com.hdl.linkpm.sdk.user.callback.ILoginCallBack;
import com.hdl.linkpm.sdk.utils.HDLExceptionSubmitUtils;
import com.hdl.photovoltaic.bean.HttpResponsePack;
import com.hdl.photovoltaic.config.AppConfigManage;
@@ -23,8 +21,9 @@
import com.hdl.photovoltaic.listener.BaseSuccessFailureCallBeak;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlLogLogic;
-import com.hdl.photovoltaic.utils.HDLMD5Utils;
+import com.hdl.photovoltaic.utils.Md5Utils;
+import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
@@ -33,19 +32,22 @@
import java.util.Objects;
import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.Consumer;
import okhttp3.Call;
import okhttp3.Callback;
import okhttp3.FormBody;
-import okhttp3.Headers;
import okhttp3.MediaType;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
+import okhttp3.ResponseBody;
public class HttpClient {
private static volatile HttpClient sHttpClient;
+
+ private static final boolean isAddToMemory = false;
public static synchronized HttpClient getInstance() {
if (sHttpClient == null) {
@@ -68,37 +70,100 @@
* @param callBack 鍥炶皟
* @return -
*/
- private Disposable request(String api, String body, CloudCallBeak<String> callBack) {
+ private Disposable requestPost(String api, String body, CloudCallBeak<String> callBack) {
+ String requestUrl = HDLCloudUserApi.getRequestUrl(api);
+ 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());
+ HdlLogLogic.print("http---鍥炲---" + requestUrl + "\r\n" + str, isAddToMemory);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ HDLExceptionSubmitUtils.submit(requestUrl, body, e);
+ if (callBack != null) {
+ callBack.onFailure(e);
+ HdlLogLogic.print("http---鍥炲---" + requestUrl + "\r\n" + "\"{code=\"" + e.getCode() + "," + "\"message=\"" + e.getMsg() + "}", isAddToMemory);
+ }
+ }
+ });
+
+ }
+
+ /**
+ * 璇锋眰鏈嶅姟鍣�
+ * 搴曞眰鏂规硶,寮曠敤搴撶殑鏂规硶
+ *
+ * @param api 璇锋眰鎺ュ彛
+ * @param body 璇锋眰鍙傛暟(appKey,timestamp,sign杩欎笁涓弬鏁板唴閮ㄤ細鑷姩娣诲姞))
+ * @param callBack 鍥炶皟
+ * @return -
+ */
+ private Disposable requestFilePost(String api, File body, CloudCallBeak<String> callBack) {
String requestUrl = HDLCloudUserApi.getRequestUrl(api);
- Gson gson = new Gson();
- System.out.println("鍙戦��->" + 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, isAddToMemory);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ HDLExceptionSubmitUtils.submit(requestUrl, body, e);
+ if (callBack != null) {
+ callBack.onFailure(e);
+ HdlLogLogic.print("http---鍥炲---" + requestUrl + "\r\n" + "\"{code=\"" + e.getCode() + "," + "\"message=\"" + e.getMsg() + "}", isAddToMemory);
+ }
+ }
+ });
+
+ }
+
+
+ /**
+ * 涓嬭浇鏂囦欢
+ *
+ * @param callBack -
+ */
+ public Disposable downLoadFile(String url, CloudCallBeak<ResponseBody> callBack) {
return HxHttp.builder()
- .url(requestUrl)
- .raw(body)
+ .url(url)
+ .headers(HDLSmartHeader.IGNORE_SIGN_HEADER, 1)
.build()
- .post()
- .subscribeWith(new HDLResponse<String>() {
+ .download()
+ .subscribe(new Consumer<ResponseBody>() {
@Override
- public void onResponse(String str) {
+ public void accept(ResponseBody responseBody) throws Exception {
if (callBack != null) {
- callBack.onSuccess(str);
-// System.out.println("鍥炲->" + requestUrl + "\r\n" + gson.fromJson(str, JsonObject.class).toString());
- System.out.println("鍥炲->" + requestUrl + "\r\n" + str);
+ callBack.onSuccess(responseBody);
}
}
-
+ }, new Consumer<Throwable>() {
@Override
- public void onFailure(HDLException e) {
- HDLExceptionSubmitUtils.submit(requestUrl, body, e);
+ public void accept(Throwable throwable) throws Exception {
+ /**
+ * 缃戠粶璇锋眰澶辫触
+ * 鍏蜂綋鍙互鑷繁瀹炵幇
+ */
+ HDLExceptionSubmitUtils.submit(url, null, throwable);
if (callBack != null) {
- callBack.onFailure(e);
- System.out.println("鍥炲->" + requestUrl + "\r\n" + "\"{code=\"" + e.getCode() + "," + "\"message=\"" + e.getMsg() + "}");
+ callBack.onFailure(new HDLException(403, throwable.getMessage()));
}
}
});
-
}
@@ -110,8 +175,20 @@
* @param callBack 鍥炶皟
*/
public Disposable requestHttp(String api, String body, CloudCallBeak<String> callBack) {
- return request(api, body, callBack);
+ return requestPost(api, body, callBack);
}
+
+ /**
+ * 涓婁紶鏂囦欢
+ *
+ * @param api 璇锋眰鎺ュ彛
+ * @param body 璇锋眰鍙傛暟(json)
+ * @param callBack 鍥炶皟
+ */
+ public Disposable uploadingFile(String api, File body, CloudCallBeak<String> callBack) {
+ return requestFilePost(api, body, callBack);
+ }
+
/**
* 璇锋眰鏈嶅姟鍣ㄧ殑鏂规硶(宸插純鐢�)
@@ -142,6 +219,17 @@
}
/**
+ * get鏂规硶璇锋眰
+ *
+ * @param url http鍦板潃
+ * @param cloudCallBeak 鍥炶皟
+ */
+ public void requestHttpGet(String url, CloudCallBeak<String> cloudCallBeak) {
+ this.requestHttpServer(url, cloudCallBeak);
+ }
+
+
+ /**
* 璇锋眰鏈嶅姟鍣ㄧ殑鏂规硶
*
* @param fullUrl 缁濆璇锋眰鍦板潃
@@ -154,20 +242,17 @@
@Override
public void run() {
try {
- HdlLogLogic.print("http->鍙戦��->", fullUrl + "\r\n" + json);
+ 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
- .addHeader("Authorization", UserConfigManage.getInstance().getHeaderPrefix() + UserConfigManage.getInstance().getToken())
- .post(requestBody)
- .build();
+ final Request request = new Request.Builder().url(fullUrl)//璇锋眰鐨剈rl
+ .addHeader("Authorization", UserConfigManage.getInstance().getHeaderPrefix() + UserConfigManage.getInstance().getToken()).post(requestBody).build();
if (isExecute) {
Response response = okHttpClient.newCall(request).execute();//鍚屾
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);
+ HdlLogLogic.print("http---鍥炲---" + response.request().url() + "\r\n" + s, isAddToMemory);
baseSuccessCallBeak.onSuccess(httpResponsePack);
} else {
@@ -180,7 +265,7 @@
call.enqueue(new Callback() {//寮傛
@Override
public void onFailure(@NonNull Call call, @NonNull IOException e) {
- HdlLogLogic.print("http->鍥炲->", "\r\n" + e.getMessage());
+ HdlLogLogic.print("http---鍥炲---" + "\r\n" + e.getMessage(), isAddToMemory);
}
@Override
@@ -190,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);
+ HdlLogLogic.print("http---鍥炲---" + "\r\n" + s, isAddToMemory);
} else {
baseSuccessCallBeak.onFailure(new HDLException(response.code(), response.message()));
}
@@ -199,9 +284,36 @@
}
} catch (Exception e) {
baseSuccessCallBeak.onFailure(new HDLException(-100, e.getMessage()));
- HdlLogLogic.print("http->鍥炲->", "\r\n" + e.getMessage());
+ 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();
}
@@ -230,9 +342,8 @@
* @param json 鎵�鏈夊瓧娈典娇鐢╱rlParameter鎷兼帴锛岄櫎浜哸ppSecret
*/
private String getSign(JsonObject json, String appSecret) {
- String builder = jsonToUrlParameter(json) +
- appSecret;
- return HDLMD5Utils.encodeMD5(builder);
+ String builder = jsonToUrlParameter(json) + appSecret;
+ return Md5Utils.encodeMD5(builder);
}
@@ -263,14 +374,10 @@
* @return -
*/
private boolean IfValueNeedSign(String valueStr) {
- if (TextUtils.isEmpty(valueStr))
- return false;
+ if (TextUtils.isEmpty(valueStr)) return false;
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