2023年09月28日11:38:24

mac

2023-09-28 2c7615cd73dfa6a7ca4df975430d2217524513d2

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

@@ -6,7 +6,6 @@

import com.google.gson.Gson;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.google.gson.JsonObject;
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.bean.BaseEventBus;
import com.hdl.photovoltaic.bean.ModBusBean;
@@ -205,6 +204,43 @@
                        });
                    }
                    break;
                    //设备时间读取
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_TIME: {
                        //添加设备到云端
                        String mac = getKeyValue("mac", getKeyValue("data", data));
                        //获取oid列表
                        HdlDeviceLogic.getInstance().getGatewayTime(mac, new LinkCallBack<Boolean>() {
                            @Override
                            public void onSuccess(Boolean obj) {

                            }

                            @Override
                            public void onError(HDLLinkException e) {

                            }
                        });
                    }
                    //设备时间编辑
                    break;
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_TIME_EDIT: {
                        //添加设备到云端
                        String mac = getKeyValue("mac", getKeyValue("data", data));
                        //获取oid列表
                        HdlDeviceLogic.getInstance().getGatewayOidList(mac, new LinkCallBack<List<OidBean>>() {
                            @Override
                            public void onSuccess(List<OidBean> obj) {

                            }

                            @Override
                            public void onError(HDLLinkException e) {

                            }
                        });
                    }
                    break;

                }

            } else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(event)) {
@@ -255,17 +291,17 @@
//        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 (TextUtils.isEmpty(modBusBean.getOid())) {
            modBusBean.setOid("0101050217BBC400");
        }
        if (modBusBean.getOid() == null || modBusBean.getData() == null) {
            HdlLogLogic.print("内容为空,oid=" + modBusBean.getOid() + " data=" + modBusBean.getData());
//        if (TextUtils.isEmpty(modBusBean.getOid())) {
//            modBusBean.setOid("0101050217BBC400");
//        }
        if (modBusBean.getMac() == null || modBusBean.getData() == null) {
            HdlLogLogic.print("内容为空,oid=" + modBusBean.getMac() + " data=" + modBusBean.getData());
            return;
        }


        //发送modbus协议
        HDLModBusConnect.getInstance().Send(modBusBean.getOid(), modBusBean.getData(), new ModbusCallBack() {
        HDLModBusConnect.getInstance().Send(modBusBean.getMac(), modBusBean.getData(), new ModbusCallBack() {
            @Override
            public void onSuccess(int[] data) {
                Log.d("data", Arrays.toString(data));