Merge branch 'dev' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAP...

hxb

2024-06-25 c660f059d4e07a1b784442a1bbb4a5109b82e837

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

@@ -62,7 +62,40 @@
    }

    /**
     * 请求服务器
     * 请求服务器(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(e);
                    HdlLogLogic.print("http---回复---" + requestUrl + "\r\n" + "\"{code=\"" + e.getCode() + "," + "\"message=\"" + e.getMsg() + "}", isAddToMemory);
                }
            }
        });

    }

    /**
     * 请求服务器(post)
     * 底层方法,引用库的方法
     *
     * @param api      请求接口
@@ -166,9 +199,18 @@
                });
    }

    /**
     * 请求(get)服务器
     *
     * @param requestUrl 请求绝对地址接口
     * @param callBack   回调
     */
    public Disposable requestHttpGet(String requestUrl, CloudCallBeak<String> callBack) {
        return requestGet(requestUrl, callBack);
    }

    /**
     * 请求服务器
     * 请求(post)服务器
     *
     * @param api      请求接口
     * @param body     请求参数(json)
@@ -216,16 +258,6 @@
    @Deprecated
    private void requestFullHttp(String fullUrl, String json, boolean isBasicService, boolean isExecute, BaseSuccessFailureCallBeak baseSuccessCallBeak) {
        this.requestHttpServer(fullUrl, json, isBasicService, isExecute, baseSuccessCallBeak);
    }

    /**
     * get方法请求
     *
     * @param url           http地址
     * @param cloudCallBeak 回调
     */
    public void requestHttpGet(String url, CloudCallBeak<String> cloudCallBeak) {
        this.requestHttpServer(url, cloudCallBeak);
    }