1 files changed, 16 insertions, 9 deletions

diff --git a/client/Piztor/src/com/macaroon/piztor/AppMgr.java b/client/Piztor/src/com/macaroon/piztor/AppMgr.java
index 99171cc..0ba28e0 100644
--- a/client/Piztor/src/com/macaroon/piztor/AppMgr.java
+++ b/client/Piztor/src/com/macaroon/piztor/AppMgr.java
@@ -2,6 +2,7 @@ package com.macaroon.piztor;
 
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Stack;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
@@ -17,7 +18,7 @@ public class AppMgr {
 	static ActivityStatus status;
 	static PiztorAct nowAct;
 	// TODO fix
-	static Handler fromTransam, fromGPS;
+	static Handler handler, fromGPS;
 	static Transam transam = null;
 	static Tracker tracker = null;
 	static Thread tTransam, tGPS;
@@ -27,6 +28,9 @@ public class AppMgr {
 	final static int errorToken = 103;
 	final static int hasToken = 104;
 	final static int toSettings = 105;
+	final static int logout = 106;
+	
+	static MapInfo mapInfo;
 	
 	static HashMap<Class<?>, HashMap<Integer, Class<?>>> mp;
 	static HashSet<PiztorAct> acts;
@@ -63,7 +67,12 @@ public class AppMgr {
 			System.out.println("second");
 		i.setClass(nowAct, mp.get(nowAct.getClass()).get(event));
 		if (event == errorToken)
-			UserInfo.token = null;
+			Infomation.token = null;
+		if (event == toSettings) {
+			if (nowAct.actMgr.nowStatus.getClass() == Main.FetchStatus.class)
+				i.putExtra("status", true);
+			else i.putExtra("status", false);
+		}
 		nowAct.startActivity(i);
 	}
 
@@ -95,19 +104,16 @@ public class AppMgr {
 
 	static void init() {
 		mp = new HashMap<Class<?>, HashMap<Integer, Class<?>>>();
-		fromTransam = new Handler();
-		transam = new Transam(UserInfo.ip, UserInfo.port, fromTransam);
-		fromGPS = new Handler();
-		tracker = new Tracker(nowAct.getApplicationContext(), fromGPS);
+		handler = new Handler();
+		transam = new Transam(Infomation.ip, Infomation.port, handler);
 		tTransam = new Thread(transam);
 		tTransam.start();
-		tGPS = new Thread(tracker);
-		tGPS.start();
-		System.out.println("!!!!!!");
+		mapInfo = new MapInfo();
 		addStatus(InitAct.class);
 		addStatus(Login.class);
 		addStatus(Main.class);
 		addStatus(Settings.class);
+		addTransition(Main.class, logout, Login.class);
 		addTransition(InitAct.class, noToken, Login.class);
 		addTransition(Login.class, loginSuccess, Main.class);
 		addTransition(Main.class, errorToken, Login.class);
@@ -115,6 +121,7 @@ public class AppMgr {
 		addTransition(InitAct.class, hasToken, Main.class);
 		addTransition(InitAct.class, errorToken, Login.class);
 		addTransition(Main.class, toSettings, Settings.class);
+		addTransition(Settings.class, logout, Login.class);
 	}
 
 }