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

hxb

2023-06-30 07671116767c77058b3ce584be161b4b194ec9bd

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

@@ -91,13 +91,14 @@

                }
                if (callback != null) {
                    uniCallbackData(null, "0", "", callback);
                    uniCallbackData(null, callback);
                }
            } else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODEL.equals(event)) {
                //设备模块
                switch (type) {
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ADD: {
                        //添加

                    }
                    break;
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST: {
@@ -105,23 +106,19 @@
                        HdlDeviceLogic.getInstance().searchGateway(new GatewayCallBack() {
                            @Override
                            public void onSuccess(List<GatewayBean> gatewayBeanList) {
                                HDLUniMP.UniCallBackBaseBean callBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
                                callBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_LIST);
                                callBackBaseBean.setData(gatewayBeanList);
//                                sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, callBackBaseBean);
                                uniCallbackData(callBackBaseBean, callback);
                                uniCallbackData(gatewayBeanList, callback);
                            }

                            @Override
                            public void onError(HDLLinkException e) {
                                //发送失败
                                uniCallbackData(null, e.getCode()+"", "", callback);
                                uniCallbackData(null, e.getCode(), "", callback);
                            }
                        });
                    }
                    break;
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND: {
                        sendModBus(data,callback);
                        sendModBus(data, callback);
                    }
                }

@@ -132,14 +129,14 @@
                    case HDLUniMP.UNI_EVENT_REPLY_WIFI_LIST: {
                        //获取wifi列表
                        if (callback != null) {
                            uniCallbackData(wifiUtils.getScanResult(), "0", "", callback);
                            uniCallbackData(wifiUtils.getScanResult(), callback);
                        }
                    }
                    break;
                    case HDLUniMP.UNI_EVENT_REPLY_WIFI_INFO: {
                        //当前wifi详情
                        if (callback != null) {
                            uniCallbackData(wifiUtils.getCurrentConnectWifiInfo(), "0", "", callback);
                            uniCallbackData(wifiUtils.getCurrentConnectWifiInfo(), callback);
                        }
                    }
                    break;
@@ -159,32 +156,35 @@

    /**
     * 发送modbus协议数据
     * @param data modbus数据
     *
     * @param data     modbus数据
     * @param callback 回调
     */
    void sendModBus(Object data,DCUniMPJSCallback callback)
    {
    void sendModBus(Object data, DCUniMPJSCallback callback) {
        String tempData = getKeyValue("data", data);
        if(tempData==null){
        if (tempData == null) {
            LogUtils.i("data内容为空");
            return;
        }
        ModBusBean modBusBean = com.alibaba.fastjson.JSONObject.parseObject(JSON.toJSONString(tempData), ModBusBean.class);
        if(modBusBean.getOid()==null || modBusBean.getData()==null) {
            LogUtils.i("内容为空,oid="+modBusBean.getOid()+" data="+modBusBean.getData());
//        ModBusBean modBusBean = new ModBusBean();
//        modBusBean.setOid("0101050219D44A00");
//        modBusBean.setData(new byte[]{00,01,00,00,00,0x09,00,00,00,01,03,00,00,00,01});
        if (modBusBean.getOid() == null || modBusBean.getData() == null) {
            LogUtils.i("内容为空,oid=" + modBusBean.getOid() + " data=" + modBusBean.getData());
            return;
        }

        //发送modbus协议
        HDLModBusConnect.getInstance().Send(modBusBean.getOid(), modBusBean.getData(), new ModbusCallBack() {
            @Override
            public void onSuccess(byte []data) {
            public void onSuccess(byte[] data) {
                uniCallbackData(data, callback);
            }

            @Override
            public void onError(HDLLinkException e) {
                uniCallbackData(null,e.getCode()+"","失败",callback);
                uniCallbackData(null, e.getCode(), e.getMsg(), callback);
            }
        });
    }
@@ -263,7 +263,7 @@
     * @param msg      结果描述的信息
     * @param callback 回调
     */
    private void uniCallbackData(Object obj, String code, String msg, DCUniMPJSCallback callback) {
    private void uniCallbackData(Object obj, int code, String msg, DCUniMPJSCallback callback) {
        HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
        try {
            uniCallBackBaseBean.setCode(code);
@@ -280,7 +280,7 @@
    }

    private void uniCallbackData(Object obj, DCUniMPJSCallback callback) {
        uniCallbackData(obj,HDLLinkCode.HDL_SUCCESS+"",HDLLinkCode.HDL_SUCCESS.getMsg(),callback);
        uniCallbackData(obj, HDLLinkCode.HDL_SUCCESS.getCode(), HDLLinkCode.HDL_SUCCESS.getMsg(), callback);
    }

    /**