2025年08月20日13:31:14

wjc

昨天 59340c0b9107c813d6b3a5c953d693212485ad11

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

@@ -401,6 +401,11 @@
                        this.uniDeleteOid(mode_type, data, callback);
                    }
                    break;
                    //设备清空运行数据
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_clear_data: {
                        this.uniDeviceClearData(mode_type, data, callback);
                    }
                    break;
                }

            } else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(topic)) {
@@ -817,6 +822,11 @@

                    }
                    break;
                    //设备定位
                    case HDLUniMP.UNI_EVENT_REPLY_OTHER_GET_DEVICE_LOCATION: {
                       this.uniGetDeviceFind(mode_type, data, TopicApi.DELETING_GATEWAY_FIND, callback);;
                    }
                    break;
                }
            } else if (HDLUniMP.UNI_EVENT_REPLY_NO_WORK_MODEL.equals(topic)) {
                //无网模式
@@ -965,6 +975,49 @@
            @Override
            public void onError(HDLLinkException e) {

                if (callback != null) {
                    uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
                }
            }
        });
    }

    /**
     * 设备定位
     */
    private void uniGetDeviceFind(String type, Object data, String TopicApi, DCUniMPJSCallback callback) {
        String mac = getKeyValue("mac", getKeyValue("data", data));
        JsonArray jsonArray = new JsonArray();
        JsonObject jObject = null;
        String attribute_data = getKeyValue("attribute_data", getKeyValue("data", data));
        if (!TextUtils.isEmpty(attribute_data)) {
            try {
                jObject = new Gson().fromJson(attribute_data, JsonObject.class);
            } catch (Exception ignored) {
                jObject = new JsonObject();
            }
        }
        jsonArray.add(jObject);
        TcpClient.getInstance().sendDataToLinkGateway(mac, false, TopicApi, jsonArray, "", new HDLLinkCallBack() {
            @Override
            public void onSuccess(String s) {
                if (callback != null) {
                    try {
                        if (s.startsWith("{")) {
                            uniSuccessCallback(type, new Gson().fromJson(s, JsonObject.class), callback);
                        } else if (s.startsWith("[")) {
                            uniSuccessCallback(type, new Gson().fromJson(s, JsonArray.class), callback);
                        } else {
                            uniSuccessCallback(type, s, callback);
                        }
                    } catch (Exception e) {
                        uniSuccessCallback(type, s, callback);
                    }
                }
            }

            @Override
            public void onError(HDLLinkException e) {
                if (callback != null) {
                    uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
                }
@@ -2525,15 +2578,15 @@
            if (gatewayBean == null) {
                continue;
            }
            if (gatewayBean.getSpk().equals(HdlDeviceLogic.getInstance().INVERTER_DEVICE_SPK)
                    || gatewayBean.getSpk().equals(HdlDeviceLogic.getInstance().OFF_INVERTER_OG_SPK)) {
                if (gatewayBean.isActivate()) {
            if (gatewayBean.isActivate()) {
                if (gatewayBean.getSpk().equals(HdlDeviceLogic.getInstance().INVERTER_DEVICE_SPK)
                        || gatewayBean.getSpk().equals(HdlDeviceLogic.getInstance().OFF_INVERTER_OG_SPK)) {
                    inverterList.add(gatewayBean);
                } else {
                    inverterUnactivatedList.add(gatewayBean);
                    lcList.add(gatewayBean);
                }
            } else {
                lcList.add(gatewayBean);
                inverterUnactivatedList.add(gatewayBean);
            }
        }
        newList.addAll(inverterUnactivatedList);
@@ -2902,6 +2955,28 @@
        });
    }

    /**
     * 设备清空运行数据
     *
     * @param type     类型
     * @param data     uni请求数据
     * @param callback uni回调
     */
    public void uniDeviceClearData(String type, Object data, DCUniMPJSCallback callback) {
        String mac = getKeyValue("mac", getKeyValue("data", data));
        HdlDeviceLogic.getInstance().DeviceClearData(mac, new LinkCallBack<Boolean>() {
            @Override
            public void onSuccess(Boolean obj) {
                uniSuccessCallback(type, obj, callback);
            }

            @Override
            public void onError(HDLLinkException e) {
                uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
            }
        });
    }


    /**
     * 发送modbus协议数据