mac
2024-01-30 a336b91765728b8b8fb31791cf02e9e70066e00d
2024年01月30日16:40:11

备份一下代码
2个文件已修改
61 ■■■■ 已修改文件
app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java 35 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/internet/HttpClient.java
@@ -47,6 +47,8 @@
    private static volatile HttpClient sHttpClient;
    private static final boolean isAddToMemory=false;
    public static synchronized HttpClient getInstance() {
        if (sHttpClient == null) {
            synchronized (HttpClient.class) {
@@ -70,15 +72,14 @@
     */
    private Disposable requestPost(String api, String body, CloudCallBeak<String> callBack) {
        String requestUrl = HDLCloudUserApi.getRequestUrl(api);
        Gson gson = new Gson();
        System.out.println("http->发送->" + requestUrl + "\r\n" + body);
        HdlLogLogic.print("http->发送->" + requestUrl + "\r\n" + body, isAddToMemory);
        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());
                    System.out.println("http->回复->" + requestUrl + "\r\n" + str);
                    HdlLogLogic.print("http->回复->" + requestUrl + "\r\n" + str, isAddToMemory);
                }
            }
@@ -87,7 +88,7 @@
                HDLExceptionSubmitUtils.submit(requestUrl, body, e);
                if (callBack != null) {
                    callBack.onFailure(e);
                    System.out.println("http->回复->" + requestUrl + "\r\n" + "\"{code=\"" + e.getCode() + "," + "\"message=\"" + e.getMsg() + "}");
                    HdlLogLogic.print("http->回复->" + requestUrl + "\r\n" + "\"{code=\"" + e.getCode() + "," + "\"message=\"" + e.getMsg() + "}", isAddToMemory);
                }
            }
        });
@@ -107,15 +108,14 @@
        String requestUrl = HDLCloudUserApi.getRequestUrl(api);
        Gson gson = new Gson();
        System.out.println("http->发送->" + 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, true);
                    HdlLogLogic.print("http->回复->" + requestUrl + "\r\n" + str, isAddToMemory);
                }
            }
@@ -124,7 +124,7 @@
                HDLExceptionSubmitUtils.submit(requestUrl, body, e);
                if (callBack != null) {
                    callBack.onFailure(e);
                    HdlLogLogic.print("http->回复->" + requestUrl + "\r\n" + "\"{code=\"" + e.getCode() + "," + "\"message=\"" + e.getMsg() + "}", true);
                    HdlLogLogic.print("http->回复->" + requestUrl + "\r\n" + "\"{code=\"" + e.getCode() + "," + "\"message=\"" + e.getMsg() + "}", isAddToMemory);
                }
            }
        });
@@ -241,7 +241,7 @@
            @Override
            public void run() {
                try {
                    HdlLogLogic.print("http->发送->" + fullUrl + "\r\n" + json, false);
                    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
@@ -251,7 +251,7 @@
                        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, false);
                            HdlLogLogic.print("http->回复->" + response.request().url() + "\r\n" + s, isAddToMemory);
                            baseSuccessCallBeak.onSuccess(httpResponsePack);
                        } else {
@@ -264,7 +264,7 @@
                        call.enqueue(new Callback() {//异步
                            @Override
                            public void onFailure(@NonNull Call call, @NonNull IOException e) {
                                HdlLogLogic.print("http->回复->" + "\r\n" + e.getMessage(), false);
                                HdlLogLogic.print("http->回复->" + "\r\n" + e.getMessage(), isAddToMemory);
                            }
                            @Override
@@ -274,7 +274,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, false);
                                    HdlLogLogic.print("http->回复->" + "\r\n" + s, isAddToMemory);
                                } else {
                                    baseSuccessCallBeak.onFailure(new HDLException(response.code(), response.message()));
                                }
@@ -283,7 +283,7 @@
                    }
                } catch (Exception e) {
                    baseSuccessCallBeak.onFailure(new HDLException(-100, e.getMessage()));
                    HdlLogLogic.print("http->回复->" + "\r\n" + e.getMessage(), false);
                    HdlLogLogic.print("http->回复->" + "\r\n" + e.getMessage(), isAddToMemory);
                }
            }
app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java
@@ -17,43 +17,42 @@
    /**
     * java打印
     *
     * @param content 自定义信息描述
     *                默认不加入本地日志
     * @param customizeContentFormat 自定义内容格式
     */
    public static void print(String content) {
        printBase(content, "0", false);
    public static void print(String customizeContentFormat) {
        printBase(customizeContentFormat, "0", false);
    }
    /**
     * java打印
     *
     * @param content   自定义信息描述
     * @param isBoolean 是否加入内存(本地日志用到)
     * @param customizeContentFormat 自定义内容格式
     * @param isAddToMemory          是否加入内存(本地日志用到)
     */
    public static void print(String content, boolean isBoolean) {
        printBase(content, "0", isBoolean);
    public static void print(String customizeContentFormat, boolean isAddToMemory) {
        printBase(customizeContentFormat, "0", isAddToMemory);
    }
    /**
     * java打印
     *
     * @param msg       自定义信息描述
     * @param code      状态码
     * @param isBoolean 是否加入内存(本地日志用到)
     * @param msg           自定义内容格式
     * @param code          状态码
     * @param isAddToMemory 是否加入内存(本地日志用到)
     */
    public static void print(String msg, int code, boolean isBoolean) {
        printBase(msg, code + "", isBoolean);
    public static void print(String msg, int code, boolean isAddToMemory) {
        printBase(msg, code + "", isAddToMemory);
    }
    /**
     * java打印和存储日志
     *
     * @param msg       信息描述
     * @param code      状态
     * @param isBoolean 是否加入内存(本地日志用到)
     * @param msg           信息描述
     * @param code          状态
     * @param isAddToMemory 是否加入内存(本地日志用到)
     */
    private static void printBase(String msg, String code, boolean isBoolean) {
    private static void printBase(String msg, String code, boolean isAddToMemory) {
        if (isPrintLogcat) {
            return;
        }
@@ -63,7 +62,7 @@
        String json = title;
        json += customLogObject.getJointMessage();
        System.out.println(json);
        if (isBoolean) {
        if (isAddToMemory) {
            writeLog(customLogObject.getJointMessage());
        }
    }