1 files changed, 29 insertions, 11 deletions

diff --git a/client/Piztor/src/com/macaroon/piztor/InitAct.java b/client/Piztor/src/com/macaroon/piztor/InitAct.java
index 8145935..5f7f61d 100644
--- a/client/Piztor/src/com/macaroon/piztor/InitAct.java
+++ b/client/Piztor/src/com/macaroon/piztor/InitAct.java
@@ -1,16 +1,30 @@
 package com.macaroon.piztor;
 
+import android.app.Activity;
+import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.Menu;
 
-public class InitAct extends PiztorAct {
+import com.baidu.mapapi.MKGeneralListener;
 
+public class InitAct extends PiztorAct {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		id = "initAct";
 		super.onCreate(savedInstanceState);
-		AppMgr.init(getApplicationContext());
-		AppMgr.transam.setTimeOutTime(5000);
+		app.isExiting = false;
+		app.mBMapManager.init(app.getStrkey(), new MKGeneralListener() {
+			@Override
+			public void onGetNetworkState(int iError) {
+				Log.d("Network", "failure");
+			}
+
+			@Override
+			public void onGetPermissionState(int iError) {
+				Log.d("Permission", "wrong key");
+			}
+		});
 		setContentView(R.layout.activity_init);
 	}
 
@@ -21,23 +35,27 @@ public class InitAct extends PiztorAct {
 
 	@Override
 	protected void onResume() {
+		if (app.isExiting)
+			finish();
 		super.onResume();
-		if (Infomation.token == null)
-			AppMgr.trigger(AppMgr.noToken);
+		if (app.token == null || app.isLogout) {
+			app.appMgr.trigger(AppMgr.noToken);
+		}
 		else {
-			AppMgr.trigger(AppMgr.hasToken);
+			app.appMgr.trigger(AppMgr.hasToken);
+			System.out.println("has token!!!");
 		}
 	}
 	
 	@Override
-	protected void onDestroy() {
-		super.onDestroy();
-	}
-
-	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		getMenuInflater().inflate(R.menu.init, menu);
 		return false;
 	}
+	
+	@Override
+	public void finishFromChild (Activity child) {
+		finish();
+	}
 
 }