临时版本

hxb

2023-06-29 1379d061ffd9309f8e7e99659e0597d953666418

临时版本

 HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLModBusConnect.java

@@ -85,7 +85,8 @@
                        }
                        byte []data = linkResponse.getByteData();
                        ModbusResponse  modbusResponse= new ModbusResponse();
                        modbusResponse.setTopic("Modbus"+data[0]+data[1]);
                        String topic="Modbus"+data[0]+data[1];
                        modbusResponse.setTopic(topic);
                        modbusResponse.setData(data);
                        String oid = null;
                        //是否是通过主网关透传主题
@@ -102,9 +103,9 @@
                                break;
                            }
                        }
                        EventDispatcher.getInstance().post(allTopic, modbusResponse);
                        EventDispatcher.getInstance().post(topic, modbusResponse);
                        //发布Zigbee原生主题及数据
//                        EventDispatcher.getInstance().post(allTopic, zigbeeResponse);
//                        EventDispatcher.getInstance().post(allTopic, modbusResponse);
                    }
                } catch (Exception e) {
                    LogUtils.e(TAG,"LinkResponse转ModbusResponse异常:"+ e.getMessage());
@@ -139,11 +140,11 @@
        String tempTopic = String.format(TopicConstant.NATIVE_MODBUS_DOWN, gatewayOidOrGatewayId);
        LinkRequest request = new LinkRequest(tempTopic, payload, gatewayBean.getIsLocalEncrypt());

        if ("true".equals(gatewayBean.getMaster())) {
//        if ("true".equals(gatewayBean.getMaster())) {
            request.setCloudTopic(String.format(TopicConstant.NATIVE_MODBUS_DOWN, HDLLinkConfig.getInstance().getGatewayId()));
        } else {
            request.setCloudTopic(String.format(TopicConstant.NATIVE_MODBUS_DOWN_SLAVE, HDLLinkConfig.getInstance().getGatewayId(), gatewayOidOrGatewayId));
        }
//        } else {
//            request.setCloudTopic(String.format(TopicConstant.NATIVE_MODBUS_DOWN_SLAVE, HDLLinkConfig.getInstance().getGatewayId(), gatewayOidOrGatewayId));
//        }
        request.setReplyTopic("Modbus"+payload[0]+payload[1]);
        long timeout = 2 * 1000;


 HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/gateway/HDLLinkLocalGateway.java

@@ -726,7 +726,7 @@
                                      String topic, Object jObject, String sendPath, HDLLinkCallBack callBack) {
        GatewayBean gatewayBean = this.getLocalGateway(mac);
        if (gatewayBean == null) {
            callBack.onError(HDLLinkException.getErrorWithCode(hdlLinkCode));
//            callBack.onError(HDLLinkException.getErrorWithCode(hdlLinkCode));
            return;
        }
        String topicSend = topic.replace("%s", gatewayBean.getOid());

 app/build.gradle

@@ -4,14 +4,14 @@
//必须配置uni
def mfph = [
        //宿主包名
        "apk.applicationId": "com.hdl.photovoltaic",
        "apk.applicationId": "com.hdl.photovoltaic1",
]

android {
    compileSdk 32

    defaultConfig {
        applicationId "com.hdl.photovoltaic"
        applicationId "com.hdl.photovoltaic1"
        minSdk 23
        targetSdk 32
        versionCode 1

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

@@ -276,7 +276,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);
    }

    /**

 local.properties

@@ -4,5 +4,5 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Thu Jun 29 10:54:59 CST 2023
sdk.dir=/Users/wenjucheng/Library/Android/sdk
#Thu Jun 29 15:41:36 CST 2023
sdk.dir=/Users/hdl/Library/Developer/Xamarin/android-sdk-macosx