From e5599da7fdd344fdcb49e8d6780a1e2ad358ee2d Mon Sep 17 00:00:00 2001 From: goblin911 Date: Sun, 25 Aug 2013 20:25:50 +0800 Subject: Main is working.... --- client/Piztor/src/com/macaroon/piztor/ActMgr.java | 5 +++++ client/Piztor/src/com/macaroon/piztor/AppMgr.java | 2 +- client/Piztor/src/com/macaroon/piztor/InitAct.java | 4 +--- 3 files changed, 7 insertions(+), 4 deletions(-) (limited to 'client/Piztor/src/com') diff --git a/client/Piztor/src/com/macaroon/piztor/ActMgr.java b/client/Piztor/src/com/macaroon/piztor/ActMgr.java index 4df6bae..f5ff994 100644 --- a/client/Piztor/src/com/macaroon/piztor/ActMgr.java +++ b/client/Piztor/src/com/macaroon/piztor/ActMgr.java @@ -6,6 +6,7 @@ import android.annotation.SuppressLint; @SuppressLint("UseSparseArrays") public class ActMgr { + final static int Create = -1; // event PiztorAct act; ActStatus nowStatus; @@ -14,6 +15,7 @@ public class ActMgr { ActMgr(PiztorAct act, ActStatus nowStatus, ActStatus[] r) { this.act = act; this.nowStatus = nowStatus; + nowStatus.enter(Create); mp = new HashMap>(); for (int i = 0; i < r.length; i++) { mp.put(r[i], new HashMap()); @@ -28,6 +30,9 @@ public class ActMgr { nowStatus.enter(event); } else if (AppMgr.mp.get(act.getClass()).containsKey(event)) { AppMgr.trigger(event); + } else { + System.out.println("can not trigger the event at " + act.id + " : " + + event); } } diff --git a/client/Piztor/src/com/macaroon/piztor/AppMgr.java b/client/Piztor/src/com/macaroon/piztor/AppMgr.java index 2e5e2b3..10e8e1a 100644 --- a/client/Piztor/src/com/macaroon/piztor/AppMgr.java +++ b/client/Piztor/src/com/macaroon/piztor/AppMgr.java @@ -71,7 +71,7 @@ public class AppMgr { static void init() { mp = new HashMap, HashMap>>(); fromTransam = new Handler(); - transam = new Transam(UserInfo.ip, UserInfo.port, fromTransam); + transam = new Transam(Infomation.ip, Infomation.port, fromTransam); fromGPS = new Handler(); tracker = new Tracker(nowAct.getApplicationContext(), fromGPS); tTransam = new Thread(transam); diff --git a/client/Piztor/src/com/macaroon/piztor/InitAct.java b/client/Piztor/src/com/macaroon/piztor/InitAct.java index d5a6059..3986f5d 100644 --- a/client/Piztor/src/com/macaroon/piztor/InitAct.java +++ b/client/Piztor/src/com/macaroon/piztor/InitAct.java @@ -1,8 +1,6 @@ package com.macaroon.piztor; -import android.content.Intent; import android.os.Bundle; -import android.os.Handler; import android.view.Menu; public class InitAct extends PiztorAct { @@ -18,7 +16,7 @@ public class InitAct extends PiztorAct { @Override protected void onStart() { super.onStart(); - if (UserInfo.token == -1) + if (Infomation.token == -1) AppMgr.trigger(AppMgr.noToken); else { //TODO jump to main -- cgit v1.2.3-70-g09d2