From 1884d3f3eba4c5193e0a5f71853c42ef9cd131b8 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 20 十月 2020 16:10:14 +0800
Subject: [PATCH] 2020-10-20 1.更新
---
app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlRGBLightActivity.java | 24 ++++++++++++++----------
app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlCCTLightActivity.java | 2 +-
app/src/main/res/values/strings.xml | 2 +-
hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java | 4 ++--
hdl_core/build.gradle | 2 +-
README.md | 4 ++++
app/build.gradle | 2 +-
7 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/README.md b/README.md
index a07ba20..ee8bc73 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,10 @@
HDL XW Android SDK Copyright (c) 2019 HDL Inc.
+SDK 鐗堟湰锛歨dl_lib_v1.7.2.20201020_beta
+1.澧炲姞RGB鍜孋CT鐏澶囨敮鎸�
+
+
SDK 鐗堟湰锛歨dl_lib_v1.7.0.20200601_beta
1.濡傛灉娓╁害涓�0鑷姩淇敼涓�28
diff --git a/app/build.gradle b/app/build.gradle
index 54a2dc1..a0cc534 100644
--- a/app/build.gradle
+++ b/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 {
diff --git a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlCCTLightActivity.java b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlCCTLightActivity.java
index 855ceed..1baa496 100644
--- a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlCCTLightActivity.java
+++ b/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);
}
diff --git a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlRGBLightActivity.java b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlRGBLightActivity.java
index 2301288..ed268f7 100644
--- a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlRGBLightActivity.java
+++ b/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);
}
});
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b7a6352..99f5862 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.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>
diff --git a/hdl_core/build.gradle b/hdl_core/build.gradle
index 5bb8c96..603de30 100644
--- a/hdl_core/build.gradle
+++ b/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"
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 e1a3746..61ee5a6 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
@@ -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鎴栬�匔CT 璁惧");
break;
}
}
--
Gitblit v1.8.0