2025年02月24日17:22:38

wjc

2025-02-24 d32a308c6f6286669ac5941d1616bfdc9829361e

 app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java

@@ -343,7 +343,7 @@
     *                             ascending:升序),
     * @param installedCapacityMin 最小组串容量(装机容量)
     * @param installedCapacityMax 最大组串容量(装机容量)
     * @param gridType             并网状态 (全部 ："";FULL_GRID ： 并网;OFFLINE ：离网)
     * @param debugStatus             调试状态(全部;调试中;调试完成;已交付;授权调试)
     * @param powerStationStatus   电站状态 (全部  ："";1 ： 正常;2 ： 离线; 3 ： 待接入;4 ： 故障)
     * @param pageNo               页码
     * @param pageSize             页数（一页多少数据）
@@ -353,7 +353,7 @@
            String keyValue,
            String installedCapacityMin,
            String installedCapacityMax,
            String gridType,
            String debugStatus,
            String powerStationStatus,
            long pageNo, long pageSize, CloudCallBeak<HouseBeanClass> cloudCallBeak) {

@@ -376,9 +376,9 @@
            } catch (Exception ignored) {
            }
        }
        if (!TextUtils.isEmpty(gridType)) {
        if (!TextUtils.isEmpty(debugStatus)) {
            try {
                json.addProperty("gridType", gridType);
                json.addProperty("debugStatus", debugStatus);
            } catch (Exception ignored) {
            }
        }
@@ -859,13 +859,16 @@
    /**
     * 切换住宅
     *
     * @param houseIdBean 住宅Id对象
     * @param houseIdBean    住宅Id对象
     * @param checkStationId 表示是否启动检验电站Id的逻辑（true表示检测,否则不检验）
     */
    public void switchHouse(HouseIdBean houseIdBean) {
    public void switchHouse(HouseIdBean houseIdBean, boolean checkStationId) {
        String homeId = UserConfigManage.getInstance().getHomeId();
        if (houseIdBean.getHomeId().equals(homeId)) {
            HdlLogLogic.print("点击同一个住宅--->" + homeId);
            return;
        if (checkStationId) {
            if (houseIdBean.getHomeId().equals(homeId)) {
                HdlLogLogic.print("点击同一个住宅--->" + homeId);
                return;
            }
        }
        //订阅要全部取消
        if (MqttRecvClient.getInstance() != null) {
@@ -887,7 +890,7 @@
        //重新创建住宅文件夹
        HdlFileLogic.getInstance().createDirectory();
        //进去住宅详情搜索一下逆变器列表,目的是建立通讯通道;
        HdlDeviceLogic.getInstance().searchCurrentHomeGateway(houseIdBean.getHomeId(),null);
        HdlDeviceLogic.getInstance().searchCurrentHomeGateway(houseIdBean.getHomeId(), null);
    }


@@ -896,7 +899,8 @@
     *
     * @param homeId 住宅id
     */
    public void getResidenceInverterAllInfo(String homeId, CloudCallBeak<Bitmap> cloudCallBeak) {
    public void getResidenceInverterAllInfo(String
                                                    homeId, CloudCallBeak<Bitmap> cloudCallBeak) {
        String requestUrl = HttpApi.POST_inverter_allInfo;
        JsonObject json = new JsonObject();
        json.addProperty("homeId", homeId);
@@ -926,7 +930,8 @@
     * @param debugPerm     授权状态（true可以继续调试）
     * @param cloudCallBeak -
     */
    public void homeUpdateDebugPerm(String homeId, boolean debugPerm, CloudCallBeak<Boolean> cloudCallBeak) {
    public void homeUpdateDebugPerm(String homeId, boolean debugPerm, CloudCallBeak<
            Boolean> cloudCallBeak) {
        String requestUrl = HttpApi.C_POST_HOME_UPDATEDEBUGPERM;
        JsonObject json = new JsonObject();
        json.addProperty("homeId", homeId);
@@ -950,6 +955,7 @@
        });

    }

    /**
     * 获取电站交付二维码（B端）
     * 描述：安装商电站的交付二维码
@@ -981,6 +987,39 @@

    }


    /**
     * 获取电站交付URl（B端）
     * 描述：安装商电站的交付URl
     *
     * @param homeId        电站id
     * @param cloudCallBeak -
     */
    public void getDeliveryUrl(String homeId, CloudCallBeak<String> cloudCallBeak) {
        String requestUrl = HttpApi.POST_getDeliveryUrl;
        JsonObject json = new JsonObject();
        json.addProperty("homeId", homeId);
//        json.addProperty("zoneType", memberBean.getId());//区域

        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String jsonStr) {
                if (cloudCallBeak != null) {
                    cloudCallBeak.onSuccess(jsonStr);
                }
            }

            @Override
            public void onFailure(HDLException e) {
                if (cloudCallBeak != null) {
                    cloudCallBeak.onFailure(e);
                }
            }
        });

    }


    /**
     * 电站手动交付(B端)
     * 描述：安装商手动交付电站给指定的C端账号
@@ -989,7 +1028,8 @@
     * @param account       C端账号
     * @param cloudCallBeak -
     */
    public void getDeliverToAccount(String homeId, String account, CloudCallBeak<Boolean> cloudCallBeak) {
    public void getDeliverToAccount(String homeId, String
            account, CloudCallBeak<Boolean> cloudCallBeak) {
        String requestUrl = HttpApi.POST_deliverToAccount;
        JsonObject json = new JsonObject();
        json.addProperty("homeId", homeId);
@@ -1013,6 +1053,7 @@
        });

    }

    /**
     * 添加推送Token
     *