diff --git a/app/src/main/java/com/idormy/sms/forwarder/entity/action/AlarmSetting.kt b/app/src/main/java/com/idormy/sms/forwarder/entity/action/AlarmSetting.kt index 5f6222b6..aba773cd 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/entity/action/AlarmSetting.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/entity/action/AlarmSetting.kt @@ -5,7 +5,7 @@ import java.io.Serializable data class AlarmSetting( var description: String = "", //描述 var action: String = "stop", //动作: start=启动警报, stop=停止警报 - var volume: Int = 100, //播放音量 - var loopTimes: Int = 5, //循环次数,0=无限循环 + var volume: Int = 80, //播放音量 + var playTimes: Int = 1, //播放次数,0=无限循环 var music: String = "", //音乐文件 ) : Serializable diff --git a/app/src/main/java/com/idormy/sms/forwarder/fragment/action/AlarmFragment.kt b/app/src/main/java/com/idormy/sms/forwarder/fragment/action/AlarmFragment.kt index 67d092de..3bf603c4 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/fragment/action/AlarmFragment.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/fragment/action/AlarmFragment.kt @@ -96,11 +96,11 @@ class AlarmFragment : BaseFragment(), View.OnC binding!!.layoutAlarmSettings.visibility = View.GONE } binding!!.xsbVolume.setDefaultValue(settingVo.volume) - binding!!.xsbLoopTimes.setDefaultValue(settingVo.loopTimes) + binding!!.xsbLoopTimes.setDefaultValue(settingVo.playTimes) binding!!.etMusicPath.setText(settingVo.music) } else { - binding!!.xsbVolume.setDefaultValue(100) - binding!!.xsbLoopTimes.setDefaultValue(5) + binding!!.xsbVolume.setDefaultValue(80) + binding!!.xsbLoopTimes.setDefaultValue(1) } } @@ -250,7 +250,7 @@ class AlarmFragment : BaseFragment(), View.OnC val action = if (binding!!.rgAlarmState.checkedRadioButtonId == R.id.rb_start_alarm) { description.append(getString(R.string.start_alarm)) description.append(", ").append(getString(R.string.alarm_volume)).append(":").append(volume).append("%") - description.append(", ").append(getString(R.string.alarm_loop_times)).append(":").append(loopTimes) + description.append(", ").append(getString(R.string.alarm_play_times)).append(":").append(loopTimes) if (music.isNotEmpty()) { description.append(", ").append(getString(R.string.alarm_music)).append(":").append(music) } diff --git a/app/src/main/java/com/idormy/sms/forwarder/service/ForegroundService.kt b/app/src/main/java/com/idormy/sms/forwarder/service/ForegroundService.kt index 9397412a..1702ceba 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/service/ForegroundService.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/service/ForegroundService.kt @@ -74,7 +74,7 @@ class ForegroundService : Service() { } private var alarmPlayer: MediaPlayer? = null - private var alarmLoopCount = 0 + private var alarmPlayTimes = 0 private val alarmObserver = Observer { alarm -> Log.d(TAG, "Received alarm: $alarm") alarmPlayer?.release() @@ -109,21 +109,22 @@ class ForegroundService : Service() { setOnPreparedListener { Log.d(TAG, "MediaPlayer prepared") start() + alarmPlayTimes++ //更新通知栏 updateNotification(alarm.description, R.drawable.auto_task_icon_alarm, true) } setOnCompletionListener { Log.d(TAG, "MediaPlayer completed") - if (alarm.loopTimes == 0 || alarmLoopCount < alarm.loopTimes) { + if (alarm.playTimes == 0 || alarmPlayTimes < alarm.playTimes) { start() - alarmLoopCount++ + alarmPlayTimes++ } else { stop() reset() release() alarmPlayer = null - alarmLoopCount = 0 + alarmPlayTimes = 0 //恢复音量 audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, currentVolume, 0) //恢复通知栏 diff --git a/app/src/main/res/layout/fragment_tasks_action_alarm.xml b/app/src/main/res/layout/fragment_tasks_action_alarm.xml index 9b586118..fb61c6a6 100644 --- a/app/src/main/res/layout/fragment_tasks_action_alarm.xml +++ b/app/src/main/res/layout/fragment_tasks_action_alarm.xml @@ -130,7 +130,7 @@ Specify Music Optional, download mp3/ogg/wav to the Download directory. Alarm Volume - Loop Times(0=Infinite) + Play Times(0=Infinite) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 2426a053..37f574fc 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1365,5 +1365,5 @@ 指定音乐 可选,下载 mp3/ogg/wav 到 Download 目录 播放音量 - 循环次数(0=无限) + 播放次数(0=无限) diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 72ecf1f2..54ea307a 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1366,5 +1366,5 @@ 指定音樂 可選,下載 mp3/ogg/wav 到 Download 目錄 播放音量 - 循環次數(0=無限) + 播放次數(0=無限) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 87ec5e2e..6c549cb0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1365,5 +1365,5 @@ 指定音乐 可选,下载 mp3/ogg/wav 到 Download 目录 播放音量 - 循环次数(0=无限) + 播放次数(0=无限)