diff --git a/app/src/main/java/com/casic/app/safetreecontroller/service/SocketConnectionService.kt b/app/src/main/java/com/casic/app/safetreecontroller/service/SocketConnectionService.kt index 6b115d9..7c11e9f 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/service/SocketConnectionService.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/service/SocketConnectionService.kt @@ -88,7 +88,7 @@ override fun run() { tcpClient.sendMessage(CommandCreator.createMethaneCommand()) // 每3s重复一次 - weakReferenceHandler?.postDelayed(this, 10 * 1000L) + weakReferenceHandler?.postDelayed(this, 3 * 1000L) } } @@ -132,6 +132,8 @@ * 音量减返回:[7, 32, 0, 1, 0, 1, -69, 1, 0, -104, 0, 0, -103] * 语音源切换到本地返回:[7, 32, 0, 1, 0, 1, -69, 1, 0, -112, 1, 0, -110] * 语音源切换到远程返回:[7, 32, 0, 1, 0, 1, -69, 1, 0, -112, 0, 0, -111] + * 设备状态开语音提示返回:[7, 32, 0, 1, 0, 1, -69, 1, 0, -105, 1, 0, -103] + * 设备状态关语音提示返回:[7, 32, 0, 1, 0, 1, -69, 1, 0, -105, 0, 0, -104] * */ if (bytes.size < 6) { Log.d(kTag, "onMessageReceived: 数据异常,长度不够") @@ -149,9 +151,7 @@ } //取数据类型标志位,根据标志位解析不同的数据 - val flag = (bytes[6].toInt() and 0xFF).toString(16).uppercase() - Log.d(kTag, "flag: $flag") - when (flag) { + when ((bytes[6].toInt() and 0xFF).toString(16).uppercase()) { "AA" -> { //甲烷浓度 if (bytes.size == 13) {