From b8209d15d915f72d9abe3a68b76e1f4cfd21eac3 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期六, 23 九月 2023 14:37:00 +0800
Subject: [PATCH] 2023年09月23日14:36:51
---
app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java | 97 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 82 insertions(+), 15 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 9a4c9ab..fe8fa9b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
+++ b/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
@@ -8,11 +8,20 @@
import com.google.gson.Gson;
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.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;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.listener.BaseSuccessFailureCallBeak;
+import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.utils.HDLMD5Utils;
@@ -23,9 +32,11 @@
import java.util.Map;
import java.util.Objects;
+import io.reactivex.rxjava3.disposables.Disposable;
import okhttp3.Call;
import okhttp3.Callback;
import okhttp3.FormBody;
+import okhttp3.Headers;
import okhttp3.MediaType;
import okhttp3.OkHttpClient;
import okhttp3.Request;
@@ -49,28 +60,85 @@
}
/**
- * 璇锋眰鏈嶅姟鍣ㄧ殑鏂规硶
+ * 璇锋眰鏈嶅姟鍣�
+ * 搴曞眰鏂规硶,寮曠敤搴撶殑鏂规硶
+ *
+ * @param api 璇锋眰鎺ュ彛
+ * @param body 璇锋眰鍙傛暟(appKey,timestamp,sign杩欎笁涓弬鏁板唴閮ㄤ細鑷姩娣诲姞))
+ * @param callBack 鍥炶皟
+ * @return -
+ */
+ private Disposable request(String api, String body, CloudCallBeak<String> callBack) {
+
+
+ String requestUrl = HDLCloudUserApi.getRequestUrl(api);
+ Gson gson = new Gson();
+ System.out.println("鍙戦��->" + requestUrl + "\r\n" + body);
+ 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("鍥炲->" + requestUrl + "\r\n" + gson.fromJson(str, JsonObject.class).toString());
+ System.out.println("鍥炲->" + requestUrl + "\r\n" + str);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ HDLExceptionSubmitUtils.submit(requestUrl, body, e);
+ if (callBack != null) {
+ callBack.onFailure(e);
+ System.out.println("鍥炲->" + requestUrl + "\r\n" + "{code=" + e.getCode() + ",message=" + e.getMessage() + "}");
+ }
+ }
+ });
+
+ }
+
+
+ /**
+ * 璇锋眰鏈嶅姟鍣�
+ *
+ * @param api 璇锋眰鎺ュ彛
+ * @param body 璇锋眰鍙傛暟(json)
+ * @param callBack 鍥炶皟
+ */
+ public Disposable requestHttp(String api, String body, CloudCallBeak<String> callBack) {
+ return request(api, body, callBack);
+ }
+
+ /**
+ * 璇锋眰鏈嶅姟鍣ㄧ殑鏂规硶(宸插純鐢�)
*
* @param requestUrl 璇锋眰鎺ュ彛
* @param json 璇锋眰鏁版嵁
* @param isBasicService 鏄惁鏄熀纭�鏈嶅姟鐨勬帴鍙�(鍩虹鏈嶅姟鐨勬帴鍙ｉ渶瑕� appKey,timestamp,sign杩欎笁涓弬鏁�,褰撲负true鏃�,鍐呴儴浼氳嚜鍔ㄦ坊鍔�)
* @param isExecute 鏄惁鏄悓姝�(true=鍚屾,false=寮傛)
*/
- public void requestHttp(String requestUrl, String json, boolean isBasicService, boolean isExecute, BaseSuccessFailureCallBeak baseSuccessCallBeak) {
+ @Deprecated
+ private void requestHttp(String requestUrl, String json, boolean isBasicService, boolean isExecute, BaseSuccessFailureCallBeak baseSuccessCallBeak) {
String fullUrl = AppConfigManage.getUserRegionUrl() + requestUrl;
- this.requestHttps(fullUrl, json, isBasicService, isExecute, baseSuccessCallBeak);
+ this.requestHttpServer(fullUrl, json, isBasicService, isExecute, baseSuccessCallBeak);
}
/**
- * 璇锋眰鏈嶅姟鍣ㄧ殑鏂规硶(鐩墠鍙敤鍦ㄨ幏鍙栬幏鍙栬处鍙峰尯鍩熶俊鎭�)
+ * 璇锋眰鏈嶅姟鍣ㄧ殑鏂规硶(宸插純鐢�)
+ * 鐩墠鍙敤鍦ㄨ幏鍙栬幏鍙栬处鍙峰尯鍩熶俊鎭�
*
* @param fullUrl 缁濆鍦板潃(鍦板潃+鎺ュ彛)
* @param json 璇锋眰鏁版嵁
* @param isBasicService 鏄惁鏄熀纭�鏈嶅姟鐨勬帴鍙�(鍩虹鏈嶅姟鐨勬帴鍙ｉ渶瑕� appKey,timestamp,sign杩欎笁涓弬鏁�,褰撲负true鏃�,鍐呴儴浼氳嚜鍔ㄦ坊鍔�)
* @param isExecute 鏄惁鏄悓姝�(true=鍚屾,false=寮傛)
*/
- public void requestFullHttp(String fullUrl, String json, boolean isBasicService, boolean isExecute, BaseSuccessFailureCallBeak baseSuccessCallBeak) {
- this.requestHttps(fullUrl, json, isBasicService, isExecute, baseSuccessCallBeak);
+ @Deprecated
+ private void requestFullHttp(String fullUrl, String json, boolean isBasicService, boolean isExecute, BaseSuccessFailureCallBeak baseSuccessCallBeak) {
+ this.requestHttpServer(fullUrl, json, isBasicService, isExecute, baseSuccessCallBeak);
}
/**
@@ -81,18 +149,17 @@
* @param isBasicService 鏄惁鏄熀纭�鏈嶅姟鐨勬帴鍙�(鍩虹鏈嶅姟鐨勬帴鍙ｉ渶瑕� appKey,timestamp,sign杩欎笁涓弬鏁�,褰撲负true鏃�,鍐呴儴浼氳嚜鍔ㄦ坊鍔�)
* @param isExecute 鏄惁鏄悓姝�(true=鍚屾,false=寮傛)
*/
- private void requestHttps(String fullUrl, String json, boolean isBasicService, boolean isExecute, BaseSuccessFailureCallBeak baseSuccessCallBeak) {
+ private void requestHttpServer(String fullUrl, String json, boolean isBasicService, boolean isExecute, BaseSuccessFailureCallBeak baseSuccessCallBeak) {
new Thread(new Runnable() {
@Override
public void run() {
try {
-
HdlLogLogic.print("http->鍙戦��->", fullUrl + "\r\n" + json);
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())
+ .url(fullUrl)//璇锋眰鐨剈rl
+ .addHeader("Authorization", UserConfigManage.getInstance().getHeaderPrefix() + UserConfigManage.getInstance().getToken())
.post(requestBody)
.build();
if (isExecute) {
@@ -100,11 +167,12 @@
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);
baseSuccessCallBeak.onSuccess(httpResponsePack);
- HdlLogLogic.print("http->鍥炲->", response.request().url()+"\r\n" + s);
+
} else {
//throw new IOException("Unexpected code " + response);
- baseSuccessCallBeak.onFailure(new Exception());
+ baseSuccessCallBeak.onFailure(new HDLException(response.code(), response.message()));
}
} else {
@@ -112,7 +180,6 @@
call.enqueue(new Callback() {//寮傛
@Override
public void onFailure(@NonNull Call call, @NonNull IOException e) {
- System.out.println("澶辫触" + e.toString());
HdlLogLogic.print("http->鍥炲->", "\r\n" + e.getMessage());
}
@@ -125,13 +192,13 @@
baseSuccessCallBeak.onSuccess(httpResponsePack);
HdlLogLogic.print("http->鍥炲->", "\r\n" + s);
} else {
- baseSuccessCallBeak.onFailure(new Exception());
+ baseSuccessCallBeak.onFailure(new HDLException(response.code(), response.message()));
}
}
});
}
} catch (Exception e) {
- baseSuccessCallBeak.onFailure(e);
+ baseSuccessCallBeak.onFailure(new HDLException(-100, e.getMessage()));
HdlLogLogic.print("http->鍥炲->", "\r\n" + e.getMessage());
}
--
Gitblit v1.8.0