* Replaced sound utility for better sound handling

thanksmister · thanksmister · commit 36b5a7dcab2d · 2018-01-26T17:09:26.000-03:00
* Fixed bug with setting screen timeout to 1 minute (shows as seconds)
* Updated Spanish translations
* Updated Kotlin version
diff --git a/app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/fragments/ScreenSettingsFragment.kt b/app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/fragments/ScreenSettingsFragment.kt
@@ -104,7 +104,7 @@ class ScreenSettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnS
         inactivityPreference!!.setDefaultValue(configuration.inactivityTime)
         inactivityPreference!!.value = configuration.inactivityTime.toString()
 
-        if (configuration.inactivityTime <= SECONDS_VALUE) {
+        if (configuration.inactivityTime < SECONDS_VALUE) {
             inactivityPreference!!.summary = getString(R.string.preference_summary_inactivity_seconds,
                     DateUtils.convertInactivityTime(configuration.inactivityTime))
         } else {
@@ -182,7 +182,7 @@ class ScreenSettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnS
             Configuration.PREF_INACTIVITY_TIME -> {
                 val inactivity = inactivityPreference!!.value!!.toLong()
                 configuration.inactivityTime = inactivity
-                if (inactivity <= SECONDS_VALUE) {
+                if (inactivity < SECONDS_VALUE) {
                     inactivityPreference!!.summary = getString(R.string.preference_summary_inactivity_seconds, DateUtils.convertInactivityTime(inactivity))
                 } else {
                     inactivityPreference!!.summary = getString(R.string.preference_summary_inactivity_minutes, DateUtils.convertInactivityTime(inactivity))
diff --git a/app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/modules/TextToSpeechModule.kt b/app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/modules/TextToSpeechModule.kt
@@ -103,6 +103,7 @@ class TextToSpeechModule( base: Context?, private val configuration: Configurati
         if(textToSpeech != null) {
             textToSpeech?.stop()
             textToSpeech?.shutdown()
+            textToSpeech = null
         }
     }
 }
diff --git a/app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/views/BaseAlarmView.kt b/app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/views/BaseAlarmView.kt
@@ -33,7 +33,8 @@ abstract class BaseAlarmView : LinearLayout {
         super.onFinishInflate()
 
         button0.setOnClickListener {
-            playButtonPress()
+            //playButtonPress()
+            playContinuousBeep()
             addPinCode("0")
         }
 
@@ -116,21 +117,23 @@ abstract class BaseAlarmView : LinearLayout {
 
     fun destroySoundUtils() {
         if (soundUtils != null) {
-            soundUtils!!.destroyBuzzer()
+            soundUtils?.destroyBuzzer()
         }
     }
 
-    fun playButtonPress() {
+    private fun playButtonPress() {
         if (soundUtils == null) {
             soundUtils = SoundUtils(context)
+            soundUtils?.init()
         }
-        soundUtils!!.playBuzzerOnButtonPress()
+        soundUtils?.playBuzzerOnButtonPress()
     }
 
     fun playContinuousBeep() {
         if (soundUtils == null) {
             soundUtils = SoundUtils(context)
-            soundUtils!!.playBuzzerRepeat()
+            soundUtils?.init()
+            soundUtils?.playBuzzerRepeat()
         }
     }
 
diff --git a/app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/utils/SoundUtils.java b/app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/utils/SoundUtils.java
diff --git a/app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/utils/SoundUtils.kt b/app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/utils/SoundUtils.kt
@@ -0,0 +1,86 @@
+package com.thanksmister.iot.mqtt.alarmpanel.utils
+
+import android.content.Context
+import android.content.ContextWrapper
+import android.media.MediaPlayer
+import android.os.Handler
+import android.os.HandlerThread
+import com.thanksmister.iot.mqtt.alarmpanel.R
+import timber.log.Timber
+
+class SoundUtils(base: Context) : ContextWrapper(base) {
+
+    private var speaker: MediaPlayer? = null
+    private var playing: Boolean = false
+    private var repeating: Boolean = false
+
+    private val soundThread: HandlerThread = HandlerThread("buttonSound");
+    private var soundHandler: Handler? = null
+
+    fun init(){
+        Timber.d("init")
+        soundThread.start();
+        soundHandler = Handler(soundThread.looper);
+    }
+
+    fun destroyBuzzer() {
+        Timber.d("destroyBuzzer")
+        soundHandler?.post(Runnable { soundHandler?.removeCallbacks(repeatAudioRunnable) })
+        soundHandler?.post(Runnable { soundHandler?.removeCallbacks(streamAudioRunnable) })
+    }
+
+    fun playBuzzerOnButtonPress() {
+        Timber.d("playBuzzerOnButtonPress")
+        if (repeating) {
+            stopBuzzerRepeat()
+            repeating = false
+        }
+        soundHandler?.post(streamAudioRunnable);
+    }
+
+    private val streamAudioRunnable = Runnable {
+        val speaker = MediaPlayer.create(applicationContext, R.raw.beep)
+        speaker.setOnCompletionListener { mp ->
+            mp.stop()
+            mp.release()
+            playing = false
+        }
+        speaker.start()
+        playing = true
+    }
+
+    private val repeatAudioRunnable = Runnable {
+        Timber.d("repeatAudioRunnable")
+        if(repeating) {
+            speaker = MediaPlayer.create(applicationContext, R.raw.beep_loop)
+            speaker?.setOnCompletionListener { mp ->
+                mp.stop()
+                mp.release()
+            }
+            speaker?.isLooping = true
+            speaker?.start()
+        }
+    }
+
+    private fun stopBuzzerRepeat() {
+        Timber.d("stopBuzzerRepeat")
+        if (speaker != null) {
+            if (speaker!!.isPlaying) {
+                speaker!!.stop()
+            }
+            speaker!!.release()
+        }
+        repeating = false
+        soundHandler?.removeCallbacks(repeatAudioRunnable);
+    }
+
+    private fun repeatBuzzer() {
+        soundHandler?.postDelayed(repeatAudioRunnable, 2000);
+    }
+
+    fun playBuzzerRepeat() {
+        Timber.d("playBuzzerRepeat")
+        repeating = true
+        soundHandler?.post(repeatAudioRunnable);
+    }
+}
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -85,7 +85,7 @@
     <string name="preference_title_web">Página para el sistema de domótica</string>
     <string name="preference_summary_web">Visualiza la página de tu sistema de domótica deslizando la pantalla principal.</string>
     <string name="preference_title_web_url">Dirección del sistema de domótica</string>
-    <string name="preference_summary_web_url">Introduce la dirección Ip de tu sistema de domótica con el prefijo y el puerto si es necesario (ejemplo: http://ipaddress:8123).</string>
+    <string name="preference_summary_web_url">Introduce la dirección Ip de tu sistema de domótica con el prefijo y el puerto si es necesario. (ejemplo: http://ipaddress:8123).</string>
     <string name="preference_web_description">Esta es una prestación experimental. Esa página se renderizará con la versión para Android del navegador Chrome y puede que sea renderizada de diferentes formas, dependiendo de tus versiones del "Android SDK" y "WebView".</string>
 
     <string name="preference_title_notification">Notificaciones</string>
@@ -96,24 +96,24 @@
     <string name="preference_summary_inactivity_minutes">Después de %1$s minuto(s) de inactividad, el brillo de la pantalla disminuye.</string>
 
 
-    <string name="preference_title_notifications">Notificacioness</string>
+    <string name="preference_title_notifications">Notificaciones</string>
     <string name="preference_title_mqtt_notifications">Notificaciones MQTT</string>
-    <string name="preference_summary_mqtt_notifications">Mostrar o hablar las notificacioness MQTT.</string>
+    <string name="preference_summary_mqtt_notifications">Mostrar o hablar las notificaciones MQTT.</string>
 
     <string name="preference_title_alert">Notificaciones de alertas</string>
     <string name="preference_title_system_notifications">Notificaciones del sistema</string>
     <string name="preference_summary_alert">Usa un cuadro de diálogo para mostrar las notificaciones del sistema</string>
 
     <string name="preference_tts_voice"> Voz TTS</string>
     <string name="preference_tts">Notificaciones TTS</string>
-    <string name="preference_summary_tts">Usa el servicio "Google Text-To-Speech" para reproducir el valor de "alarmState" de los mensaje MQTT. (Nota: Requiere Android Lollipop o superior.)</string>
+    <string name="preference_summary_tts">Usa el servicio "Google Text-To-Speech" para reproducir el valor de "alarmState" de los mensajes MQTT. (Nota: Requiere Android Lollipop o superior.)</string>
 
     <string name="preference_tts_topic">TTS Topic</string>
     <string name="preference_tts_topic_title">Esteblece el "Topic Value"</string>
     <string name="preference_tts_topic_summary">Formato de ejemplo para el "message topic" y "alarmState" que será reproducido (ten en cuenta que para reproducir locuciones TTS, se necesitan unos altavoces externos): \n\n"{\"topic\":\"home/notification\", \"payload\":\"Hello!\"}"</string>
 
 
-    <string name="preference_camera">Capturas con la cámara</string>
+    <string name="preference_camera"> Cámara</string>
     <string name="preference_camera_title">Capturas con la cámara</string>
     <string name="preference_camera_summary">Uso de la cámara para la captura de una imagen  y enviarla por email cuando alguien desactiva la alarma. (Nota: Requiere Android Lollipop o superior.)</string>
 
@@ -132,7 +132,7 @@
     <string name="preference_mail_to_summary">Introduce el email de quien recibirá la imagen. Puedes introducir varios destinatarios separados por comas.(ejemplo: "mister@thankmister.com" or "mister@thankmister.com, me@thankmister.com")</string>
 
     <string name="preference_mail_title">Ajustes de Mail Gun</string>
-    <string name="preference_mail_description">Para enviar imágenes por email, necesitar abrir una cuenta en MailGun (mailgun.com) y proporcionar el nombre de dominio y la "api key", así como la dirección email del buzón.</string>
+    <string name="preference_mail_description">Para enviar imágenes por email, necesitas abrir una cuenta en MailGun (mailgun.com) y proporcionar el nombre de dominio y la "api key", así como la dirección email del buzón.</string>
 
     <string name="text_title_system">ALARMA</string>
     <string name="text_titled_disarmed">INACTIVA</string>
@@ -145,8 +145,8 @@
     <string name="toast_alarm_deactivated">¡Alarma desactivada!</string>
     <string name="activity_logs_title">Logs</string>
 
-    <string name="text_arm_home">ACTIVAR MODO "EN CASA"</string>
-    <string name="text_arm_away">ACTIVAR MODO "FUERA DE CASA"</string>
+    <string name="text_arm_home">MODO "EN CASA"</string>
+    <string name="text_arm_away">MODO "FUERA DE CASA"</string>
     <string name="text_system">ALARMA</string>
     <string name="text_disarmed">INACTIVA</string>
     <string name="dialog_alarm_triggered">INTROCUCE EL CÓDIGO PARA ANULAR</string>
@@ -165,7 +165,7 @@
     <string name="mail_subject_text">Enviar sugerencias:</string>
 
     <string name="thanks_mister_title">Thanks, Mister!</string>
-    <string name="designer_developer_text">Diseño y desarrollo</string>
+    <string name="designer_developer_text">Diseño y desarrollo:</string>
     <string name="company_url_text">thanksmister.com</string>
     <string name="company_email">mister@thanksmister.com</string>
     <string name="text_feedback">Sugerencias</string>
@@ -192,7 +192,7 @@
     <string name="progress_location">Estableciendo ubicación…</string>
     <string name="text_error_only_numbers">Asegúrate de que el valor solo contiene números y no está en blanco.</string>
     <string name="text_error_blank_entry">El valor no puede estar en blanco. Por favor, introcuce uno válido.</string>
-    <string name="text_alarm_disabled_email">Tu alarma ha sido desactivada, esta una imagen de ese momento.</string>
+    <string name="text_alarm_disabled_email">Tu alarma ha sido desactivada y esta una imagen de quien lo hizo.</string>
     <string name="text_alarm_disabled_email_subject">Alarma desactivada</string>
     <string name="text_camera_failed_configuration">La configuración de la cámara falló, dispones de cámara?</string>
     <string name="text_camera_failed_session">La captura ha fallado, dispones de cámara?</string>
@@ -243,7 +243,7 @@
     <string name="pref_telegram_token_summary">Ingrese su token de API de Telegram.</string>
     <string name="pref_telegram_chat_id_title">Telegram Chat Id</string>
     <string name="pref_telegram_api_title">Token de API de Telegram</string>
-    <string name="pref_camera_send_image_notes">Puede usar Telegram, Mailgun o ambos para enviar imágenes capturadas.</string>
+    <string name="pref_camera_send_image_notes">Puedes usar Telegram, Mailgun o ambos para enviar imágenes capturadas.</string>
     <string name="menu_item_help">Ayuda</string>
     <string name="error_mailgun_credentials">Hubo un problema al enviar la imagen por correo, compruebe sus credenciales de Mailgun.</string>
 
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.20'
+    ext.kotlin_version = '1.2.21'
     repositories {
         jcenter()
         maven {

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,7 @@ class TextToSpeechModule( base: Context?, private val configuration: Configurati`
`103`	`103`	`if(textToSpeech != null) {`
`104`	`104`	`textToSpeech?.stop()`
`105`	`105`	`textToSpeech?.shutdown()`
	`106`	`+ textToSpeech = null`
`106`	`107`	`}`
`107`	`108`	`}`
`108`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,8 @@ abstract class BaseAlarmView : LinearLayout {`
`33`	`33`	`super.onFinishInflate()`
`34`	`34`
`35`	`35`	`button0.setOnClickListener {`
`36`		`- playButtonPress()`
	`36`	`+ //playButtonPress()`
	`37`	`+ playContinuousBeep()`
`37`	`38`	`addPinCode("0")`
`38`	`39`	`}`
`39`	`40`
`@@ -116,21 +117,23 @@ abstract class BaseAlarmView : LinearLayout {`
`116`	`117`
`117`	`118`	`fun destroySoundUtils() {`
`118`	`119`	`if (soundUtils != null) {`
`119`		`- soundUtils!!.destroyBuzzer()`
	`120`	`+ soundUtils?.destroyBuzzer()`
`120`	`121`	`}`
`121`	`122`	`}`
`122`	`123`
`123`		`- fun playButtonPress() {`
	`124`	`+ private fun playButtonPress() {`
`124`	`125`	`if (soundUtils == null) {`
`125`	`126`	`soundUtils = SoundUtils(context)`
	`127`	`+ soundUtils?.init()`
`126`	`128`	`}`
`127`		`- soundUtils!!.playBuzzerOnButtonPress()`
	`129`	`+ soundUtils?.playBuzzerOnButtonPress()`
`128`	`130`	`}`
`129`	`131`
`130`	`132`	`fun playContinuousBeep() {`
`131`	`133`	`if (soundUtils == null) {`
`132`	`134`	`soundUtils = SoundUtils(context)`
`133`		`- soundUtils!!.playBuzzerRepeat()`
	`135`	`+ soundUtils?.init()`
	`136`	`+ soundUtils?.playBuzzerRepeat()`
`134`	`137`	`}`
`135`	`138`	`}`
`136`	`139`