Merge branch '1.5.2' into dev

wjc

2025-04-09 87cd5df70918e6ba1af849c5f026d3719bfdb1ac

 app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java

@@ -8,14 +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.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.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlESLocalJsonLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.utils.HDLMD5Utils;
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;
@@ -23,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;
@@ -31,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) {
@@ -48,30 +67,287 @@
        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和光伏app代码):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和光伏app代码):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) {
    @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,29 +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);
//                    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)//请求的url
                            .addHeader("Authorization", UserConfigManage.getInstance().getHeaderPrefix() + UserConfigManage.getInstance().getToken())
                            .post(requestBody)
                            .build();
                    final Request request = new Request.Builder().url(fullUrl)//请求的url
                            .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, isAddToMemory);
                            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 {

@@ -111,7 +385,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
@@ -121,18 +395,45 @@
                                    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 Exception());
                                    baseSuccessCallBeak.onFailure(new HDLException(response.code(), response.message()));
                                }
                            }
                        });
                    }
                } catch (Exception e) {
                    baseSuccessCallBeak.onFailure(e);
                    HdlLogLogic.print("http->回复->", "\r\n" + e.getMessage());
                    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();
    }
@@ -161,9 +462,8 @@
     * @param json 所有字段使用urlParameter拼接，除了appSecret
     */
    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);
    }


@@ -194,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 != '[';
    }
}