From 70b949c5918e0bedca464c8f534fc01fc2739991 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期四, 29 六月 2023 17:56:32 +0800 Subject: [PATCH] Merge branch 'hxb' into wjc --- HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLModBusConnect.java | 15 ++++++++------- local.properties | 4 ++-- app/build.gradle | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLModBusConnect.java b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLModBusConnect.java index 241fee5..7067b11 100644 --- a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLModBusConnect.java +++ b/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杞琈odbusResponse寮傚父:"+ 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; diff --git a/app/build.gradle b/app/build.gradle index 3819430..726ffc1 100644 --- a/app/build.gradle +++ b/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 diff --git a/local.properties b/local.properties index 5a78c71..5f60bb5 100644 --- a/local.properties +++ b/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 -- Gitblit v1.8.0