diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt index 69127f5..7486f7f 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt @@ -124,9 +124,9 @@ val weakReferenceHandler = SocketConnectionService.weakReferenceHandler ?: return@setOnCheckedChangeListener if (checkedId == R.id.openVoiceRadioButton) { - SaveKeyValues.putValue(LocaleConstant.OPEN_VOICE_KEY, true) + weakReferenceHandler.sendEmptyMessage(LocaleConstant.OPEN_DEVICE_STATE_TIPS_CODE) } else if (checkedId == R.id.closeVoiceRadioButton) { - SaveKeyValues.putValue(LocaleConstant.OPEN_VOICE_KEY, false) + weakReferenceHandler.sendEmptyMessage(LocaleConstant.CLOSE_DEVICE_STATE_TIPS_CODE) } } } diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt index 69127f5..7486f7f 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt @@ -124,9 +124,9 @@ val weakReferenceHandler = SocketConnectionService.weakReferenceHandler ?: return@setOnCheckedChangeListener if (checkedId == R.id.openVoiceRadioButton) { - SaveKeyValues.putValue(LocaleConstant.OPEN_VOICE_KEY, true) + weakReferenceHandler.sendEmptyMessage(LocaleConstant.OPEN_DEVICE_STATE_TIPS_CODE) } else if (checkedId == R.id.closeVoiceRadioButton) { - SaveKeyValues.putValue(LocaleConstant.OPEN_VOICE_KEY, false) + weakReferenceHandler.sendEmptyMessage(LocaleConstant.CLOSE_DEVICE_STATE_TIPS_CODE) } } } 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 2267f8d..6b115d9 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 @@ -69,6 +69,14 @@ LocaleConstant.CLOSE_METHANE_ALARM_CODE -> { tcpClient.sendMessage(CommandCreator.createCloseAlarmCommand()) } + + LocaleConstant.OPEN_DEVICE_STATE_TIPS_CODE -> { + tcpClient.sendMessage(CommandCreator.createOpenVoiceTipsCommand()) + } + + LocaleConstant.CLOSE_DEVICE_STATE_TIPS_CODE -> { + tcpClient.sendMessage(CommandCreator.createCloseVoiceTipsCommand()) + } } return true } @@ -169,6 +177,15 @@ } } + "91" -> { + //激光状态 + if (bytes[10].toInt() == 1) { + SaveKeyValues.putValue(LocaleConstant.OPEN_METHANE_KEY, true) + } else { + SaveKeyValues.putValue(LocaleConstant.OPEN_METHANE_KEY, false) + } + } + "92" -> { //燃气报警开关 if (bytes[10].toInt() == 1) { @@ -178,12 +195,12 @@ } } - "91" -> { - //激光状态 + "97" -> { + //设备状态语音提示开关 if (bytes[10].toInt() == 1) { - SaveKeyValues.putValue(LocaleConstant.OPEN_METHANE_KEY, true) + SaveKeyValues.putValue(LocaleConstant.OPEN_VOICE_KEY, true) } else { - SaveKeyValues.putValue(LocaleConstant.OPEN_METHANE_KEY, false) + SaveKeyValues.putValue(LocaleConstant.OPEN_VOICE_KEY, false) } } diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt index 69127f5..7486f7f 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt @@ -124,9 +124,9 @@ val weakReferenceHandler = SocketConnectionService.weakReferenceHandler ?: return@setOnCheckedChangeListener if (checkedId == R.id.openVoiceRadioButton) { - SaveKeyValues.putValue(LocaleConstant.OPEN_VOICE_KEY, true) + weakReferenceHandler.sendEmptyMessage(LocaleConstant.OPEN_DEVICE_STATE_TIPS_CODE) } else if (checkedId == R.id.closeVoiceRadioButton) { - SaveKeyValues.putValue(LocaleConstant.OPEN_VOICE_KEY, false) + weakReferenceHandler.sendEmptyMessage(LocaleConstant.CLOSE_DEVICE_STATE_TIPS_CODE) } } } 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 2267f8d..6b115d9 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 @@ -69,6 +69,14 @@ LocaleConstant.CLOSE_METHANE_ALARM_CODE -> { tcpClient.sendMessage(CommandCreator.createCloseAlarmCommand()) } + + LocaleConstant.OPEN_DEVICE_STATE_TIPS_CODE -> { + tcpClient.sendMessage(CommandCreator.createOpenVoiceTipsCommand()) + } + + LocaleConstant.CLOSE_DEVICE_STATE_TIPS_CODE -> { + tcpClient.sendMessage(CommandCreator.createCloseVoiceTipsCommand()) + } } return true } @@ -169,6 +177,15 @@ } } + "91" -> { + //激光状态 + if (bytes[10].toInt() == 1) { + SaveKeyValues.putValue(LocaleConstant.OPEN_METHANE_KEY, true) + } else { + SaveKeyValues.putValue(LocaleConstant.OPEN_METHANE_KEY, false) + } + } + "92" -> { //燃气报警开关 if (bytes[10].toInt() == 1) { @@ -178,12 +195,12 @@ } } - "91" -> { - //激光状态 + "97" -> { + //设备状态语音提示开关 if (bytes[10].toInt() == 1) { - SaveKeyValues.putValue(LocaleConstant.OPEN_METHANE_KEY, true) + SaveKeyValues.putValue(LocaleConstant.OPEN_VOICE_KEY, true) } else { - SaveKeyValues.putValue(LocaleConstant.OPEN_METHANE_KEY, false) + SaveKeyValues.putValue(LocaleConstant.OPEN_VOICE_KEY, false) } } diff --git a/app/src/main/java/com/casic/app/safetreecontroller/utils/CommandCreator.kt b/app/src/main/java/com/casic/app/safetreecontroller/utils/CommandCreator.kt index a71ba93..d4179eb 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/utils/CommandCreator.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/utils/CommandCreator.kt @@ -107,4 +107,18 @@ fun createCloseAlarmCommand(): ByteArray { return byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x92.toByte(), 0x00, 0x00, 0x93.toByte()) } + + /** + * 打开设备语音提示指令 + */ + fun createOpenVoiceTipsCommand(): ByteArray { + return byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x97.toByte(), 0x01, 0x00, 0x99.toByte()) + } + + /** + * 关闭设备语音提示指令 + */ + fun createCloseVoiceTipsCommand(): ByteArray { + return byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x97.toByte(), 0x00, 0x00, 0x98.toByte()) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt index 69127f5..7486f7f 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VoiceSettingsFragment.kt @@ -124,9 +124,9 @@ val weakReferenceHandler = SocketConnectionService.weakReferenceHandler ?: return@setOnCheckedChangeListener if (checkedId == R.id.openVoiceRadioButton) { - SaveKeyValues.putValue(LocaleConstant.OPEN_VOICE_KEY, true) + weakReferenceHandler.sendEmptyMessage(LocaleConstant.OPEN_DEVICE_STATE_TIPS_CODE) } else if (checkedId == R.id.closeVoiceRadioButton) { - SaveKeyValues.putValue(LocaleConstant.OPEN_VOICE_KEY, false) + weakReferenceHandler.sendEmptyMessage(LocaleConstant.CLOSE_DEVICE_STATE_TIPS_CODE) } } } 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 2267f8d..6b115d9 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 @@ -69,6 +69,14 @@ LocaleConstant.CLOSE_METHANE_ALARM_CODE -> { tcpClient.sendMessage(CommandCreator.createCloseAlarmCommand()) } + + LocaleConstant.OPEN_DEVICE_STATE_TIPS_CODE -> { + tcpClient.sendMessage(CommandCreator.createOpenVoiceTipsCommand()) + } + + LocaleConstant.CLOSE_DEVICE_STATE_TIPS_CODE -> { + tcpClient.sendMessage(CommandCreator.createCloseVoiceTipsCommand()) + } } return true } @@ -169,6 +177,15 @@ } } + "91" -> { + //激光状态 + if (bytes[10].toInt() == 1) { + SaveKeyValues.putValue(LocaleConstant.OPEN_METHANE_KEY, true) + } else { + SaveKeyValues.putValue(LocaleConstant.OPEN_METHANE_KEY, false) + } + } + "92" -> { //燃气报警开关 if (bytes[10].toInt() == 1) { @@ -178,12 +195,12 @@ } } - "91" -> { - //激光状态 + "97" -> { + //设备状态语音提示开关 if (bytes[10].toInt() == 1) { - SaveKeyValues.putValue(LocaleConstant.OPEN_METHANE_KEY, true) + SaveKeyValues.putValue(LocaleConstant.OPEN_VOICE_KEY, true) } else { - SaveKeyValues.putValue(LocaleConstant.OPEN_METHANE_KEY, false) + SaveKeyValues.putValue(LocaleConstant.OPEN_VOICE_KEY, false) } } diff --git a/app/src/main/java/com/casic/app/safetreecontroller/utils/CommandCreator.kt b/app/src/main/java/com/casic/app/safetreecontroller/utils/CommandCreator.kt index a71ba93..d4179eb 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/utils/CommandCreator.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/utils/CommandCreator.kt @@ -107,4 +107,18 @@ fun createCloseAlarmCommand(): ByteArray { return byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x92.toByte(), 0x00, 0x00, 0x93.toByte()) } + + /** + * 打开设备语音提示指令 + */ + fun createOpenVoiceTipsCommand(): ByteArray { + return byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x97.toByte(), 0x01, 0x00, 0x99.toByte()) + } + + /** + * 关闭设备语音提示指令 + */ + fun createCloseVoiceTipsCommand(): ByteArray { + return byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x97.toByte(), 0x00, 0x00, 0x98.toByte()) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/safetreecontroller/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/safetreecontroller/utils/LocaleConstant.kt index 016d647..bf3c4b8 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/utils/LocaleConstant.kt @@ -24,6 +24,8 @@ const val OPEN_REMOTE_MODE_CODE = 20240008 const val OPEN_METHANE_ALARM_CODE = 20240009 const val CLOSE_METHANE_ALARM_CODE = 20240010 + const val OPEN_DEVICE_STATE_TIPS_CODE = 20240011 + const val CLOSE_DEVICE_STATE_TIPS_CODE = 20240012 /** * Handler Response Code