2024年12月23日15:30:07

wjc

2024-12-23 f753d8366041354da60b8096060f3ab5159e3880

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

@@ -124,7 +124,7 @@
     * @return -
     */
    private Disposable requestGet(String requestUrl, CloudCallBeak<String> callBack) {
        HdlLogLogic.print("http---发送---" + requestUrl + "\r\n", isAddToMemory);
//        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
@@ -132,7 +132,7 @@
                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);
//                    HdlLogLogic.print("http---回复---" + requestUrl + "\r\n" + str, isAddToMemory);
                }
            }

@@ -159,7 +159,7 @@
     */
    private Disposable requestPost(String api, String body, CloudCallBeak<String> callBack) {
        String requestUrl = HDLCloudUserApi.getRequestUrl(api);
        HdlLogLogic.print("http---发送---" + requestUrl + "\r\n" + body, isAddToMemory);
//        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
@@ -167,7 +167,7 @@
                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);
//                    HdlLogLogic.print("http---回复---" + requestUrl + "\r\n" + str, isAddToMemory);
                }
            }

@@ -176,7 +176,7 @@
                HDLExceptionSubmitUtils.submit(requestUrl, body, e);
                if (callBack != null) {
                    callBack.onFailure(e);
                    HdlLogLogic.print("http---回复---" + requestUrl + "\r\n" + "\"{code=\"" + e.getCode() + "," + "\"message=\"" + e.getMsg() + "}", isAddToMemory);
//                    HdlLogLogic.print("http---回复---" + requestUrl + "\r\n" + "\"{code=\"" + e.getCode() + "," + "\"message=\"" + e.getMsg() + "}", isAddToMemory);
                }
            }
        });
@@ -196,14 +196,14 @@


        String requestUrl = HDLCloudUserApi.getRequestUrl(api);
        HdlLogLogic.print("http---发送---" + requestUrl + "\r\n" + body, isAddToMemory);
//        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);
//                    HdlLogLogic.print("http---回复---" + requestUrl + "\r\n" + str, isAddToMemory);
                }
            }

@@ -212,7 +212,7 @@
                HDLExceptionSubmitUtils.submit(requestUrl, body, e);
                if (callBack != null) {
                    callBack.onFailure(e);
                    HdlLogLogic.print("http---回复---" + requestUrl + "\r\n" + "\"{code=\"" + e.getCode() + "," + "\"message=\"" + e.getMsg() + "}", isAddToMemory);
//                    HdlLogLogic.print("http---回复---" + requestUrl + "\r\n" + "\"{code=\"" + e.getCode() + "," + "\"message=\"" + e.getMsg() + "}", isAddToMemory);
                }
            }
        });
@@ -328,7 +328,7 @@
            @Override
            public void run() {
                try {
                    HdlLogLogic.print("http---发送---" + fullUrl + "\r\n" + json, isAddToMemory);
//                    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
@@ -338,7 +338,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, isAddToMemory);
//                            HdlLogLogic.print("http---回复---" + response.request().url() + "\r\n" + s, isAddToMemory);
                            baseSuccessCallBeak.onSuccess(httpResponsePack);

                        } else {
@@ -351,7 +351,7 @@
                        call.enqueue(new Callback() {//异步
                            @Override
                            public void onFailure(@NonNull Call call, @NonNull IOException e) {
                                HdlLogLogic.print("http---回复---" + "\r\n" + e.getMessage(), isAddToMemory);
//                                HdlLogLogic.print("http---回复---" + "\r\n" + e.getMessage(), isAddToMemory);
                            }

                            @Override
@@ -361,7 +361,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, isAddToMemory);
//                                    HdlLogLogic.print("http---回复---" + "\r\n" + s, isAddToMemory);
                                } else {
                                    baseSuccessCallBeak.onFailure(new HDLException(response.code(), response.message()));
                                }
@@ -370,7 +370,7 @@
                    }
                } catch (Exception e) {
                    baseSuccessCallBeak.onFailure(new HDLException(-100, e.getMessage()));
                    HdlLogLogic.print("http---回复---" + "\r\n" + e.getMessage(), isAddToMemory);
//                    HdlLogLogic.print("http---回复---" + "\r\n" + e.getMessage(), isAddToMemory);
                }

            }