README.md | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/build.gradle | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlCCTLightActivity.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlRGBLightActivity.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
app/src/main/res/values/strings.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
hdl_core/build.gradle | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
README.md
@@ -2,6 +2,10 @@ HDL XW Android SDK Copyright (c) 2019 HDL Inc. SDK 版本:hdl_lib_v1.7.2.20201020_beta 1.增加RGB和CCT灯设备支持 SDK 版本:hdl_lib_v1.7.0.20200601_beta 1.如果温度为0自动修改为28 app/build.gradle
@@ -8,7 +8,7 @@ minSdkVersion 17 targetSdkVersion 28 versionCode 1 versionName "1.0.1" versionName "1.0.2" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlCCTLightActivity.java
@@ -65,7 +65,7 @@ mCCTBackInfo = new CCTBackInfo(appliancesInfo); //读取状态 HDLCommand.getRGBCCTStateFromNetwork(appliancesInfo); HDLCommand.getRgbOrCctStateFromNetwork(appliancesInfo); } app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlRGBLightActivity.java
@@ -1,6 +1,7 @@ package com.hdl.sdk.hdl_sdk.activity; import android.os.Bundle; import android.text.TextUtils; import android.view.View; import android.widget.Button; import android.widget.EditText; @@ -61,7 +62,7 @@ mRGBBackInfo = new RGBBackInfo(appliancesInfo); //读取状态 HDLCommand.getRGBCCTStateFromNetwork(appliancesInfo); HDLCommand.getRgbOrCctStateFromNetwork(appliancesInfo); } @@ -101,16 +102,19 @@ btnRGB.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { int rStatus = Integer.parseInt(etR.getText().toString()); int gStatus = Integer.parseInt(etG.getText().toString()); int bStatus = Integer.parseInt(etB.getText().toString()); if (rStatus < 0 || rStatus > 255 || gStatus < 0 || gStatus > 255 || bStatus < 0 || bStatus > 255) { showToast("RGB值范围 0~255"); return; if (TextUtils.isEmpty(etR.getText().toString()) || TextUtils.isEmpty(etG.getText().toString()) || TextUtils.isEmpty(etB.getText().toString())) { showToast("RGB值 不能为空"); } else { int rStatus = Integer.parseInt(etR.getText().toString()); int gStatus = Integer.parseInt(etG.getText().toString()); int bStatus = Integer.parseInt(etB.getText().toString()); if (rStatus < 0 || rStatus > 255 || gStatus < 0 || gStatus > 255 || bStatus < 0 || bStatus > 255) { showToast("RGB值范围 0~255"); return; } int brightness = settingBrightness == 0 ? 100 : settingBrightness; HDLCommand.lightRGBCtrl(appliancesInfo, brightness, rStatus, gStatus, bStatus); } int brightness = settingBrightness == 0 ? 100 : settingBrightness; HDLCommand.lightRGBCtrl(appliancesInfo, brightness, rStatus, gStatus, bStatus); } }); 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.7.1.20200624_beta</string> <string name="app_version">hdl_lib_v1.7.2.20201020_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
@@ -7,7 +7,7 @@ minSdkVersion 17 targetSdkVersion 28 versionCode 11 versionName "1.7.1" versionName "1.7.2" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java
@@ -1350,7 +1350,7 @@ * * @param info */ public static void getRGBCCTStateFromNetwork(final AppliancesInfo info) { public static void getRgbOrCctStateFromNetwork(final AppliancesInfo info) { if (info == null) { return; } @@ -1362,7 +1362,7 @@ addSendData(info, new byte[]{(byte) info.getChannelNum()}, Configuration.STATE); break; default: HDLLog.info("不是安防模块"); HDLLog.info("不是RGB或者CCT 设备"); break; } }