Changeset 29186 for other-projects/tipple-android/tipple-lib/src

Timestamp:

2014-08-14T14:52:48+12:00 (10 years ago)

Author:

ak19

Message:

Tidy up on how the .loc and .json files are found

Location:

other-projects/tipple-android/tipple-lib/src/org/greenstone/android/tipple/base

Files:

• AudioPlayerView.java (modified) (1 diff)
• TippleActivity.java (modified) (3 diffs)

other-projects/tipple-android/tipple-lib/src/org/greenstone/android/tipple/base/AudioPlayerView.java

@@ -145 +145 @@
                 
                 // the location is kinda hardcoded.... if you do relocate where these files are stored, fix this file:/// url thing as well
-                i.setDataAndType( Uri.parse("file:///sdcard/tipple-store/geodata/hamilton.json"), "application/mixare-json" ); 
+                i.setDataAndType( Uri.parse("file:///sdcard/tipple-store/geodata/" + TippleActivity.DEFAULT_LOC_FILE + ".json"), "application/mixare-json" ); 
                 getContext().startActivity(i);
                 

other-projects/tipple-android/tipple-lib/src/org/greenstone/android/tipple/base/TippleActivity.java

@@ -51 +51 @@
     enum TextAudioModeEnum { TEXT_ONLY, TEXT_PLUS_AUDIO, AUDIO_ONLY, AUDIO_PLUS_TEXT };
     
-    /*
-     * GPS coords point to ==> uni rec centre
-     * TODO: Rather than hardcode a "starting point" location as shown below, get the last
-     * known location of the user.
-     */
-    
-    
-    private static final double DEFAULT_NO_GPS_LONGITUDE = 175.3141;
-    private static final double DEFAULT_NO_GPS_LATITUDE = -37.7876;
 
     
@@ -102 +93 @@
     
     public static String DEFAULT_LOC_FILE = "hamilton";
+    //public static String DEFAULT_LOC_FILE = "fieldays";
+    
+    /*
+     * GPS coords point to ==> uni rec centre
+     * TODO: Rather than hardcode a "starting point" location as shown below, get the last
+     * known location of the user.
+     */
+    
+    
+    // University ??
+    private static final double DEFAULT_NO_GPS_LONGITUDE = 175.3141;
+    private static final double DEFAULT_NO_GPS_LATITUDE = -37.7876;
+
+    // Mystery creek -- centre of fieldays innovation tent
+    //private static final double DEFAULT_NO_GPS_LONGITUDE = 175.355012;
+    //private static final double DEFAULT_NO_GPS_LATITUDE = -37.872816;
     
     public static String getGeodataDirectory()
@@ -475 +482 @@
                     
                     // now TTS initialized, init TTS aware place-locations
-                    String loc_filename = geodataDirectory + "hamilton.loc";
+                    String loc_filename = geodataDirectory + DEFAULT_LOC_FILE + ".loc";
                     System.err.println("*** loc filename = " + loc_filename);