Merge branch 'master' into wjc

wjc

2023-08-21 0a18a8180bc6040c941b07df1be1f7b726b4c155

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

@@ -2,9 +2,11 @@


import android.text.TextUtils;
import android.util.Log;

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;
@@ -28,6 +30,7 @@
import org.json.JSONObject;


import java.util.Arrays;
import java.util.List;

import io.dcloud.feature.unimp.DCUniMPJSCallback;
@@ -182,6 +185,7 @@
                        sendModBus(data, callback);

                    }
                    break;
                    case HDLUniMP.UNI_EVENT_REPLY_DEVICE_OID: {
                        //添加设备到云端
                        String mac = getKeyValue("mac", getKeyValue("data", data));
@@ -200,6 +204,7 @@
                            }
                        });
                    }
                    break;
                }

            } else if (HDLUniMP.UNI_EVENT_REPLY_WIFI_MODEL.equals(event)) {
@@ -251,7 +256,7 @@
//        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("010105021775E400");
            modBusBean.setOid("0101050217BBC400");
        }
        if (modBusBean.getOid() == null || modBusBean.getData() == null) {
            HdlLogLogic.print("内容为空,oid=" + modBusBean.getOid() + " data=" + modBusBean.getData());
@@ -262,7 +267,8 @@
        //发送modbus协议
        HDLModBusConnect.getInstance().Send(modBusBean.getOid(), modBusBean.getData(), new ModbusCallBack() {
            @Override
            public void onSuccess(byte[] data) {
            public void onSuccess(int[] data) {
                Log.d("data", Arrays.toString(data));
                uniCallbackData(data, callback);
            }

@@ -355,6 +361,8 @@
            uniCallBackBaseBean.setData(obj);
            if (callback != null) {
                callback.invoke(getJSONObject(uniCallBackBaseBean));
//                callback.invoke(uniCallBackBaseBean);

            }
        } catch (Exception e) {
            HdlLogLogic.print("uni===组装uni发送数据格式", e.getMessage());