From db21de901bb1bbc6ec66b59e7b0766d0d2c5c6cc Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 16 七月 2019 13:54:44 +0800
Subject: [PATCH] 20190716 1.提供声必可SDK，部分数据处理调整； 2.演示DemoAPP，地热和新风页面调整；
---
hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Parser/DeviceParser.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Parser/DeviceParser.java b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Parser/DeviceParser.java
index 90a070a..6e673ad 100644
--- a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Parser/DeviceParser.java
+++ b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Parser/DeviceParser.java
@@ -104,6 +104,7 @@
* @return
*/
private static boolean isWantData(int bigType, int littleType) {
+// HDLLog.info("isWantData锛歜igType锛�" + bigType + "littleType锛�" + littleType);
boolean isWant;
switch (bigType) {
case Configuration.LIGTH_BIG_TYPE:
@@ -190,6 +191,26 @@
case Configuration.GLOBAL_LOGIC_BIG_TYPE:
switch (littleType) {
case 0:
+ isWant = true;
+ break;
+ default:
+ isWant = false;
+ break;
+ }
+ break;
+ case Configuration.GEOTHERMAL_BIG_TYPE://20190711 鏂板
+ switch (littleType) {
+ case Configuration.GEOTHERMAL_LITTLE_TYPE_0:
+ isWant = true;
+ break;
+ default:
+ isWant = false;
+ break;
+ }
+ break;
+ case Configuration.FRESH_AIR_BIG_TYPE:
+ switch (littleType) {
+ case Configuration.FRESH_AIR_LITTLE_TYPE_0:
isWant = true;
break;
default:
@@ -574,7 +595,7 @@
*/
private static void parseGeothermalData(int littleType, AppliancesInfo appliancesInfo, DevicesData devicesData, String parentRemarks, int channelNum, int port, String ipAddress) {
switch (littleType) {
- case 0:
+ case Configuration.GEOTHERMAL_LITTLE_TYPE_0:
appliancesInfo.setDeviceName("鍦扮儹妯″潡");
appliancesInfo.setDeviceType(HDLApConfig.TYPE_GEOTHERMAL_MODULE);
break;
--
Gitblit v1.8.0