15 files changed, 693 insertions, 109 deletions

diff --git a/client/Piztor/src/com/macaroon/piztor/AppMgr.java b/client/Piztor/src/com/macaroon/piztor/AppMgr.java
index 99171cc..8e82384 100644
--- a/client/Piztor/src/com/macaroon/piztor/AppMgr.java
+++ b/client/Piztor/src/com/macaroon/piztor/AppMgr.java
@@ -4,11 +4,22 @@ import java.util.HashMap;
 import java.util.HashSet;
 
 import android.annotation.SuppressLint;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Handler;
+import android.util.Log;
+
+import com.baidu.mapapi.BMapManager;
+import com.baidu.mapapi.MKGeneralListener;
 
 @SuppressLint("UseSparseArrays")
 public class AppMgr {
+	
+	private static final String strKey = "5ba8abf7b4694ad49706b8b7538c9d6a";
+    static BMapManager mBMapManager = null;
+	static Context context;
+	
+	
 	// Status
 	public enum ActivityStatus {
 		create, start, resume, restart, stop, pause, destroy
@@ -17,7 +28,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 +38,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 +77,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);
 	}
 
@@ -93,21 +112,34 @@ public class AppMgr {
 		mp.put(a, new HashMap<Integer, Class<?>>());
 	}
 
-	static void init() {
+	static void init(Context context) {
+		if (mBMapManager == null) {
+			mBMapManager = new BMapManager(context);
+			mBMapManager.init(strKey, new MKGeneralListener(){
+				@Override
+		        public void onGetNetworkState(int iError) {
+		            Log.d("Network","failure");
+		        }
+
+		        @Override
+		        public void onGetPermissionState(int iError) {
+		            Log.d("Permission","wrong key");
+		        }
+			});
+		}
+		AppMgr.context = context;
 		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();
+		Infomation.myInfo = new UserInfo(-1);
 		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 +147,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);
 	}
 
 }
diff --git a/client/Piztor/src/com/macaroon/piztor/Infomation.java b/client/Piztor/src/com/macaroon/piztor/Infomation.java
new file mode 100644
index 0000000..cd0b49e
--- /dev/null
+++ b/client/Piztor/src/com/macaroon/piztor/Infomation.java
@@ -0,0 +1,10 @@
+package com.macaroon.piztor;
+
+public class Infomation {
+	static String ip = "69.85.86.42";
+//	static String ip = "192.168.1.101";
+	static int port = 2222;
+	static String token = null;
+	static String username = null;
+	static UserInfo myInfo;
+}
diff --git a/client/Piztor/src/com/macaroon/piztor/InitAct.java b/client/Piztor/src/com/macaroon/piztor/InitAct.java
index 4d2b656..8a7ad7a 100644
--- a/client/Piztor/src/com/macaroon/piztor/InitAct.java
+++ b/client/Piztor/src/com/macaroon/piztor/InitAct.java
@@ -9,7 +9,7 @@ public class InitAct extends PiztorAct {
 	protected void onCreate(Bundle savedInstanceState) {
 		id = "initAct";
 		super.onCreate(savedInstanceState);
-		AppMgr.init();
+		AppMgr.init(getApplicationContext());
 		AppMgr.transam.setTimeOutTime(5000);
 		setContentView(R.layout.activity_init);
 	}
@@ -17,7 +17,7 @@ public class InitAct extends PiztorAct {
 	@Override
 	protected void onStart() {
 		super.onStart();
-		if (UserInfo.token == null)
+		if (Infomation.token == null)
 			AppMgr.trigger(AppMgr.noToken);
 		else {
 			//TODO jump to main
diff --git a/client/Piztor/src/com/macaroon/piztor/Login.java b/client/Piztor/src/com/macaroon/piztor/Login.java
index 3ad6cfb..b55cd2e 100644
--- a/client/Piztor/src/com/macaroon/piztor/Login.java
+++ b/client/Piztor/src/com/macaroon/piztor/Login.java
@@ -13,7 +13,6 @@ import android.widget.Toast;
 
 public class Login extends PiztorAct {
 
-	ActMgr actMgr;
 	Button btnLogin;
 	EditText edtUser, edtPass;
 
@@ -35,9 +34,9 @@ public class Login extends PiztorAct {
 					actMgr.trigger(loginFailed);
 					return;
 				}
-				UserInfo.token = res.t;
-				UserInfo.id = res.uid;
-				UserInfo.username = edtUser.getText().toString();
+				Infomation.token = res.t;
+				Infomation.myInfo.uid = res.uid;
+				Infomation.username = edtUser.getText().toString();
 				System.out.println(res.s + "   :!!!    " + res.t);
 				actMgr.trigger(AppMgr.loginSuccess);
 			} else {
diff --git a/client/Piztor/src/com/macaroon/piztor/Main.java b/client/Piztor/src/com/macaroon/piztor/Main.java
index 8b0918d..2820090 100644
--- a/client/Piztor/src/com/macaroon/piztor/Main.java
+++ b/client/Piztor/src/com/macaroon/piztor/Main.java
@@ -2,51 +2,63 @@ package com.macaroon.piztor;
 
 import java.util.Timer;
 import java.util.TimerTask;
+
 import android.annotation.SuppressLint;
-import android.location.Location;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.util.Log;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.View;
 import android.widget.ImageButton;
-import android.widget.ImageView;
+import android.widget.Toast;
+
+import com.baidu.location.BDLocation;
+import com.baidu.location.BDLocationListener;
+import com.baidu.location.LocationClient;
+import com.baidu.location.LocationClientOption;
+import com.baidu.mapapi.map.LocationData;
+import com.baidu.mapapi.map.MapView;
 
 public class Main extends PiztorAct {
 	final static int SearchButtonPress = 1;
-	final static int FetchButtonPress = 2;
 	final static int FocuseButtonPress = 3;
 	final static int SuccessFetch = 4;
 	final static int FailedFetch = 5;
-	final static int TimerFlush = 6;
-	ActMgr actMgr;
+	final static int Fetch = 6;
+	final static int mapViewtouched = 7;
+
+	MapMaker mapMaker = null;
+	MapView mMapView;
+
+	/**
+	 * Locating component
+	 */
+	LocationClient mLocClient;
+	LocationData locData = null;
+	public MyLocationListener myListener = new MyLocationListener();
+
 	ImageButton btnSearch, btnFetch, btnFocus, btnSettings;
 	Timer autodate;
-	@SuppressLint("HandlerLeak")
-	Handler fromGPS = new Handler() {
-		@Override
-		public void handleMessage(Message m) {
-			if (m.what != 0) {
-				Location l = (Location) m.obj;
-				if (l == null)
-					System.out.println("fuck!!!");
-				else {
-					ReqUpdate r = new ReqUpdate(UserInfo.token,
-							UserInfo.username, l.getLatitude(),
-							l.getLongitude(), System.currentTimeMillis(), 1000);
-					AppMgr.transam.send(r);
-				}
-			}
-		}
-	};
+	MapInfo mapInfo;
+	/*
+	 * @SuppressLint("HandlerLeak") Handler fromGPS = new Handler() {
+	 * 
+	 * @Override public void handleMessage(Message m) { if (m.what != 0) {
+	 * Location l = (Location) m.obj; if (l == null)
+	 * System.out.println("fuck!!!"); else { ReqUpdate r = new
+	 * ReqUpdate(Infomation.token, Infomation.username, l.getLatitude(),
+	 * l.getLongitude(), System.currentTimeMillis(), 1000);
+	 * AppMgr.transam.send(r); } } } };
+	 */
 
 	@SuppressLint("HandlerLeak")
-	Handler fromTransam = new Handler() {
+	Handler handler = new Handler() {
 		@Override
 		public void handleMessage(Message m) {
 			switch (m.what) {
-			case 1:
+			case 1:// 上传自己信息成功or失败
 				ResUpdate update = (ResUpdate) m.obj;
 				if (update.s == 0)
 					System.out.println("update success");
@@ -55,31 +67,52 @@ public class Main extends PiztorAct {
 					actMgr.trigger(AppMgr.errorToken);
 				}
 				break;
-			case 2:
+			case 2:// 得到别人的信息
 				ResLocation location = (ResLocation) m.obj;
 				if (location.s == 0) {
-					for (int i = 0; i < location.n; i++) {
-						System.out.println(location.l.get(i).i + " : "
-								+ location.l.get(i).lat + " "
-								+ location.l.get(i).lot);
+					mapInfo.clear();
+					for (Rlocation i : location.l) {
+						System.out.println(i.i + " : " + i.lat + " " + i.lot);
+						UserInfo info = new UserInfo(i.i);
+						info.setLocation(i.lat, i.lot);
+						mapInfo.addUserInfo(info);
 					}
 					actMgr.trigger(SuccessFetch);
 				} else {
-					System.out
-							.println("resquest for location must be wrong!!!");
+					System.out.println("resquest for location failed!");
 					actMgr.trigger(AppMgr.errorToken);
 				}
 				break;
-			case 3:
+			case 3:// 得到用户信息
 				ResUserinfo r = (ResUserinfo) m.obj;
 				if (r.s == 0) {
 					System.out.println("id : " + r.uid + " sex :  " + r.sex
 							+ " group : " + r.gid);
+					if (r.uid == Infomation.myInfo.uid) {
+						Infomation.myInfo.gid = r.gid;
+						try {
+							autodate.schedule(new AutoUpdate(), 0, 5000);
+						} catch (Exception e) {
+							e.printStackTrace();
+						}
+					} else {
+						UserInfo user = mapInfo.getUserInfo(r.uid);
+						if (user != null)
+							user.setInfo(r.gid, r.sex);
+						else
+							System.out.println("fuck!!!!");
+					}
+					flushMap();
 				} else {
 					System.out.println("reqest for userInfo must be wrong!!!");
 					actMgr.trigger(AppMgr.errorToken);
 				}
 				break;
+			case 4:// 登出
+				Toast toast = Toast.makeText(getApplicationContext(),
+						"logout failed", Toast.LENGTH_LONG);
+				toast.show();
+				break;
 			default:
 				break;
 			}
@@ -90,16 +123,14 @@ public class Main extends PiztorAct {
 		switch (t) {
 		case SearchButtonPress:
 			return "Search Button Press";
-		case FetchButtonPress:
-			return "Fetch Button Press";
+		case Fetch:
+			return "Fetch ";
 		case FocuseButtonPress:
 			return "Focuse Button Press";
 		case SuccessFetch:
 			return "Success Fetch";
 		case FailedFetch:
 			return "Failed Fetch";
-		case TimerFlush:
-			return "TimerFlush";
 		default:
 			return "Fuck!!!";
 		}
@@ -110,21 +141,47 @@ public class Main extends PiztorAct {
 
 	}
 
+	public class MyLocationListener implements BDLocationListener {
+		@Override
+		public void onReceiveLocation(BDLocation location) {
+			Log.d("GPS", "Gotten");
+			if (location == null) {
+				return;
+			}
+
+			locData.latitude = location.getLatitude();
+			locData.longitude = location.getLongitude();
+			locData.accuracy = location.getRadius();
+			locData.direction = location.getDerect();
+
+			mapMaker.UpdateLocationOverlay(locData, false);
+
+		}
+
+		@Override
+		public void onReceivePoi(BDLocation poiLocation) {
+			if (poiLocation == null) {
+				return;
+			}
+		}
+	}
+
 	class StartStatus extends ActStatus {
 
 		@Override
 		void enter(int e) {
 			System.out.println("enter start status!!!!");
 			if (e == ActMgr.Create) {
-				AppMgr.transam.send(new ReqUserinfo(UserInfo.token,
-						UserInfo.username, UserInfo.id, System
+				System.out.println(Infomation.token + "  "
+						+ Infomation.username + "   " + Infomation.myInfo.uid);
+				AppMgr.transam.send(new ReqUserinfo(Infomation.token,
+						Infomation.username, Infomation.myInfo.uid, System
 								.currentTimeMillis(), 5000));
+				// TODO flush mapinfo.myinfo
 			}
 
-			if (e == TimerFlush) {
-				ReqLocation r = new ReqLocation(UserInfo.token,
-						UserInfo.username, 1, System.currentTimeMillis(), 1000);
-				AppMgr.transam.send(r);
+			if (e == Fetch) {
+				requesLocation(Infomation.myInfo.gid);
 			}
 			if (e == SuccessFetch)
 				flushMap();
@@ -142,10 +199,11 @@ public class Main extends PiztorAct {
 		@Override
 		void enter(int e) {
 			System.out.println("enter Fetch status!!!!");
-			if (e == FetchButtonPress) {
-				ReqLocation r = new ReqLocation(UserInfo.token,
-						UserInfo.username, 1, System.currentTimeMillis(), 1000);
-				AppMgr.transam.send(r);
+			if (e == Fetch) {
+				requesLocation(Infomation.myInfo.gid);
+			}
+			if (e == SuccessFetch) {
+				flushMap();
 			}
 		}
 
@@ -160,51 +218,85 @@ public class Main extends PiztorAct {
 
 		@Override
 		void enter(int e) {
+			// TODO
+			switch (e) {
+			case Fetch:
+				requesLocation(Infomation.myInfo.gid);
+				break;
+			case FocuseButtonPress:
+				// TODO setFocus
+				break;
+			case SuccessFetch:
+				requesLocation(Infomation.myInfo.gid);
+				break;
+			default:
+				break;
+			}
 			System.out.println("enter focus status!!!!");
-
 		}
 
 		@Override
 		void leave(int e) {
+			// TODO leave focus
 			System.out.println("leave focus status!!!! because" + cause(e));
-
 		}
 
 	}
 
-	class AutoUpdate extends TimerTask {
+	void requesLocation(int gid) {
+		ReqLocation r = new ReqLocation(Infomation.token, Infomation.username,
+				gid, System.currentTimeMillis(), 2000);
+		System.out.println("get others infomation!!!");
+		AppMgr.transam.send(r);
+	}
 
+	class AutoUpdate extends TimerTask {
 		@Override
 		public void run() {
-			actMgr.trigger(Main.TimerFlush);
+			actMgr.trigger(Main.Fetch);
 		}
-
 	}
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		id = "Main";
 		super.onCreate(savedInstanceState);
-		AppMgr.tracker.setHandler(fromGPS);
+		mapInfo = AppMgr.mapInfo;
 		ActStatus[] r = new ActStatus[3];
-		r[0] = new StartStatus();
-		r[1] = new FetchStatus();
-		r[2] = new FocusStatus();
-		actMgr = new ActMgr(this, r[0], r);
-		actMgr.add(r[0], FocuseButtonPress, r[2]);
-		actMgr.add(r[0], FetchButtonPress, r[1]);
-		actMgr.add(r[0], SuccessFetch, r[0]);
-		actMgr.add(r[1], FetchButtonPress, r[0]);
-		actMgr.add(r[1], FailedFetch, r[0]);
-		actMgr.add(r[1], SuccessFetch, r[0]);
-		actMgr.add(r[2], FocuseButtonPress, r[0]);
-		actMgr.add(r[0], TimerFlush, r[0]);
-		actMgr.add(r[2], TimerFlush, r[2]);
+		ActStatus startStatus = r[0] = new StartStatus();
+		ActStatus fetchStatus = r[1] = new FetchStatus();
+		ActStatus focusStatus = r[2] = new FocusStatus();
+		AppMgr.transam.setHandler(handler);
+		actMgr = new ActMgr(this, startStatus, r);
+		actMgr.add(startStatus, FocuseButtonPress, focusStatus);
+		actMgr.add(startStatus, Fetch, fetchStatus);
+		actMgr.add(startStatus, SuccessFetch, startStatus);
+		actMgr.add(startStatus, Fetch, startStatus);
+		actMgr.add(fetchStatus, Fetch, startStatus);
+		actMgr.add(fetchStatus, FailedFetch, startStatus);
+		actMgr.add(fetchStatus, SuccessFetch, startStatus);
+		actMgr.add(focusStatus, FocuseButtonPress, startStatus);
+		actMgr.add(focusStatus, mapViewtouched, startStatus);
+		actMgr.add(focusStatus, SuccessFetch, focusStatus);
+		actMgr.add(focusStatus, Fetch, focusStatus);
 		autodate = new Timer();
-		AppMgr.transam.setHandler(fromTransam);
+		flushMap();
+		// ImageView view = (ImageView) findViewById(R.id.main_mapview);
+		// view.setOnTouchListener(new MultiTouchListener());
 		setContentView(R.layout.activity_main);
-		ImageView view = (ImageView) findViewById(R.id.main_mapview);
-		view.setOnTouchListener(new MultiTouchListener());
+		mMapView = (MapView) findViewById(R.id.bmapView);
+		mapMaker = new MapMaker(mMapView, getApplicationContext());
+		mapMaker.InitMap();
+		mLocClient = new LocationClient(this);
+		locData = new LocationData();
+		mLocClient.registerLocationListener(myListener);
+		LocationClientOption option = new LocationClientOption();
+		option.setOpenGps(true);
+		option.setCoorType("bd09ll");
+		option.setScanSpan(5000);
+		mLocClient.setLocOption(option);
+		mLocClient.start();
+		mapMaker.UpdateLocationOverlay(locData, false);
 	}
 
 	@Override
@@ -215,16 +307,15 @@ public class Main extends PiztorAct {
 		btnSearch = (ImageButton) findViewById(R.id.footbar_btn_search);
 		btnSettings = (ImageButton) findViewById(R.id.footbar_btn_settings);
 		btnFetch.setOnClickListener(new View.OnClickListener() {
-			
 			@Override
 			public void onClick(View arg0) {
-			//	actMgr.trigger(FetchButtonPress);
+				actMgr.trigger(Fetch);
 			}
 		});
 		btnFocus.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-			//	actMgr.trigger(FocuseButtonPress);
+				actMgr.trigger(FocuseButtonPress);
 			}
 		});
 		btnSettings.setOnClickListener(new View.OnClickListener() {
@@ -233,16 +324,43 @@ public class Main extends PiztorAct {
 				actMgr.trigger(AppMgr.toSettings);
 			}
 		});
-		//autodate.schedule(new AutoUpdate(), 0, 5000);
+
+	}
+
+	@Override
+	protected void onResume() {
+		mapMaker.onResume();
+		super.onResume();
+	}
+
+	@Override
+	protected void onPause() {
+		mapMaker.onPause();
+		super.onPause();
 	}
-	
+
+	@Override
+	public void onStop() {
+		super.onStop();
+		autodate.cancel();
+	}
+
+	@Override
+	protected void onDestroy() {
+		if (mLocClient != null) {
+			mLocClient.stop();
+		}
+		mapMaker.onDestroy();
+		super.onDestroy();
+	}
+
 	@Override
 	public boolean onKeyDown(int keyCode, KeyEvent event) {
-		 if (keyCode == KeyEvent.KEYCODE_BACK) {
-			 AppMgr.exit();
-			 return true;
-		 }
-		 return super.onKeyDown(keyCode, event);
+		if (keyCode == KeyEvent.KEYCODE_BACK) {
+			AppMgr.exit();
+			return true;
+		}
+		return super.onKeyDown(keyCode, event);
 	}
 
 	@Override
@@ -252,4 +370,17 @@ public class Main extends PiztorAct {
 		return false;
 	}
 
+	@Override
+	protected void onSaveInstanceState(Bundle outState) {
+		super.onSaveInstanceState(outState);
+		mMapView.onSaveInstanceState(outState);
+
+	}
+
+	@Override
+	protected void onRestoreInstanceState(Bundle savedInstanceState) {
+		super.onRestoreInstanceState(savedInstanceState);
+		mMapView.onRestoreInstanceState(savedInstanceState);
+	}
+
 }
diff --git a/client/Piztor/src/com/macaroon/piztor/MapInfo.java b/client/Piztor/src/com/macaroon/piztor/MapInfo.java
new file mode 100644
index 0000000..f5840c7
--- /dev/null
+++ b/client/Piztor/src/com/macaroon/piztor/MapInfo.java
@@ -0,0 +1,87 @@
+package com.macaroon.piztor;
+
+import java.util.HashMap;
+import java.util.Vector;
+
+import com.baidu.platform.comapi.basestruct.GeoPoint;
+
+import android.annotation.SuppressLint;
+import android.graphics.drawable.Drawable;
+import android.location.Location;
+
+
+public class MapInfo {
+	HashMap<Integer, UserInfo> mp;
+	Vector<UserInfo> allUsers;
+	UserInfo myInfo;
+	Style layout;
+
+	@SuppressLint("UseSparseArrays")
+	MapInfo() {
+		mp = new HashMap<Integer, UserInfo>();
+		allUsers = new Vector<UserInfo>();
+	}
+
+	void clear() {
+		mp.clear();
+		allUsers.clear();
+	}
+
+	void addUserInfo(UserInfo userInfo) {
+		allUsers.add(userInfo);
+		mp.put(userInfo.uid, userInfo);
+	}
+
+	void setStyle(Style layout) {
+		this.layout = layout;
+	}
+
+	UserInfo getUserInfo(int uid) {
+		if (mp.containsKey(uid))
+			return mp.get(uid);
+		else
+			return null;
+	}
+
+	public Vector<UserInfo> getVector() {
+		return allUsers;
+	}
+	
+	public UserInfo getMyInfo() {
+		return myInfo;
+	}
+}
+
+class UserInfo {
+	int uid, gid, sex;
+	GeoPoint location;
+
+	UserInfo(int uid) {
+		this.uid = uid;
+	}
+
+	void setLocation(double lat, double lot) {
+		location = new GeoPoint((int)(lat * 1e6), (int)(lot * 1e6));
+	}
+
+	void setInfo(int gid, int sex) {
+		this.gid = gid;
+		this.sex = sex;
+	}
+	
+	public GeoPoint getLocation(){
+		return location;
+	}
+
+	public double getLatitude() {
+		return location.getLatitudeE6() / 1e6;
+	}
+
+	public double getLongitude() {
+		return location.getLongitudeE6() / 1e6;
+	}
+}
+
+interface Style {
+	Drawable getDrawable(UserInfo user);
+}
diff --git a/client/Piztor/src/com/macaroon/piztor/MapMaker.java b/client/Piztor/src/com/macaroon/piztor/MapMaker.java
new file mode 100644
index 0000000..bdc3554
--- /dev/null
+++ b/client/Piztor/src/com/macaroon/piztor/MapMaker.java
@@ -0,0 +1,165 @@
+package com.macaroon.piztor;
+
+import java.util.ArrayList;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.Vector;
+import android.util.Log;
+import android.util.AttributeSet;
+import android.annotation.SuppressLint;
+import android.location.Location;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.app.Activity;  
+import android.content.Context;
+import android.content.res.Configuration;  
+import android.graphics.drawable.Drawable;
+import android.widget.FrameLayout;  
+import android.widget.Toast;  
+import android.view.View.OnClickListener;
+import android.widget.RadioGroup;
+import android.widget.RadioGroup.OnCheckedChangeListener;
+
+import com.baidu.location.BDLocation;
+import com.baidu.location.BDLocationListener;
+import com.baidu.location.LocationClient;
+import com.baidu.location.LocationClientOption;
+
+import com.baidu.mapapi.map.LocationData;
+import com.baidu.mapapi.BMapManager;  
+import com.baidu.mapapi.MKGeneralListener;
+import com.baidu.mapapi.map.ItemizedOverlay;
+import com.baidu.mapapi.map.MKMapViewListener;  
+import com.baidu.mapapi.map.MapController;  
+import com.baidu.mapapi.map.MapPoi;  
+import com.baidu.mapapi.map.MapView;
+import com.baidu.mapapi.map.MyLocationOverlay;
+import com.baidu.mapapi.map.OverlayItem;
+import com.baidu.mapapi.map.PopupOverlay;
+import com.baidu.platform.comapi.basestruct.GeoPoint; 
+
+public class MapMaker extends Activity{
+
+	private MapView mMapView = null;
+	private MapController mMapController = null;
+	private static GeoPoint sjtuCenter = new GeoPoint((int)(31.032247 * 1E6), (int)(121.445937 * 1E6));
+	private MyOverlay mOverlay = null;
+	private MapView.LayoutParams layoutParam = null;
+	private OverlayItem curItem = null;
+	private ArrayList<OverlayItem> mItems = null;
+	private LocationOverlay mLocationOverlay;
+	private Context context;
+
+	public MapMaker(MapView mapView, Context c) {
+		mMapView = mapView;
+		mMapController = mMapView.getController();
+		mMapController.setCenter(sjtuCenter);
+		mMapController.setZoom(17);
+		mMapController.setRotation(-22);
+		mMapController.enableClick(true);
+		context = c;
+		mLocationOverlay = null;
+		mOverlay = null;
+	}
+
+	public class LocationOverlay extends MyLocationOverlay {
+		public LocationOverlay(MapView mapView) {
+			super(mapView);
+		}
+	}
+
+	public class MyOverlay extends ItemizedOverlay {
+		public MyOverlay(Drawable defaultMarker, MapView mapView) {
+			super(defaultMarker, mapView);
+		}
+	}
+
+	public void UpdateLocationOverlay(LocationData locationData, boolean hasAnimation) {
+		/**
+		 * Update only location overlay
+		 */
+		mLocationOverlay.setData(locationData);
+		mMapView.refresh();
+		if (hasAnimation) {
+			mMapController.animateTo(new GeoPoint((int)(locationData.latitude * 1E6), (int)(locationData.longitude * 1E6)));
+		}
+	}
+	
+	public void InitMap() {
+		Log.d("GPS", "init");
+		mLocationOverlay = new LocationOverlay(mMapView);
+		//mLocationOverlay.setMarker(context.getResources().getDrawable(R.drawable.marker1));
+		LocationData locationData = new LocationData();
+		mLocationOverlay.setData(locationData);
+		mMapView.getOverlays().add(mLocationOverlay);
+		mLocationOverlay.enableCompass();
+		mMapView.refresh();
+	}
+	
+	public void UpdateMap(MapInfo mapInfo) {
+		/**
+		 * Update Location Overlay
+		 */
+		GeoPoint location = mapInfo.getMyInfo().getLocation();
+		LocationData locationData = new LocationData();
+		locationData.latitude = location.getLatitudeE6() / 1e6;
+		locationData.longitude = location.getLongitudeE6() / 1e6;
+		mLocationOverlay.setData(locationData);
+		mMapView.refresh();
+		
+		/**
+		 * Update location of others
+		 */
+		mOverlay.removeAll();
+		//mMapView.refresh();
+		GeoPoint p;
+		Vector<UserInfo> allUsers = mapInfo.getVector();
+
+		for(int i = 0; i < allUsers.size(); i++) {
+			p = new GeoPoint((int)(allUsers.get(i).getLatitude() * 1E6)
+					,(int)(allUsers.get(i).getLongitude() * 1E6));
+			curItem = new OverlayItem(p, "^_^", "");
+			curItem.setMarker(context.getResources().getDrawable(R.drawable.marka));
+			mOverlay.addItem(curItem);
+		}
+		mItems = new ArrayList<OverlayItem>();
+		mItems.addAll(mOverlay.getAllItem());
+		mMapView.getOverlays().add(mOverlay);
+		mMapView.refresh();
+	}
+
+
+	public void clearOverlay(View view) {
+		mOverlay.removeAll();
+		mMapView.refresh();
+	}
+
+	public void resetOverlay(View view) {
+		clearOverlay(null);
+		mOverlay.addItem(mItems);
+		mMapView.refresh();
+	}
+	
+	@Override
+	protected void onPause() {
+		mMapView.onPause();
+	}
+	
+	@Override 
+	protected void onResume() {
+		mMapView.onResume();
+	}
+	
+	@Override
+	protected void onDestroy() {
+		mMapView.destroy();
+	}
+}
+
diff --git a/client/Piztor/src/com/macaroon/piztor/PiztorAct.java b/client/Piztor/src/com/macaroon/piztor/PiztorAct.java
index 1093fb9..abfab12 100644
--- a/client/Piztor/src/com/macaroon/piztor/PiztorAct.java
+++ b/client/Piztor/src/com/macaroon/piztor/PiztorAct.java
@@ -5,6 +5,8 @@ import android.os.Bundle;
 
 public class PiztorAct extends Activity {
 	String id;
+	ActMgr actMgr;
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
diff --git a/client/Piztor/src/com/macaroon/piztor/ReqLogout.java b/client/Piztor/src/com/macaroon/piztor/ReqLogout.java
new file mode 100644
index 0000000..22bddfa
--- /dev/null
+++ b/client/Piztor/src/com/macaroon/piztor/ReqLogout.java
@@ -0,0 +1,12 @@
+package com.macaroon.piztor;

+

+//--------------------------------------//

+//			     Log out      		    //

+//--------------------------------------//

+

+public class ReqLogout extends Req{

+	

+	ReqLogout(String token,String name,long time,long alive){

+		super(4,token,name,time,alive);	//for type 4

+	}

+}
\ No newline at end of file
diff --git a/client/Piztor/src/com/macaroon/piztor/ResLogout.java b/client/Piztor/src/com/macaroon/piztor/ResLogout.java
new file mode 100644
index 0000000..4b2a8d1
--- /dev/null
+++ b/client/Piztor/src/com/macaroon/piztor/ResLogout.java
@@ -0,0 +1,13 @@
+package com.macaroon.piztor;

+

+

+//--------------------------------------//

+//	         Respond to logout			//

+//--------------------------------------//

+

+public class ResLogout extends Res{

+	

+	ResLogout(int status){

+		super(4,status);	//for type 4

+	}

+}
\ No newline at end of file
diff --git a/client/Piztor/src/com/macaroon/piztor/Rlocation.java b/client/Piztor/src/com/macaroon/piztor/Rlocation.java
index 6ac9154..8f7d42b 100644
--- a/client/Piztor/src/com/macaroon/piztor/Rlocation.java
+++ b/client/Piztor/src/com/macaroon/piztor/Rlocation.java
@@ -10,4 +10,4 @@ class Rlocation{
 		lat = latitude;

 		lot = longitude;

 	}

-}
\ No newline at end of file
+}

diff --git a/client/Piztor/src/com/macaroon/piztor/Settings.java b/client/Piztor/src/com/macaroon/piztor/Settings.java
index 94c6a94..8ad44b5 100644
--- a/client/Piztor/src/com/macaroon/piztor/Settings.java
+++ b/client/Piztor/src/com/macaroon/piztor/Settings.java
@@ -1,18 +1,140 @@
 package com.macaroon.piztor;
 
+import android.annotation.SuppressLint;
 import android.os.Bundle;
-import android.app.Activity;
+import android.os.Handler;
+import android.os.Message;
 import andr