2020-06-01 1.如果温度为0自动修改为28

JLChen

2020-06-01 f7133566c6608ec831734590e508c70bad95ffe8

2020-06-01 1.如果温度为0自动修改为28

 .bash_profile

 README.md

@@ -2,6 +2,9 @@

HDL XW Android SDK  Copyright (c) 2019 HDL Inc.

SDK 版本：hdl_lib_v1.7.0.20200601_beta
1.如果温度为0自动修改为28

SDK 版本：hdl_lib_v1.6.9.20200316_beta
1.增加小类是3的音乐播放器支持;
2.加地热模块单独控制温度接口，接口自动根据当前模式设置当前模式的温度参数，不需要上层自己判断;(HDLCommand.geothermalCtrlTemp())

 SDK/2020-05-26/hdl_lib_V1.7.0.B10.20200601_beta.aar

Binary files differ

 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>

 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+'

 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];

 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);
                }

            }