From 06faee1a8e8e77835968c55203524dcadc787abf Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 07 九月 2021 17:03:52 +0800
Subject: [PATCH] 2021-09-07 1.之前标准空调模块协议是13位，新的空调回复协议变成长度19位 2.增加单独的播放和暂定指令，解决取反问题
---
app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlRGBLightActivity.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
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);
}
});
--
Gitblit v1.8.0