2024年12月12日17:25:15

wjc

2024-12-12 0c1949984e4c59d4ae5f2d96c6b7438364642a08

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

@@ -244,16 +244,15 @@
                        }
                    }
                    break;
                    //电站的交付二维码(安装商)
                    case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERYURLQRCODE: {
                        uniGetDeliveryUrlQrcode(type, data, callback);
                    }
                    break;
//                    //电站的交付二维码(安装商)
//                    case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERYURLQRCODE: {
//                        uniGetDeliveryUrlQrcode(type, data, callback);
//                    }
//                    break;
                    //电站的交付URL(安装商)
                    case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERYURL: {
                    case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERYURLQRCODE: {
                        uniGetDeliveryUrl(type, data, callback);
                    }

                    break;
                    //电站手动交付(安装商)
                    case HDLUniMP.UNI_EVENT_REPLY_HOME_DELIVERTOACCOUNT: {
@@ -996,7 +995,14 @@
        HdlResidenceLogic.getInstance().getDeliveryUrl(homeId, new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String obj) {
                uniSuccessCallback(type, obj, callback);
                try {
                    Gson g = new Gson();
                    JsonObject jObject = g.fromJson(obj, JsonObject.class);
                    String deliveryUrl = jObject.get("deliveryUrl").toString();
                    uniSuccessCallback(type, deliveryUrl, callback);
                } catch (Exception ignored) {
                    uniSuccessCallback(type, obj, callback);
                }
            }

            @Override
@@ -2359,8 +2365,9 @@
        HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(homeId, new CloudCallBeak<List<GatewayBean>>() {
            @Override
            public void onSuccess(List<GatewayBean> list) {
                List<GatewayBean> newList = sortLogic(list);
                if (callback != null) {
                    uniSuccessCallback(type, list, callback);
                    uniSuccessCallback(type, newList, callback);
                }
                //EventBus事件分发,进入住宅开始订阅主题
                BaseEventBus baseEventBus = new BaseEventBus();
@@ -2369,7 +2376,7 @@
                baseEventBus.setData(homeId);
                EventBus.getDefault().post(baseEventBus);
                //进来住宅详情都要上传一次oid列表到云端;
                HdlDeviceLogic.getInstance().uploadOidDataToCloud(homeId, list, false, null);
                HdlDeviceLogic.getInstance().uploadOidDataToCloud(homeId, newList, false, null);
            }

            @Override
@@ -2383,6 +2390,31 @@
    }

    /**
     * 进行排序（逆变器-负载中心）
     *
     * @param list 源数据
     * @return 返回列表
     */
    private List<GatewayBean> sortLogic(List<GatewayBean> list) {
        if (list == null || list.size() == 0) {
            return new ArrayList<>();
        }
        List<GatewayBean> newList = new ArrayList<>();
        List<GatewayBean> inverterList = new ArrayList<>();
        List<GatewayBean> lcList = new ArrayList<>();
        for (int i = 0; i < list.size(); i++) {
            if (list.get(i).getSpk().equals(HdlDeviceLogic.getInstance().INVERTER_DEVICE_SPK)) {
                inverterList.add(list.get(i));
            } else {
                lcList.add(list.get(i));
            }
        }
        newList.addAll(inverterList);
        newList.addAll(lcList);
        return newList;
    }

    /**
     * link spk 属性编辑
     *
     * @param data     uni数据