diff options
author | goblin911 <[email protected]> | 2013-08-25 20:25:50 +0800 |
---|---|---|
committer | goblin911 <[email protected]> | 2013-08-25 20:25:50 +0800 |
commit | e5599da7fdd344fdcb49e8d6780a1e2ad358ee2d (patch) | |
tree | 5bbeb39bd91eceeb265a8ccb8c19984d1a8ce089 | |
parent | e962b84db615005d073b0fb4b5240093a826408f (diff) |
Main is working....
-rw-r--r-- | client/Piztor/bin/classes/com/macaroon/piztor/ActMgr.class | bin | 2650 -> 2797 bytes | |||
-rw-r--r-- | client/Piztor/bin/classes/com/macaroon/piztor/ActStatus.class | bin | 328 -> 328 bytes | |||
-rw-r--r-- | client/Piztor/bin/classes/com/macaroon/piztor/AppMgr.class | bin | 4546 -> 4548 bytes | |||
-rw-r--r-- | client/Piztor/bin/classes/com/macaroon/piztor/EmptyStatus.class | bin | 471 -> 471 bytes | |||
-rw-r--r-- | client/Piztor/bin/classes/com/macaroon/piztor/InitAct.class | bin | 1134 -> 1136 bytes | |||
-rw-r--r-- | client/Piztor/src/com/macaroon/piztor/ActMgr.java | 5 | ||||
-rw-r--r-- | client/Piztor/src/com/macaroon/piztor/AppMgr.java | 2 | ||||
-rw-r--r-- | client/Piztor/src/com/macaroon/piztor/InitAct.java | 4 |
8 files changed, 7 insertions, 4 deletions
diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/ActMgr.class b/client/Piztor/bin/classes/com/macaroon/piztor/ActMgr.class Binary files differindex a219c2d..786ec1d 100644 --- a/client/Piztor/bin/classes/com/macaroon/piztor/ActMgr.class +++ b/client/Piztor/bin/classes/com/macaroon/piztor/ActMgr.class diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/ActStatus.class b/client/Piztor/bin/classes/com/macaroon/piztor/ActStatus.class Binary files differindex 296a7d5..15cc794 100644 --- a/client/Piztor/bin/classes/com/macaroon/piztor/ActStatus.class +++ b/client/Piztor/bin/classes/com/macaroon/piztor/ActStatus.class diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/AppMgr.class b/client/Piztor/bin/classes/com/macaroon/piztor/AppMgr.class Binary files differindex 61aa240..41f9ead 100644 --- a/client/Piztor/bin/classes/com/macaroon/piztor/AppMgr.class +++ b/client/Piztor/bin/classes/com/macaroon/piztor/AppMgr.class diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/EmptyStatus.class b/client/Piztor/bin/classes/com/macaroon/piztor/EmptyStatus.class Binary files differindex 8b48ad5..74aa729 100644 --- a/client/Piztor/bin/classes/com/macaroon/piztor/EmptyStatus.class +++ b/client/Piztor/bin/classes/com/macaroon/piztor/EmptyStatus.class diff --git a/client/Piztor/bin/classes/com/macaroon/piztor/InitAct.class b/client/Piztor/bin/classes/com/macaroon/piztor/InitAct.class Binary files differindex d03ee93..487831d 100644 --- a/client/Piztor/bin/classes/com/macaroon/piztor/InitAct.class +++ b/client/Piztor/bin/classes/com/macaroon/piztor/InitAct.class 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<ActStatus, HashMap<Integer, ActStatus>>(); for (int i = 0; i < r.length; i++) { mp.put(r[i], new HashMap<Integer, ActStatus>()); @@ -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<Class<?>, HashMap<Integer, Class<?>>>(); 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 |