From 757f12574ee1e10a59af5ab25b0dce2ba4bdc1dc Mon Sep 17 00:00:00 2001
From: sjtufs <sjtu_fs@outlook.com>
Date: Thu, 29 Aug 2013 12:34:34 +0800
Subject: fixed a bug

---
 client/Piztor/src/com/macaroon/piztor/AlertMaker.java | 4 ++--
 client/Piztor/src/com/macaroon/piztor/Main.java       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'client')

diff --git a/client/Piztor/src/com/macaroon/piztor/AlertMaker.java b/client/Piztor/src/com/macaroon/piztor/AlertMaker.java
index 3233beb..cc70e62 100644
--- a/client/Piztor/src/com/macaroon/piztor/AlertMaker.java
+++ b/client/Piztor/src/com/macaroon/piztor/AlertMaker.java
@@ -70,7 +70,7 @@ public class AlertMaker {
 						context.startActivity(intent);
 					}
 				});
-		gpsDialog.setNegativeButton("Cancel",
+		gpsDialog.setNegativeButton("Go without GPS",
 				new DialogInterface.OnClickListener() {
 					public void onClick(DialogInterface dialog, int which) {
 						dialog.cancel();
@@ -91,7 +91,7 @@ public class AlertMaker {
 					@Override
 					public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
 						////// at least 2 minutes
-						if ((hourOfDay >= calendar.get(Calendar.HOUR_OF_DAY) && minute-2 >= calendar.get(Calendar.MINUTE))
+						if ((hourOfDay >= calendar.get(Calendar.HOUR_OF_DAY) && minute >= calendar.get(Calendar.MINUTE))
 								|| hourOfDay > calendar.get(Calendar.HOUR_OF_DAY))
 							mapMaker.DrawMarker(markerPoint);
 						else {
diff --git a/client/Piztor/src/com/macaroon/piztor/Main.java b/client/Piztor/src/com/macaroon/piztor/Main.java
index 09aa02f..cfa77c5 100644
--- a/client/Piztor/src/com/macaroon/piztor/Main.java
+++ b/client/Piztor/src/com/macaroon/piztor/Main.java
@@ -332,7 +332,6 @@ public class Main extends PiztorAct {
 		
 		locationManager = (LocationManager)this.getSystemService(LOCATION_SERVICE);
 		isGPSEnabled = locationManager.isProviderEnabled(locationManager.GPS_PROVIDER);
-		if (isGPSEnabled == false) alertMaker.showSettingsAlert();
 		
 		mapInfo = AppMgr.mapInfo;
 		ActStatus[] r = new ActStatus[3];
@@ -356,6 +355,7 @@ public class Main extends PiztorAct {
 		mMapView = (MapView) findViewById(R.id.bmapView);
 		mapMaker = new MapMaker(mMapView, getApplicationContext());
 		alertMaker = new AlertMaker(Main.this, mapMaker);
+		if (isGPSEnabled == false) alertMaker.showSettingsAlert();
 		mapMaker.clearOverlay(mMapView);
 		mapMaker.InitMap();
 		InitTouchListenr();
-- 
cgit v1.2.3-70-g09d2