From f7133566c6608ec831734590e508c70bad95ffe8 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 01 六月 2020 18:16:12 +0800
Subject: [PATCH] 2020-06-01 1.如果温度为0自动修改为28
---
.bash_profile | 0
hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLAppliances/HDLAirCondition/Parser/AirCtrlParser.java | 13 +++++++++++--
app/src/main/res/values/strings.xml | 2 +-
hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java | 10 +++-------
hdl_core/build.gradle | 18 ++++++++++++++++--
SDK/2020-05-26/hdl_lib_V1.7.0.B10.20200601_beta.aar | 0
README.md | 3 +++
7 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/.bash_profile b/.bash_profile
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.bash_profile
diff --git a/README.md b/README.md
index 1e3026a..a07ba20 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,9 @@
HDL XW Android SDK Copyright (c) 2019 HDL Inc.
+SDK 鐗堟湰锛歨dl_lib_v1.7.0.20200601_beta
+1.濡傛灉娓╁害涓�0鑷姩淇敼涓�28
+
SDK 鐗堟湰锛歨dl_lib_v1.6.9.20200316_beta
1.澧炲姞灏忕被鏄�3鐨勯煶涔愭挱鏀惧櫒鏀寔;
2.鍔犲湴鐑ā鍧楀崟鐙帶鍒舵俯搴︽帴鍙ｏ紝鎺ュ彛鑷姩鏍规嵁褰撳墠妯″紡璁剧疆褰撳墠妯″紡鐨勬俯搴﹀弬鏁帮紝涓嶉渶瑕佷笂灞傝嚜宸卞垽鏂�;(HDLCommand.geothermalCtrlTemp())
diff --git a/SDK/2020-05-26/hdl_lib_V1.7.0.B10.20200601_beta.aar b/SDK/2020-05-26/hdl_lib_V1.7.0.B10.20200601_beta.aar
new file mode 100644
index 0000000..ec68e48
--- /dev/null
+++ b/SDK/2020-05-26/hdl_lib_V1.7.0.B10.20200601_beta.aar
Binary files differ
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1024b92..ca62daf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
<resources>
<string name="app_name">HDL_SDK</string>
- <string name="app_version">hdl_lib_v1.6.6.20200305_beta</string>
+ <string name="app_version">hdl_lib_v1.7.0.20200601_beta</string>
<string name="btn_save">淇濆瓨</string>
<string name="et_subnetid_hint">瀛愮綉鍙凤紙鑼冨洿0 - 254锛�</string>
<string name="et_deviceid_hint">璁惧鍙峰彿锛堣寖鍥�0 - 254锛�</string>
diff --git a/hdl_core/build.gradle b/hdl_core/build.gradle
index a9ba645..5eda957 100644
--- a/hdl_core/build.gradle
+++ b/hdl_core/build.gradle
@@ -6,8 +6,8 @@
defaultConfig {
minSdkVersion 17
targetSdkVersion 28
- versionCode 1
- versionName "1.0.7"
+ versionCode 10
+ versionName "1.7.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -20,12 +20,26 @@
}
buildToolsVersion '28.0.3'
+ /**
+ * 鎵撳寘鑷姩鍛藉悕
+ */
+ android.libraryVariants.all { variant ->
+ variant.outputs.all {
+ outputFileName = "hdl_lib_V" +
+ defaultConfig.versionName + ".B" + defaultConfig.versionCode + "." + releaseTime() + "_beta.aar"
+ }
+ }
+
// lintOptions {
// abortOnError false
// warning 'InvalidPackage'
// }
}
+def releaseTime() {
+ return new Date().format("yyyyMMdd")
+}
+
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:appcompat-v7:28+'
diff --git a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLAppliances/HDLAirCondition/Parser/AirCtrlParser.java b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLAppliances/HDLAirCondition/Parser/AirCtrlParser.java
index b31e4db..fdd542d 100644
--- a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLAppliances/HDLAirCondition/Parser/AirCtrlParser.java
+++ b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLAppliances/HDLAirCondition/Parser/AirCtrlParser.java
@@ -122,7 +122,11 @@
/**
* 鐢熸垚榛樿鏁版嵁
- *
+ * 0 寮�鍏崇姸鎬�
+ * 1 妯″紡
+ * 2 娓╁害
+ * 3 椋庨��
+ * 4
* @return
*/
public static byte[] getNewAcByte() {
@@ -138,7 +142,7 @@
public static byte[] getAcAddByte(AppliancesInfo appliancesInfo, int type, int state) {
try {
- AppliancesInfo newInfo = null;
+ AppliancesInfo newInfo = appliancesInfo;
byte[] airBytes = null;
outter:
for (int i = 0; i < HDLDeviceManager.devicesDataList.size(); i++) {
@@ -163,6 +167,11 @@
byte[] addBytes = new byte[13];
if (airBytes != null && airBytes.length >= 6) {
+ //2020-05-28 濡傛灉娓╁害涓�0鑷姩淇敼涓�28
+ if((airBytes[2] & 0xff) == 0){
+ airBytes[2] = (byte)28;
+ }
+
addBytes[0] = (byte) newInfo.getChannelNum();
addBytes[1] = 0;
addBytes[2] = airBytes[4];
diff --git a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java
index 2ed4b1f..d64cb57 100644
--- a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java
+++ b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java
@@ -285,15 +285,11 @@
if (info.getDeviceType() == HDLApConfig.TYPE_AC_PANEL) {
addSendData(info, AirCtrlParser.getAirPanelAddByte(type, state), Configuration.CONTROL);
} else {
- if (AirCtrlParser.getAcAddByte(info, type, state) != null) {
- byte[] airbytes = AirCtrlParser.getAcAddByte(info, type, state);
-// String airString = "鍙戦�佺殑HVAC bytes:";
-// for(int i = 0;i<airbytes.length;i++){
-// airString += (airbytes[i] & 0xff) +",";
-// }
-// HDLLog.info(airString);
+ byte[] airbytes = AirCtrlParser.getAcAddByte(info, type, state);
+ if (airbytes != null) {
addSendData(info, airbytes, Configuration.CONTROL);
}
+
}
--
Gitblit v1.8.0