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.增加单独的播放和暂定指令，解决取反问题
---
hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLAppliances/HDLAirCondition/Parser/AirCtrlParser.java | 4 ++--
app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlAirActivity.java | 2 +-
app/src/main/res/layout/activity_audio.xml | 15 +++++++++++++--
hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java | 10 ++++++++++
hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLAppliances/HDLAudio/HDLAudio.java | 2 ++
app/src/main/java/com/hdl/sdk/hdl_sdk/activity/AudioActivity.java | 4 ++--
6 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/AudioActivity.java b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/AudioActivity.java
index ff0d885..2e6ec87 100644
--- a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/AudioActivity.java
+++ b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/AudioActivity.java
@@ -94,14 +94,14 @@
playPauseBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- HDLCommand.audioCtrl(appliancesInfo, HDLAudio.SET_AUDIO_PLAYPAUSE);
+ HDLCommand.audioCtrl(appliancesInfo, HDLAudio.SET_AUDIO_PLAY);
}
});
playStopBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- HDLCommand.audioCtrl(appliancesInfo, HDLAudio.SET_AUDIO_PLAYSTOP);
+ HDLCommand.audioCtrl(appliancesInfo, HDLAudio.SET_AUDIO_STOP);
}
});
diff --git a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlAirActivity.java b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlAirActivity.java
index 2cf3ba5..0aa295d 100644
--- a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlAirActivity.java
+++ b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlAirActivity.java
@@ -638,6 +638,6 @@
*/
private void tv_mesSetText(String mes) {
airText.setText(mes);
- showToast(mes);
+// showToast(mes);
}
}
diff --git a/app/src/main/res/layout/activity_audio.xml b/app/src/main/res/layout/activity_audio.xml
index 2fd6adb..c043f0d 100644
--- a/app/src/main/res/layout/activity_audio.xml
+++ b/app/src/main/res/layout/activity_audio.xml
@@ -22,17 +22,28 @@
android:layout_height="wrap_content"
android:text="鑾峰彇褰撳墠姝屾洸淇℃伅" />
+<!-- <Button-->
+<!-- android:id="@+id/playpause"-->
+<!-- android:layout_width="wrap_content"-->
+<!-- android:layout_height="wrap_content"-->
+<!-- android:text="鎾斁/鏆傚仠" />-->
+
+<!-- <Button-->
+<!-- android:id="@+id/playstop"-->
+<!-- android:layout_width="wrap_content"-->
+<!-- android:layout_height="wrap_content"-->
+<!-- android:text="鎾斁/鍋滄" />-->
<Button
android:id="@+id/playpause"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鎾斁/鏆傚仠" />
+ android:text="鎾斁" />
<Button
android:id="@+id/playstop"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鎾斁/鍋滄" />
+ android:text="鍋滄" />
</LinearLayout>
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 70f0fc3..86f628e 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
@@ -192,8 +192,8 @@
&& HDLDeviceManager.devicesDataList.get(i).getAppliancesInfoList().get(j).getDeviceType() != HDLApConfig.TYPE_AC_PANEL
&& appliancesInfo.getChannelNum() == HDLDeviceManager.devicesDataList.get(i).getAppliancesInfoList().get(j).getChannelNum()) {
newInfo = HDLDeviceManager.devicesDataList.get(i).getAppliancesInfoList().get(j);
-
- if (newInfo.getArrCurState() == null || newInfo.getArrCurState().length != 13) {
+ //2021-09-07 涔嬪墠鏍囧噯绌鸿皟妯″潡鍗忚鏄�13浣嶏紝鏂扮殑绌鸿皟鍥炲鍗忚鍙樻垚闀垮害19浣嶏紝澧炲姞鍏煎澶勭悊
+ if (newInfo.getArrCurState() == null || newInfo.getArrCurState().length < 13) {
newInfo.setArrCurState(getNewAcByte());
}
airBytes = newInfo.getArrCurState();
diff --git a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLAppliances/HDLAudio/HDLAudio.java b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLAppliances/HDLAudio/HDLAudio.java
index aff1911..b5445a8 100644
--- a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLAppliances/HDLAudio/HDLAudio.java
+++ b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLAppliances/HDLAudio/HDLAudio.java
@@ -59,6 +59,8 @@
public static final int GET_AUDIO_CURRRENT_INFO = 210;
public static final int SET_NEXT_LIST = 211;
public static final int SET_PRE_LIST = 212;
+ public static final int SET_AUDIO_PLAY = 213;//2021-09-07 澧炲姞鍗曠嫭鐨勬挱鏀惧拰鏆傚畾鎸囦护锛岃В鍐冲彇鍙嶉棶棰�
+ public static final int SET_AUDIO_STOP = 214;//鏆傚仠
public static final int TEXT = 300;
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 91ad04a..ca1710f 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
@@ -846,6 +846,16 @@
int command;
int sourceId = info.getIntCurState();
switch (type) {
+ case HDLAudio.SET_AUDIO_PLAY://2021-09-07 澧炲姞鍗曠嫭鐨勬挱鏀惧拰鏆傚畾鎸囦护锛岃В鍐冲彇鍙嶉棶棰�
+ command = Configuration.AUDIO_CTRL_READ_COMMAND;
+ musicBytes = StringUtil.GetMusicBytes("*S" +sourceId + "PLAY");
+// musicBytes = new byte[]{0x2A, 0x53, 0x31, 0x50, 0x4C, 0x41, 0x59, 0x0D};
+ break;
+ case HDLAudio.SET_AUDIO_STOP://2021-09-07 澧炲姞鍗曠嫭鐨勬挱鏀惧拰鏆傚畾鎸囦护锛岃В鍐冲彇鍙嶉棶棰�
+ command = Configuration.AUDIO_CTRL_READ_COMMAND;
+ musicBytes = StringUtil.GetMusicBytes("*S" +sourceId + "STOP");
+// musicBytes = new byte[]{0x2A, 0x53, 0x31, 0x53, 0x54, 0x4F, 0x50, 0x0D};
+ break;
case HDLAudio.SET_AUDIO_PLAYSTOP:
command = Configuration.AUDIO_CTRL_READ_COMMAND;
// musicBytes = new byte[]{0x2A, 0x53, 0x31, 0x50, 0x4C, 0x41, 0x59, 0x53, 0x54, 0x4F, 0x50, 0x0D};
--
Gitblit v1.8.0