mac
2023-09-28 2c7615cd73dfa6a7ca4df975430d2217524513d2
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -4,15 +4,15 @@
import android.text.TextUtils;
import android.util.Log;
import com.alibaba.fastjson.JSON;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.bean.BaseEventBus;
import com.hdl.photovoltaic.bean.ModBusBean;
import com.hdl.photovoltaic.config.ConstantManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.listener.LinkCallBack;
import com.hdl.photovoltaic.ui.bean.OidBean;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
@@ -100,11 +100,10 @@
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ADD: {
                        //添加设备到云端
                        String mac = getKeyValue("mac", getKeyValue("data", data));
                        HdlDeviceLogic.getInstance().steGatewayParam(mac, new CloudCallBeak<Boolean>() {
                        HdlDeviceLogic.getInstance().setGatewayRemoteParam(mac, new LinkCallBack<Boolean>() {
                            @Override
                            public void onSuccess(Boolean obj) {
                                HdlDeviceLogic.getInstance().editGatewayParam(mac, new CloudCallBeak<Boolean>() {
                                HdlDeviceLogic.getInstance().editGatewayParam(mac, new LinkCallBack<Boolean>() {
                                    @Override
                                    public void onSuccess(Boolean obj) {
                                        GatewayBean gatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(mac);
@@ -124,22 +123,22 @@
                                                    }
                                                    @Override
                                                    public void onFailure(Exception exception) {
                                                        uniCallbackData(null, -100, exception.getMessage(), callback);
                                                    public void onFailure(HDLException e) {
                                                        uniCallbackData(null, -100, e.getMessage(), callback);
                                                    }
                                                });
                                    }
                                    @Override
                                    public void onFailure(Exception exception) {
                                        uniCallbackData(null, -100, exception.getMessage(), callback);
                                    public void onError(HDLLinkException e) {
                                        uniCallbackData(null, -100, e.getMessage(), callback);
                                    }
                                });
                            }
                            @Override
                            public void onFailure(Exception exception) {
                                uniCallbackData(null, -100, exception.getMessage(), callback);
                            public void onError(HDLLinkException e) {
                                uniCallbackData(null, -100, e.getMessage(), callback);
                            }
                        });
@@ -163,22 +162,22 @@
                    }
                    break;
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST: {
                        //
                        HdlResidenceLogic.getInstance().getGatewayList(new CloudCallBeak<Boolean>() {
                        //获取网关设备列表
                        HdlDeviceLogic.getInstance().getLocalGatewayList(new CloudCallBeak<Boolean>() {
                            @Override
                            public void onSuccess(Boolean obj) {
                                if (callback != null) {
                                    uniCallbackData(HDLLinkLocalGateway.getInstance().getGatewayList(), callback);
                                    uniCallbackData(HdlDeviceLogic.getInstance().getGatewayList(), callback);
                                }
                            }
                            @Override
                            public void onFailure(Exception exception) {
                                uniCallbackData(null, -2, exception.getMessage(), callback);
                            public void onFailure(HDLException e) {
                                if (callback != null) {
                                    uniCallbackData(null, -2, e.getMessage(), callback);
                                }
                            }
                        });
                    }
                    break;
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_MODBUS_SEND: {
@@ -190,7 +189,7 @@
                        //添加设备到云端
                        String mac = getKeyValue("mac", getKeyValue("data", data));
                        //获取oid列表
                        HdlDeviceLogic.getInstance().getGatewayOidList(mac, new CloudCallBeak<List<OidBean>>() {
                        HdlDeviceLogic.getInstance().getGatewayOidList(mac, new LinkCallBack<List<OidBean>>() {
                            @Override
                            public void onSuccess(List<OidBean> list) {
                                if (callback != null) {
@@ -199,12 +198,49 @@
                            }
                            @Override
                            public void onFailure(Exception e) {
                            public void onError(HDLLinkException e) {
                                uniCallbackData(null, -2, e.getMessage(), callback);
                            }
                        });
                    }
                    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));