From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java | 370 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 335 insertions(+), 35 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 8d2c3cd..f12c73f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
+++ b/app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
@@ -8,12 +8,28 @@
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.HxHttpConfig;
import com.hdl.hdlhttp.utils.GsonConvert;
-import com.hdl.photovoltaic.bean.ResponsePack;
-import com.hdl.photovoltaic.config.ConfigManagement;
+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.utils.HDLExceptionSubmitUtils;
+import com.hdl.photovoltaic.HDLApp;
+import com.hdl.photovoltaic.R;
+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.utils.HDLMD5Utils;
+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;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
@@ -21,6 +37,8 @@
import java.util.Map;
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;
@@ -29,10 +47,13 @@
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) {
@@ -46,29 +67,285 @@
return sHttpClient;
}
+ public static HDLException getException(HDLException e) {
+ try {
+ String msg = TextUtils.isEmpty(getErrorSting(e.getCode())) ? e.getMsg() : getErrorSting(e.getCode());
+ return new HDLException(e.getCode(), msg, e.getmExtra());
+ } catch (Exception exception) {
+ return e;
+ }
+ }
+
+ private static String getErrorSting(int code) {
+ try {
+ switch (code) {
+ case 1000:
+ return HDLApp.getInstance().getAppLocaleContext().getString(R.string.no_network_connection);
+ case 1001:
+ return HDLApp.getInstance().getAppLocaleContext().getString(R.string.parse_error);
+ case 1002:
+ return HDLApp.getInstance().getAppLocaleContext().getString(R.string.network_error);
+ case 1003:
+ case 1004:
+ return HDLApp.getInstance().getAppLocaleContext().getString(R.string.ssl_error);
+ case 1005:
+ return HDLApp.getInstance().getAppLocaleContext().getString(R.string.timeout_error);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ return "";
+ }
+
/**
- * 璇锋眰鏈嶅姟鍣ㄧ殑鏂规硶
+ * 鑾峰彇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(getException(e));
+ HdlLogLogic.print("http---鍥炲---" + requestUrl + "\r\n" + "\"{code=\"" + e.getCode() + "," + "\"message=\"" + e.getMsg() + "}", isAddToMemory);
+ }
+ }
+ });
+
+ }
+
+ /**
+ * 璇锋眰鏈嶅姟鍣�(post)
+ * 搴曞眰鏂规硶,寮曠敤搴撶殑鏂规硶
+ *
+ * @param api 璇锋眰鎺ュ彛
+ * @param body 璇锋眰鍙傛暟(appKey,timestamp,sign杩欎笁涓弬鏁板唴閮ㄤ細鑷姩娣诲姞))
+ * @param callBack 鍥炶皟
+ * @return -
+ */
+ 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(getException(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);
+// 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(getException(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(url)
+ .headers(HDLSmartHeader.IGNORE_SIGN_HEADER, 1)
+ .build()
+ .download()
+ .subscribe(new Consumer<ResponseBody>() {
+ @Override
+ public void accept(ResponseBody responseBody) throws Exception {
+ if (callBack != null) {
+ callBack.onSuccess(responseBody);
+ }
+ }
+ }, new Consumer<Throwable>() {
+ @Override
+ public void accept(Throwable throwable) throws Exception {
+ /**
+ * 缃戠粶璇锋眰澶辫触
+ * 鍏蜂綋鍙互鑷繁瀹炵幇
+ */
+ HDLExceptionSubmitUtils.submit(url, null, throwable);
+ if (callBack != null) {
+ callBack.onFailure(new HDLException(403, throwable.getMessage()));
+ }
+ }
+ });
+ }
+
+ /**
+ * 璇锋眰(get)鏈嶅姟鍣�
+ *
+ * @param requestUrl 璇锋眰缁濆鍦板潃鎺ュ彛
+ * @param callBack 鍥炶皟
+ */
+ public Disposable requestHttpGet(String requestUrl, CloudCallBeak<String> callBack) {
+ return requestGet(requestUrl, callBack);
+ }
+
+ /**
+ * 璇锋眰(post)鏈嶅姟鍣�
+ *
+ * @param api 璇锋眰鎺ュ彛
+ * @param body 璇锋眰鍙傛暟(json)
+ * @param callBack 鍥炶皟
+ */
+ public Disposable requestHttp(String api, String body, CloudCallBeak<String> 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);
+ }
+
+
+ /**
+ * 璇锋眰鏈嶅姟鍣ㄧ殑鏂规硶(宸插純鐢�)
*
* @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) {
- String fullUrl = ConfigManagement.getUserRegionUrl() + requestUrl;
- this.requestHttps(fullUrl, json, isBasicService, isExecute, baseSuccessCallBeak);
+ @Deprecated
+ private void requestHttp(String requestUrl, String json, boolean isBasicService, boolean isExecute, BaseSuccessFailureCallBeak baseSuccessCallBeak) {
+ String fullUrl = AppConfigManage.getUserRegionUrl() + requestUrl;
+ 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);
}
@@ -80,27 +357,27 @@
* @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, 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", "accessToken")
- .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();
- ResponsePack responsePack = new Gson().fromJson(s, ResponsePack.class);
- baseSuccessCallBeak.onSuccess(responsePack);
+ HttpResponsePack httpResponsePack = new Gson().fromJson(s, HttpResponsePack.class);
+// HdlLogLogic.print("http---鍥炲---" + response.request().url() + "\r\n" + s, isAddToMemory);
+ baseSuccessCallBeak.onSuccess(httpResponsePack);
+
} else {
//throw new IOException("Unexpected code " + response);
- baseSuccessCallBeak.onFailure(new Exception());
+ baseSuccessCallBeak.onFailure(new HDLException(response.code(), response.message()));
}
} else {
@@ -108,7 +385,7 @@
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(), isAddToMemory);
}
@Override
@@ -116,20 +393,48 @@
System.out.println("url杩炴帴淇℃伅" + response.code());
if (response.code() == 200) {
String s = Objects.requireNonNull(response.body()).string();
- ResponsePack responsePack = new Gson().fromJson(s, ResponsePack.class);
- baseSuccessCallBeak.onSuccess(responsePack);
+ HttpResponsePack httpResponsePack = new Gson().fromJson(s, HttpResponsePack.class);
+ baseSuccessCallBeak.onSuccess(httpResponsePack);
+// HdlLogLogic.print("http---鍥炲---" + "\r\n" + s, isAddToMemory);
} 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(), 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();
}
@@ -138,8 +443,8 @@
*/
private String getJson(String json) {
final String timestamp = String.valueOf(System.currentTimeMillis());
- final String appKey = ConfigManagement.getAppKey();
- final String appSecret = ConfigManagement.getAppSecret();
+ final String appKey = AppConfigManage.getAppKey();
+ final String appSecret = AppConfigManage.getAppSecret();
JsonObject jsonObject = new Gson().fromJson(json, JsonObject.class);
if (jsonObject == null) {
jsonObject = new JsonObject();
@@ -157,9 +462,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);
}
@@ -190,14 +494,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