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

Fix download problems (voice packs)

Browse source
This commit is contained in:
Victor Shcherb 2012-12-20 00:08:10 +01:00
parent db5aeb815b
commit 585fcbfe89
3 changed files with 42 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
OsmAnd/src/net/osmand/plus/activities/DownloadIndexActivity.java
View file

@ -459,7 +459,6 @@ public class DownloadIndexActivity extends OsmandExpandableListActivity {
listWithAlternatives(settings.extendOsmandPath(ResourceManager.SRTM_PATH),BINARY_MAP_INDEX_EXT, files);
}
listWithAlternatives(settings.extendOsmandPath(ResourceManager.VOICE_PATH),"", files);
listWithAlternatives(settings.extendOsmandPath(ResourceManager.VOICE_PATH),"", files);
return files;
}
@ -509,6 +508,10 @@ public class DownloadIndexActivity extends OsmandExpandableListActivity {
}
}
protected void downloadFilesPreCheckSRTM(List<DownloadEntry> list) {
}
protected void downloadFilesPreCheckSpace(List<DownloadEntry> list) {
double sz = 0;
for(DownloadEntry es : list){

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

@ -1,6 +1,7 @@
package net.osmand.plus.audionotes;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.Method;
import java.util.EnumSet;
import java.util.List;
@ -23,6 +24,7 @@ import net.osmand.plus.activities.ApplicationMode;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.activities.SettingsActivity;
import net.osmand.plus.views.MapInfoLayer;
import net.osmand.plus.views.MapStackControl;
import net.osmand.plus.views.OsmandMapTileView;
import net.osmand.plus.views.TextInfoControl;
@ -322,20 +324,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
mr.setVideoEncoder(MediaRecorder.VideoEncoder.DEFAULT);
mr.setOutputFile(f.getAbsolutePath());
try {
mr.prepare();
mr.start();
mediaRec = mr;
AccessibleToast.makeText(mapActivity, R.string.recording_is_recorded, Toast.LENGTH_LONG).show();
dlg.dismiss();
recordControl.setText(app.getString(R.string.av_control_stop), "");
recordControl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
stopRecording(mapActivity);
indexFile(f);
mapActivity.getMapView().refreshMap();
}
});
runMediaRecorder(mapActivity, mr, f);
} catch (Exception e) {
logErr(e);
return;
@ -401,26 +390,39 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
mr.setAudioEncoder(MediaRecorder.AudioEncoder.DEFAULT);
mr.setOutputFile(f.getAbsolutePath());
try {
mr.prepare();
mr.start();
mediaRec = mr;
recordControl.setText(app.getString(R.string.av_control_stop), "");
AccessibleToast.makeText(mapActivity, R.string.recording_is_recorded, Toast.LENGTH_LONG).show();
recordControl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
stopRecording(mapActivity);
indexFile(f);
mapActivity.getMapView().refreshMap();
}
});
runMediaRecorder(mapActivity, mr, f);
} catch (Exception e) {
log.error("Error starting audio recorder ", e);
AccessibleToast.makeText(app, app.getString(R.string.recording_error) + " : " + e.getMessage(), Toast.LENGTH_LONG).show();
}
}
private void runMediaRecorder(final MapActivity mapActivity, MediaRecorder mr, final File f) throws IOException {
mr.prepare();
mr.start();
mediaRec = mr;
recordControl.setText(app.getString(R.string.av_control_stop), "");
final MapInfoLayer mil = mapActivity.getMapLayers().getMapInfoLayer();
final MapStackControl par = mil.getRightStack();
final boolean contains = par.getAllViews().contains(recordControl);
if(!contains) {
par.addStackView(recordControl);
}
AccessibleToast.makeText(mapActivity, R.string.recording_is_recorded, Toast.LENGTH_LONG).show();
recordControl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if(!contains) {
par.removeView(recordControl);
}
stopRecording(mapActivity);
indexFile(f);
mapActivity.getMapView().refreshMap();
}
});
}
public void indexFile(File f){
Recording r = new Recording(f);

8
OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
View file

@ -679,6 +679,14 @@ public class MapInfoLayer extends OsmandMapLayer {
}
}
}
public MapStackControl getRightStack() {
return rightStack;
}
public MapStackControl getLeftStack() {
return leftStack;
}
@Override