@@ -163,8 +163,8 @@ public class TabRecentPhotoFragment extends BaseFragment implements SwipeRefresh |
||
163 | 163 |
String endTimeStr = group.getString("ended_at"); |
164 | 164 |
Preferences.getInstance(context).setTourEndTime(TimeUtils.getStandardTimeInMiliSec(endTimeStr)); |
165 | 165 |
} |
166 |
- if(group.has("screenshoot")){ |
|
167 |
- String gatherMap = group.getString("screenshoot"); |
|
166 |
+ if(group.has("gather_screenshot")){ |
|
167 |
+ String gatherMap = group.getString("gather_screenshot"); |
|
168 | 168 |
Preferences.getInstance(context).setGatherMap(gatherMap); |
169 | 169 |
} |
170 | 170 |
} |
@@ -150,6 +150,10 @@ public class MyLocationService extends Service implements Handler.Callback{ |
||
150 | 150 |
String location = group.getString("gather_location"); |
151 | 151 |
Preferences.getInstance(context).setTourGatherLocation(location); |
152 | 152 |
} |
153 |
+ if(group.has("gather_screenshot")){ |
|
154 |
+ String gatherMap = group.getString("gather_screenshot"); |
|
155 |
+ Preferences.getInstance(context).setGatherMap(gatherMap); |
|
156 |
+ } |
|
153 | 157 |
} |
154 | 158 |
}else{ |
155 | 159 |
Preferences.getInstance(context).setTourGatherLocation(""); |
@@ -157,6 +161,7 @@ public class MyLocationService extends Service implements Handler.Callback{ |
||
157 | 161 |
Preferences.getInstance(context).setTourGuidePhone(""); |
158 | 162 |
Preferences.getInstance(context).setGatherTime(0); |
159 | 163 |
Preferences.getInstance(context).setTourEndTime(0); |
164 |
+ Preferences.getInstance(context).setGatherMap(""); |
|
160 | 165 |
} |
161 | 166 |
return true; |
162 | 167 |
}catch (Exception e){ |
@@ -233,6 +238,8 @@ public class MyLocationService extends Service implements Handler.Callback{ |
||
233 | 238 |
private void reportLocationWhenTourMode(double lat, double lon){ |
234 | 239 |
if(locationClient!=null){ |
235 | 240 |
locationClient.stopLocation(); |
241 |
+ locationClient.onDestroy(); |
|
242 |
+ locationClient = null; |
|
236 | 243 |
} |
237 | 244 |
if(lat == lastLat && lon ==lastLon && repeatTime<2){ |
238 | 245 |
repeatTime++; |