Skip to content

Add configurable music auto-ducking settings #555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Alex-XVS wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add configurable music auto-ducking settings #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f042221
Add configurable music auto-ducking
Alex-XVS Jul 15, 2026
5172f5e
Add configurable music auto-ducking
Alex-XVS Jul 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions app/src/main/java/com/cooper/wheellog/AppConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,22 @@ class AppConfig(var context: Context): KoinComponent {
get() = getValue(R.string.use_stop_music, false)
set(value) = setValue(R.string.use_stop_music, value)

var stopMusicSpeed: Int
get() = getValue("stop_music_speed", 10)
set(value) = setValue("stop_music_speed", value)

var stopMusicLowVolume: Int
get() = getValue("stop_music_low_volume", 5)
set(value) = setValue("stop_music_low_volume", value)

var stopMusicRestoreDelay: Int
get() = getValue("stop_music_restore_delay", 3)
set(value) = setValue("stop_music_restore_delay", value)

var stopMusicHighSpeed: Int
get() = getValue("stop_music_high_speed", 50)
set(value) = setValue("stop_music_high_speed", value)

var showUnknownDevices: Boolean
get() = getValue(R.string.show_unknown_devices, false)
set(value) = setValue(R.string.show_unknown_devices, value)
Expand Down
110 changes: 104 additions & 6 deletions app/src/main/java/com/cooper/wheellog/WheelData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@ public class WheelData {
private double mCalculatedPwm = 0.0;
private double mMaxPwm = 0.0;
private long mLowSpeedMusicTime = 0;
private int mMusicVolumeBeforeQuiet = -1;
private boolean mMusicVolumeChangedByWheelLog = false;
private boolean mMusicMutedByWheelLog = false;

private boolean mBmsView = false;
private String protoVer = "";
Expand Down Expand Up @@ -1143,21 +1146,113 @@ public long getLastLifeData() {
}

private void CheckMuteMusic() {
if (!appConfig.getUseStopMusic())
if (!appConfig.getUseStopMusic()) {
releaseMusicControl();
return;
}

final double lowMuteSpeedThreshold = appConfig.getStopMusicSpeed();
final double highMuteSpeedThreshold = appConfig.getStopMusicHighSpeed();

final double muteSpeedThreshold = 3.5;
double speed = getSpeedDouble();
if (speed <= muteSpeedThreshold) {

if (speed <= lowMuteSpeedThreshold) {
mLowSpeedMusicTime = 0;
MainActivity.audioManager.setStreamMute(AudioManager.STREAM_MUSIC, true);
setQuietMusicVolume();
} else if (speed >= highMuteSpeedThreshold) {
mLowSpeedMusicTime = 0;
muteMusic();
} else {
if (mLowSpeedMusicTime == 0)
mLowSpeedMusicTime = System.currentTimeMillis();

if ((System.currentTimeMillis() - mLowSpeedMusicTime) >= 1500)
MainActivity.audioManager.setStreamMute(AudioManager.STREAM_MUSIC, false);
long restoreDelayMs = appConfig.getStopMusicRestoreDelay() * 1000L;

// Задержка возврата обычной громкости.
// Нужна, чтобы звук не возвращался от скачка скорости на ямке,
// переходе, трамвайных путях и т.п.
if ((System.currentTimeMillis() - mLowSpeedMusicTime) >= restoreDelayMs)
restoreMusicVolume();
}
}

private void setQuietMusicVolume() {
if (MainActivity.audioManager == null)
return;

// Если до этого звук был полностью заглушен на высокой скорости,
// сначала отпускаем mute.
if (mMusicMutedByWheelLog) {
MainActivity.audioManager.setStreamMute(AudioManager.STREAM_MUSIC, false);
mMusicMutedByWheelLog = false;
}

int currentVolume = MainActivity.audioManager.getStreamVolume(AudioManager.STREAM_MUSIC);

// Запоминаем уровень громкости только один раз,
// перед первым переходом в тихий режим.
if (!mMusicVolumeChangedByWheelLog) {
mMusicVolumeBeforeQuiet = currentVolume;
mMusicVolumeChangedByWheelLog = true;
}

int quietVolume = getMusicVolumeByPercent(appConfig.getStopMusicLowVolume());

if (currentVolume != quietVolume) {
MainActivity.audioManager.setStreamVolume(
AudioManager.STREAM_MUSIC,
quietVolume,
0
);
}
}

private void muteMusic() {
if (MainActivity.audioManager == null)
return;

MainActivity.audioManager.setStreamMute(AudioManager.STREAM_MUSIC, true);
mMusicMutedByWheelLog = true;
}

private void restoreMusicVolume() {
if (MainActivity.audioManager == null)
return;

if (mMusicMutedByWheelLog) {
MainActivity.audioManager.setStreamMute(AudioManager.STREAM_MUSIC, false);
mMusicMutedByWheelLog = false;
}

if (mMusicVolumeChangedByWheelLog && mMusicVolumeBeforeQuiet >= 0) {
MainActivity.audioManager.setStreamVolume(
AudioManager.STREAM_MUSIC,
mMusicVolumeBeforeQuiet,
0
);
}

mMusicVolumeBeforeQuiet = -1;
mMusicVolumeChangedByWheelLog = false;
}

private void releaseMusicControl() {
restoreMusicVolume();
mLowSpeedMusicTime = 0;
}

private int getMusicVolumeByPercent(int percent) {
if (MainActivity.audioManager == null)
return 0;

int maxVolume = MainActivity.audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);

percent = Math.max(0, Math.min(percent, 100));

if (percent == 0)
return 0;

return Math.max(1, (int) Math.round(maxVolume * percent / 100.0));
}

public void resetRideTime() {
Expand Down Expand Up @@ -1202,6 +1297,9 @@ void full_reset() {

void reset() {
mLowSpeedMusicTime = 0;
mMusicVolumeBeforeQuiet = -1;
mMusicVolumeChangedByWheelLog = false;
mMusicMutedByWheelLog = false;
mSpeed = 0;
mTorque = 0;
mMotorPower = 0;
Expand Down
63 changes: 61 additions & 2 deletions app/src/main/java/com/cooper/wheellog/settings/ApplicationScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,15 +395,74 @@ fun applicationScreen(
appConfig.noConnectionSound = it.toInt()
}

var useStopMusic by remember { mutableStateOf(appConfig.useStopMusic) }

switchPref(
name = stringResource(R.string.use_stop_music_title),
desc = stringResource(R.string.use_stop_music_description),
themeIcon = ThemeIconEnum.SettingsAutoMute,
default = appConfig.useStopMusic,
showDiv = false,
default = useStopMusic,
showDiv = !useStopMusic,
) {
appConfig.useStopMusic = it
useStopMusic = it
}
AnimatedVisibility(visible = useStopMusic) {
Column {
sliderPref(
name = stringResource(R.string.stop_music_speed_title),
desc = stringResource(R.string.stop_music_speed_description),
min = 3f,
max = 20f,
position = appConfig.stopMusicSpeed.toFloat(),
unit = R.string.speed_unit_kmh,
format = "%.0f",
showDiv = true,
) {
appConfig.stopMusicSpeed = it.toInt()
}

sliderPref(
name = stringResource(R.string.stop_music_low_volume_title),
desc = stringResource(R.string.stop_music_low_volume_description),
min = 0f,
max = 100f,
position = appConfig.stopMusicLowVolume.toFloat(),
unit = R.string.volume_unit_percent,
format = "%.0f",
showDiv = true,
) {
appConfig.stopMusicLowVolume = it.toInt()
}

sliderPref(
name = stringResource(R.string.stop_music_restore_delay_title),
desc = stringResource(R.string.stop_music_restore_delay_description),
min = 1f,
max = 10f,
position = appConfig.stopMusicRestoreDelay.toFloat(),
unit = R.string.sec,
format = "%.0f",
showDiv = true,
) {
appConfig.stopMusicRestoreDelay = it.toInt()
}

sliderPref(
name = stringResource(R.string.stop_music_high_speed_title),
desc = stringResource(R.string.stop_music_high_speed_description),
min = 20f,
max = 120f,
position = appConfig.stopMusicHighSpeed.toFloat(),
unit = R.string.speed_unit_kmh,
format = "%.0f",
showDiv = false,
) {
appConfig.stopMusicHighSpeed = it.toInt()
}
}
}

}

group(name = stringResource(R.string.connection_category_title)) {
Expand Down
14 changes: 12 additions & 2 deletions app/src/main/res/values-ru/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,18 @@
<string name="rotation_speed_description">Измеренная на весу максимальная скорость вращения колеса</string>
<string name="rotation_voltage_title">Напряжение раскрутки</string>
<string name="rotation_voltage_description">Напряжение при котором измерялась скорость раскрутки</string>
<string name="use_stop_music_title">Выключение звука</string>
<string name="use_stop_music_description">Автовыключение звука при скорости ниже 3.5 км/ч</string>
<string name="use_stop_music_title">Автоприглушение музыки</string>
<string name="use_stop_music_description">Музыка становится тише на малой скорости и выключается на высокой</string>
<string name="stop_music_speed_title">Минимальная скорость для обычной громкости</string>
<string name="stop_music_speed_description">Ниже этой скорости музыка будет тише</string>
<string name="stop_music_low_volume_title">Тихая громкость</string>
<string name="stop_music_low_volume_description">Громкость музыки на скорости ниже минимальной</string>
<string name="stop_music_restore_delay_title">Задержка возврата звука</string>
<string name="stop_music_restore_delay_description">Через сколько секунд вернуть обычную громкость</string>
<string name="stop_music_high_speed_title">Максимальная скорость для музыки</string>
<string name="stop_music_high_speed_description">Выше этой скорости музыка выключается</string>
<string name="speed_unit_kmh">км/ч</string>
<string name="volume_unit_percent">%</string>
<string name="newton">Н*м</string>
<string name="dynamic_current_limit">Ограничение тока</string>
<string name="dynamic_speed_limit">Ограничение скорости</string>
Expand Down
14 changes: 12 additions & 2 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,18 @@
<string name="connection_sound_description">Play sound when Wheel connects or disconnects</string>
<string name="no_connection_sound_title">Connection lost beeps period</string>
<string name="no_connection_sound_description">Period of beeps when connection lost, 0sec - no beeps</string>
<string name="use_stop_music_title">Auto mute</string>
<string name="use_stop_music_description">Auto mute at speeds below 3.5 km/h</string>
<string name="use_stop_music_title">Music auto-ducking</string>
<string name="use_stop_music_description">Music gets quieter at low speed and is muted at high speed</string>
<string name="stop_music_speed_title">Minimum speed for normal volume</string>
<string name="stop_music_speed_description">Below this speed, music gets quieter</string>
<string name="stop_music_low_volume_title">Quiet volume</string>
<string name="stop_music_low_volume_description">Music volume below the minimum speed</string>
<string name="stop_music_restore_delay_title">Sound restore delay</string>
<string name="stop_music_restore_delay_description">How many seconds to wait before restoring normal volume</string>
<string name="stop_music_high_speed_title">Maximum speed for music</string>
<string name="stop_music_high_speed_description">Above this speed, music is muted</string>
<string name="speed_unit_kmh">km/h</string>
<string name="volume_unit_percent">%</string>
<string name="battery_capacity_title">Battery capacity</string>
<string name="battery_capacity_description">Battery Capacity in Wh</string>
<string name="charging_power_title">Charging power</string>
Expand Down