Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix #3710

Browse source
This commit is contained in:
PavelRatushny 2017-05-24 15:02:37 +03:00 committed by Alexey Kulish
parent a9fd178989
commit 9779eaa12b
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
View file

@ -1117,9 +1117,18 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
public void recordAudio(double lat, double lon, final MapActivity mapActivity) { public void recordAudio(double lat, double lon, final MapActivity mapActivity) {
AudioManager am = (AudioManager)app.getSystemService(Context.AUDIO_SERVICE); AudioManager am = (AudioManager)app.getSystemService(Context.AUDIO_SERVICE);
am.adjustStreamVolume(AudioManager.STREAM_MUSIC, AudioManager.ADJUST_MUTE, 0); int voiceGuidanceOutput = app.getSettings().AUDIO_STREAM_GUIDANCE.get();
if (ActivityCompat.checkSelfPermission(mapActivity, Manifest.permission.RECORD_AUDIO) if (ActivityCompat.checkSelfPermission(mapActivity, Manifest.permission.RECORD_AUDIO)
== PackageManager.PERMISSION_GRANTED) { == PackageManager.PERMISSION_GRANTED) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M){
am.adjustStreamVolume(AudioManager.STREAM_MUSIC, AudioManager.ADJUST_MUTE, 0);
if (voiceGuidanceOutput != AudioManager.STREAM_MUSIC)
am.adjustStreamVolume(voiceGuidanceOutput, AudioManager.ADJUST_MUTE, 0);
} else {
am.setStreamMute(AudioManager.STREAM_MUSIC, true);
if (voiceGuidanceOutput != AudioManager.STREAM_MUSIC)
am.setStreamMute(voiceGuidanceOutput, true);
}
initRecMenu(AVActionType.REC_AUDIO, lat, lon); initRecMenu(AVActionType.REC_AUDIO, lat, lon);
MediaRecorder mr = new MediaRecorder(); MediaRecorder mr = new MediaRecorder();
final File f = getBaseFileName(lat, lon, app, THREEGP_EXTENSION); final File f = getBaseFileName(lat, lon, app, THREEGP_EXTENSION);
@ -1530,6 +1539,19 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
recordControl.setExplicitlyVisible(false); recordControl.setExplicitlyVisible(false);
mapActivity.getMapLayers().getMapInfoLayer().recreateControls(); mapActivity.getMapLayers().getMapInfoLayer().recreateControls();
} }
if (currentRecording.type == AVActionType.REC_AUDIO) {
AudioManager am = (AudioManager) app.getSystemService(Context.AUDIO_SERVICE);
int voiceGuidanceOutput = app.getSettings().AUDIO_STREAM_GUIDANCE.get();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M){
am.adjustStreamVolume(AudioManager.STREAM_MUSIC, AudioManager.ADJUST_UNMUTE, 0);
if (voiceGuidanceOutput != AudioManager.STREAM_MUSIC)
am.adjustStreamVolume(voiceGuidanceOutput, AudioManager.ADJUST_UNMUTE, 0);
} else {
am.setStreamMute(AudioManager.STREAM_MUSIC, false);
if (voiceGuidanceOutput != AudioManager.STREAM_MUSIC)
am.setStreamMute(voiceGuidanceOutput, false);
}
}
stopCameraRecording(false); stopCameraRecording(false);
if (recordControl != null) { if (recordControl != null) {
setRecordListener(recordControl, mapActivity); setRecordListener(recordControl, mapActivity);
@ -1540,8 +1562,6 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
closeRecordingMenu(); closeRecordingMenu();
} }
} }
AudioManager am = (AudioManager)app.getSystemService(Context.AUDIO_SERVICE);
am.adjustStreamVolume(AudioManager.STREAM_MUSIC, AudioManager.ADJUST_UNMUTE, 0);
} }
private LatLon getNextRecordingLocation() { private LatLon getNextRecordingLocation() {