summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--client/Piztor/gen/com/macaroon/piztor/R.java164
-rw-r--r--client/Piztor/res/values/strings.xml21
-rw-r--r--client/bin/classes/com/macaroon/piztor/ActMgr.classbin2650 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/ActStatus.classbin328 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/AppMgr$ActivityStatus.classbin1412 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/AppMgr.classbin4546 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/BuildConfig.classbin347 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/ClassCannotFind.classbin329 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/EmptyStatus.classbin471 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/GPSTracker$1.classbin1190 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/GPSTracker$2.classbin859 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/GPSTracker.classbin5656 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/InitAct.classbin1134 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/Login$1.classbin1209 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/Login$2.classbin872 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/Login$LoginStatus.classbin1698 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/Login$StartStatus.classbin653 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/Login.classbin2665 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/Main$1.classbin1451 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/Main.classbin1637 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/PiztorAct.classbin2205 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/PiztorExcepiton.classbin377 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/R$attr.classbin343 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/R$dimen.classbin464 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/R$drawable.classbin1399 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/R$id.classbin2291 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/R$layout.classbin823 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/R$menu.classbin479 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/R$string.classbin937 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/R$style.classbin434 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/R.classbin683 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/Req.classbin493 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/ReqLocation.classbin432 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/ReqLogin.classbin509 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/ReqUpdate.classbin499 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/Res.classbin388 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/ResLocation.classbin650 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/ResLogin.classbin376 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/ResUpdate.classbin337 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/Rlocation.classbin469 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/Setting.classbin804 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/SocketClient.classbin4196 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/Tracker$GPSTask.classbin1457 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/Tracker.classbin1332 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/Transam$1.classbin1064 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/Transam$Timertk.classbin1131 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/Transam$thd.classbin1643 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/Transam$tmain.classbin535 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/Transam.classbin2807 -> 0 bytes
-rw-r--r--client/bin/classes/com/macaroon/piztor/UserInfo.classbin486 -> 0 bytes
-rw-r--r--client/src/com/macaroon/piztor/ActMgr.java5
-rw-r--r--client/src/com/macaroon/piztor/AppMgr.java2
-rw-r--r--client/src/com/macaroon/piztor/Setting.java21
53 files changed, 206 insertions, 7 deletions
diff --git a/client/Piztor/gen/com/macaroon/piztor/R.java b/client/Piztor/gen/com/macaroon/piztor/R.java
new file mode 100644
index 0000000..3d07e1d
--- /dev/null
+++ b/client/Piztor/gen/com/macaroon/piztor/R.java
@@ -0,0 +1,164 @@
+/* AUTO-GENERATED FILE. DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found. It
+ * should not be modified by hand.
+ */
+
+package com.macaroon.piztor;
+
+public final class R {
+ public static final class attr {
+ }
+ public static final class dimen {
+ /** Default screen margins, per the Android Design guidelines.
+
+ Customize dimensions originally defined in res/values/dimens.xml (such as
+ screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
+
+ */
+ public static final int activity_horizontal_margin=0x7f040000;
+ public static final int activity_vertical_margin=0x7f040001;
+ }
+ public static final class drawable {
+ public static final int bottom_img=0x7f020000;
+ public static final int footbar_background=0x7f020001;
+ public static final int footbar_btn_checkin_style=0x7f020002;
+ public static final int footbar_btn_fetch_style=0x7f020003;
+ public static final int footbar_btn_focus_style=0x7f020004;
+ public static final int footbar_btn_search_style=0x7f020005;
+ public static final int footbar_btn_settings_style=0x7f020006;
+ public static final int footbar_checkin=0x7f020007;
+ public static final int footbar_checkin_1=0x7f020008;
+ public static final int footbar_fetch=0x7f020009;
+ public static final int footbar_fetch_1=0x7f02000a;
+ public static final int footbar_marker=0x7f02000b;
+ public static final int footbar_marker_1=0x7f02000c;
+ public static final int footbar_search=0x7f02000d;
+ public static final int footbar_search_1=0x7f02000e;
+ public static final int footbar_select_bg=0x7f02000f;
+ public static final int footbar_settings=0x7f020010;
+ public static final int footbar_settings_1=0x7f020011;
+ public static final int footbar_unselect_bg=0x7f020012;
+ public static final int horizontal_line=0x7f020013;
+ public static final int ic_launcher=0x7f020014;
+ public static final int navigation_back=0x7f020015;
+ public static final int navigation_back_1=0x7f020016;
+ public static final int title_logo=0x7f020017;
+ public static final int topbar_background=0x7f020018;
+ }
+ public static final class id {
+ public static final int action_settings=0x7f08002c;
+ public static final int footbar_btn_checkin=0x7f08001f;
+ public static final int footbar_btn_checkin_layout=0x7f08001e;
+ public static final int footbar_btn_checkin_text=0x7f080020;
+ public static final int footbar_btn_fetch=0x7f08001c;
+ public static final int footbar_btn_fetch_layout=0x7f08001b;
+ public static final int footbar_btn_fetch_text=0x7f08001d;
+ public static final int footbar_btn_focus=0x7f080022;
+ public static final int footbar_btn_focus_layout=0x7f080021;
+ public static final int footbar_btn_focus_text=0x7f080023;
+ public static final int footbar_btn_search=0x7f080019;
+ public static final int footbar_btn_search_layout=0x7f080018;
+ public static final int footbar_btn_search_text=0x7f08001a;
+ public static final int footbar_btn_settings=0x7f080025;
+ public static final int footbar_btn_settings_layout=0x7f080024;
+ public static final int footbar_btn_settings_text=0x7f080027;
+ public static final int gather_footbar_layout=0x7f080001;
+ public static final int gather_timer=0x7f080026;
+ public static final int gather_timer_layout=0x7f080000;
+ public static final int headbar_appname=0x7f080029;
+ public static final int headbar_logo=0x7f080028;
+ public static final int login_btn_login=0x7f080007;
+ public static final int main_footbar_layout=0x7f080009;
+ public static final int main_headbar_img=0x7f080002;
+ public static final int main_headbar_layout=0x7f080008;
+ public static final int settings_GPSrefreshrate=0x7f08000c;
+ public static final int settings_GPSrefreshrate_text=0x7f08000b;
+ public static final int settings_btn_back=0x7f08002a;
+ public static final int settings_headbar_layout=0x7f08000a;
+ public static final int settings_headbar_text=0x7f08002b;
+ public static final int settings_seperator1=0x7f08000d;
+ public static final int settings_seperator2=0x7f080012;
+ public static final int settings_seperator3=0x7f080017;
+ public static final int settings_sex_layout=0x7f08000e;
+ public static final int settings_sex_text=0x7f08000f;
+ public static final int settings_show_female=0x7f080011;
+ public static final int settings_show_male=0x7f080010;
+ public static final int settings_team_all=0x7f080016;
+ public static final int settings_team_layout=0x7f080013;
+ public static final int settings_team_mine=0x7f080015;
+ public static final int settings_team_text=0x7f080014;
+ public static final int user_id=0x7f080004;
+ public static final int user_id_text=0x7f080003;
+ public static final int user_pass=0x7f080006;
+ public static final int user_pass_text=0x7f080005;
+ }
+ public static final class layout {
+ public static final int activity_gather=0x7f030000;
+ public static final int activity_init=0x7f030001;
+ public static final int activity_login=0x7f030002;
+ public static final int activity_main=0x7f030003;
+ public static final int activity_setting=0x7f030004;
+ public static final int activity_settings=0x7f030005;
+ public static final int gather_footbar=0x7f030006;
+ public static final int gather_timer=0x7f030007;
+ public static final int login_bottom=0x7f030008;
+ public static final int main_footbar=0x7f030009;
+ public static final int main_headbar=0x7f03000a;
+ public static final int settings_headbar=0x7f03000b;
+ }
+ public static final class menu {
+ public static final int init=0x7f070000;
+ public static final int login=0x7f070001;
+ public static final int main=0x7f070002;
+ public static final int setting=0x7f070003;
+ }
+ public static final class string {
+ public static final int action_settings=0x7f050001;
+ public static final int all=0x7f05000c;
+ public static final int app_name=0x7f050000;
+ public static final int checkin=0x7f050006;
+ public static final int female=0x7f05000a;
+ public static final int fetch=0x7f050005;
+ public static final int focus=0x7f050007;
+ public static final int hello_world=0x7f050002;
+ public static final int male=0x7f050009;
+ public static final int mine=0x7f05000d;
+ public static final int search=0x7f050004;
+ public static final int settings=0x7f050003;
+ public static final int show_sex=0x7f050008;
+ public static final int show_team=0x7f05000b;
+ public static final int title_activity_login=0x7f05000e;
+ public static final int title_activity_main=0x7f05000f;
+ public static final int title_activity_setting=0x7f050010;
+ }
+ public static final class style {
+ /**
+ Base application theme, dependent on API level. This theme is replaced
+ by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
+
+
+ Theme customizations available in newer API levels can go in
+ res/values-vXX/styles.xml, while customizations related to
+ backward-compatibility can go here.
+
+
+ Base application theme for API 11+. This theme completely replaces
+ AppBaseTheme from res/values/styles.xml on API 11+ devices.
+
+ API 11 theme customizations can go here.
+
+ Base application theme for API 14+. This theme completely replaces
+ AppBaseTheme from BOTH res/values/styles.xml and
+ res/values-v11/styles.xml on API 14+ devices.
+
+ API 14 theme customizations can go here.
+ */
+ public static final int AppBaseTheme=0x7f060000;
+ /** Application theme.
+ All customizations that are NOT specific to a particular API-level can go here.
+ */
+ public static final int AppTheme=0x7f060001;
+ }
+}
diff --git a/client/Piztor/res/values/strings.xml b/client/Piztor/res/values/strings.xml
new file mode 100644
index 0000000..5a5ccc4
--- /dev/null
+++ b/client/Piztor/res/values/strings.xml
@@ -0,0 +1,21 @@
+<resources>
+
+ <string name="app_name">piztor</string>
+ <string name="action_settings">Settings</string>
+ <string name="hello_world">Hello world!</string>
+ <string name="settings">Settings</string>
+ <string name="search">Search</string>
+ <string name="fetch">Fetch</string>
+ <string name="checkin">Checkin</string>
+ <string name="focus">Focus</string>
+ <string name="show_sex">Show sex: </string>
+ <string name="male">Male</string>
+ <string name="female">Female</string>
+ <string name="show_team">Show team: </string>
+ <string name="all">All</string>
+ <string name="mine">Mine</string>
+ <string name="title_activity_login">Login</string>
+ <string name="title_activity_main">Main</string>
+ <string name="title_activity_setting">Setting</string>
+
+</resources>
diff --git a/client/bin/classes/com/macaroon/piztor/ActMgr.class b/client/bin/classes/com/macaroon/piztor/ActMgr.class
deleted file mode 100644
index a219c2d..0000000
--- a/client/bin/classes/com/macaroon/piztor/ActMgr.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/ActStatus.class b/client/bin/classes/com/macaroon/piztor/ActStatus.class
deleted file mode 100644
index 296a7d5..0000000
--- a/client/bin/classes/com/macaroon/piztor/ActStatus.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/AppMgr$ActivityStatus.class b/client/bin/classes/com/macaroon/piztor/AppMgr$ActivityStatus.class
deleted file mode 100644
index f11e546..0000000
--- a/client/bin/classes/com/macaroon/piztor/AppMgr$ActivityStatus.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/AppMgr.class b/client/bin/classes/com/macaroon/piztor/AppMgr.class
deleted file mode 100644
index 61aa240..0000000
--- a/client/bin/classes/com/macaroon/piztor/AppMgr.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/BuildConfig.class b/client/bin/classes/com/macaroon/piztor/BuildConfig.class
deleted file mode 100644
index 566eb01..0000000
--- a/client/bin/classes/com/macaroon/piztor/BuildConfig.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/ClassCannotFind.class b/client/bin/classes/com/macaroon/piztor/ClassCannotFind.class
deleted file mode 100644
index 5483510..0000000
--- a/client/bin/classes/com/macaroon/piztor/ClassCannotFind.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/EmptyStatus.class b/client/bin/classes/com/macaroon/piztor/EmptyStatus.class
deleted file mode 100644
index 8b48ad5..0000000
--- a/client/bin/classes/com/macaroon/piztor/EmptyStatus.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/GPSTracker$1.class b/client/bin/classes/com/macaroon/piztor/GPSTracker$1.class
deleted file mode 100644
index 084d23b..0000000
--- a/client/bin/classes/com/macaroon/piztor/GPSTracker$1.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/GPSTracker$2.class b/client/bin/classes/com/macaroon/piztor/GPSTracker$2.class
deleted file mode 100644
index b646e44..0000000
--- a/client/bin/classes/com/macaroon/piztor/GPSTracker$2.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/GPSTracker.class b/client/bin/classes/com/macaroon/piztor/GPSTracker.class
deleted file mode 100644
index 3ac1723..0000000
--- a/client/bin/classes/com/macaroon/piztor/GPSTracker.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/InitAct.class b/client/bin/classes/com/macaroon/piztor/InitAct.class
deleted file mode 100644
index d03ee93..0000000
--- a/client/bin/classes/com/macaroon/piztor/InitAct.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/Login$1.class b/client/bin/classes/com/macaroon/piztor/Login$1.class
deleted file mode 100644
index f50ba38..0000000
--- a/client/bin/classes/com/macaroon/piztor/Login$1.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/Login$2.class b/client/bin/classes/com/macaroon/piztor/Login$2.class
deleted file mode 100644
index 3f2fd55..0000000
--- a/client/bin/classes/com/macaroon/piztor/Login$2.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/Login$LoginStatus.class b/client/bin/classes/com/macaroon/piztor/Login$LoginStatus.class
deleted file mode 100644
index 9541a88..0000000
--- a/client/bin/classes/com/macaroon/piztor/Login$LoginStatus.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/Login$StartStatus.class b/client/bin/classes/com/macaroon/piztor/Login$StartStatus.class
deleted file mode 100644
index b32b989..0000000
--- a/client/bin/classes/com/macaroon/piztor/Login$StartStatus.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/Login.class b/client/bin/classes/com/macaroon/piztor/Login.class
deleted file mode 100644
index ae6b3a2..0000000
--- a/client/bin/classes/com/macaroon/piztor/Login.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/Main$1.class b/client/bin/classes/com/macaroon/piztor/Main$1.class
deleted file mode 100644
index c726600..0000000
--- a/client/bin/classes/com/macaroon/piztor/Main$1.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/Main.class b/client/bin/classes/com/macaroon/piztor/Main.class
deleted file mode 100644
index f0515de..0000000
--- a/client/bin/classes/com/macaroon/piztor/Main.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/PiztorAct.class b/client/bin/classes/com/macaroon/piztor/PiztorAct.class
deleted file mode 100644
index 4a3fc81..0000000
--- a/client/bin/classes/com/macaroon/piztor/PiztorAct.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/PiztorExcepiton.class b/client/bin/classes/com/macaroon/piztor/PiztorExcepiton.class
deleted file mode 100644
index bfb599b..0000000
--- a/client/bin/classes/com/macaroon/piztor/PiztorExcepiton.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/R$attr.class b/client/bin/classes/com/macaroon/piztor/R$attr.class
deleted file mode 100644
index a95e1ab..0000000
--- a/client/bin/classes/com/macaroon/piztor/R$attr.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/R$dimen.class b/client/bin/classes/com/macaroon/piztor/R$dimen.class
deleted file mode 100644
index 4bc657f..0000000
--- a/client/bin/classes/com/macaroon/piztor/R$dimen.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/R$drawable.class b/client/bin/classes/com/macaroon/piztor/R$drawable.class
deleted file mode 100644
index b31a626..0000000
--- a/client/bin/classes/com/macaroon/piztor/R$drawable.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/R$id.class b/client/bin/classes/com/macaroon/piztor/R$id.class
deleted file mode 100644
index e08c969..0000000
--- a/client/bin/classes/com/macaroon/piztor/R$id.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/R$layout.class b/client/bin/classes/com/macaroon/piztor/R$layout.class
deleted file mode 100644
index de25e3c..0000000
--- a/client/bin/classes/com/macaroon/piztor/R$layout.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/R$menu.class b/client/bin/classes/com/macaroon/piztor/R$menu.class
deleted file mode 100644
index 7f7cacb..0000000
--- a/client/bin/classes/com/macaroon/piztor/R$menu.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/R$string.class b/client/bin/classes/com/macaroon/piztor/R$string.class
deleted file mode 100644
index 65d1b80..0000000
--- a/client/bin/classes/com/macaroon/piztor/R$string.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/R$style.class b/client/bin/classes/com/macaroon/piztor/R$style.class
deleted file mode 100644
index 052dd30..0000000
--- a/client/bin/classes/com/macaroon/piztor/R$style.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/R.class b/client/bin/classes/com/macaroon/piztor/R.class
deleted file mode 100644
index d173856..0000000
--- a/client/bin/classes/com/macaroon/piztor/R.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/Req.class b/client/bin/classes/com/macaroon/piztor/Req.class
deleted file mode 100644
index 1a5fcce..0000000
--- a/client/bin/classes/com/macaroon/piztor/Req.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/ReqLocation.class b/client/bin/classes/com/macaroon/piztor/ReqLocation.class
deleted file mode 100644
index 5b3836e..0000000
--- a/client/bin/classes/com/macaroon/piztor/ReqLocation.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/ReqLogin.class b/client/bin/classes/com/macaroon/piztor/ReqLogin.class
deleted file mode 100644
index 8dd7e6c..0000000
--- a/client/bin/classes/com/macaroon/piztor/ReqLogin.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/ReqUpdate.class b/client/bin/classes/com/macaroon/piztor/ReqUpdate.class
deleted file mode 100644
index 2ecc696..0000000
--- a/client/bin/classes/com/macaroon/piztor/ReqUpdate.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/Res.class b/client/bin/classes/com/macaroon/piztor/Res.class
deleted file mode 100644
index 8f468e8..0000000
--- a/client/bin/classes/com/macaroon/piztor/Res.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/ResLocation.class b/client/bin/classes/com/macaroon/piztor/ResLocation.class
deleted file mode 100644
index 31581a5..0000000
--- a/client/bin/classes/com/macaroon/piztor/ResLocation.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/ResLogin.class b/client/bin/classes/com/macaroon/piztor/ResLogin.class
deleted file mode 100644
index fff8e1a..0000000
--- a/client/bin/classes/com/macaroon/piztor/ResLogin.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/ResUpdate.class b/client/bin/classes/com/macaroon/piztor/ResUpdate.class
deleted file mode 100644
index 5cb7c55..0000000
--- a/client/bin/classes/com/macaroon/piztor/ResUpdate.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/Rlocation.class b/client/bin/classes/com/macaroon/piztor/Rlocation.class
deleted file mode 100644
index 3a955e2..0000000
--- a/client/bin/classes/com/macaroon/piztor/Rlocation.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/Setting.class b/client/bin/classes/com/macaroon/piztor/Setting.class
deleted file mode 100644
index a5e0cd5..0000000
--- a/client/bin/classes/com/macaroon/piztor/Setting.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/SocketClient.class b/client/bin/classes/com/macaroon/piztor/SocketClient.class
deleted file mode 100644
index 2307639..0000000
--- a/client/bin/classes/com/macaroon/piztor/SocketClient.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/Tracker$GPSTask.class b/client/bin/classes/com/macaroon/piztor/Tracker$GPSTask.class
deleted file mode 100644
index a69c317..0000000
--- a/client/bin/classes/com/macaroon/piztor/Tracker$GPSTask.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/Tracker.class b/client/bin/classes/com/macaroon/piztor/Tracker.class
deleted file mode 100644
index e8b12d2..0000000
--- a/client/bin/classes/com/macaroon/piztor/Tracker.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/Transam$1.class b/client/bin/classes/com/macaroon/piztor/Transam$1.class
deleted file mode 100644
index 5a3b4b9..0000000
--- a/client/bin/classes/com/macaroon/piztor/Transam$1.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/Transam$Timertk.class b/client/bin/classes/com/macaroon/piztor/Transam$Timertk.class
deleted file mode 100644
index dcea553..0000000
--- a/client/bin/classes/com/macaroon/piztor/Transam$Timertk.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/Transam$thd.class b/client/bin/classes/com/macaroon/piztor/Transam$thd.class
deleted file mode 100644
index 8f0523e..0000000
--- a/client/bin/classes/com/macaroon/piztor/Transam$thd.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/Transam$tmain.class b/client/bin/classes/com/macaroon/piztor/Transam$tmain.class
deleted file mode 100644
index 080410b..0000000
--- a/client/bin/classes/com/macaroon/piztor/Transam$tmain.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/Transam.class b/client/bin/classes/com/macaroon/piztor/Transam.class
deleted file mode 100644
index d9ea126..0000000
--- a/client/bin/classes/com/macaroon/piztor/Transam.class
+++ /dev/null
Binary files differ
diff --git a/client/bin/classes/com/macaroon/piztor/UserInfo.class b/client/bin/classes/com/macaroon/piztor/UserInfo.class
deleted file mode 100644
index 72b434a..0000000
--- a/client/bin/classes/com/macaroon/piztor/UserInfo.class
+++ /dev/null
Binary files differ
diff --git a/client/src/com/macaroon/piztor/ActMgr.java b/client/src/com/macaroon/piztor/ActMgr.java
index 4df6bae..f5ff994 100644
--- a/client/src/com/macaroon/piztor/ActMgr.java
+++ b/client/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/src/com/macaroon/piztor/AppMgr.java b/client/src/com/macaroon/piztor/AppMgr.java
index 2e5e2b3..10e8e1a 100644
--- a/client/src/com/macaroon/piztor/AppMgr.java
+++ b/client/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/src/com/macaroon/piztor/Setting.java b/client/src/com/macaroon/piztor/Setting.java
index 610333f..2a2d2fa 100644
--- a/client/src/com/macaroon/piztor/Setting.java
+++ b/client/src/com/macaroon/piztor/Setting.java
@@ -1,21 +1,30 @@
package com.macaroon.piztor;
import android.os.Bundle;
-import android.app.Activity;
import android.view.Menu;
-public class Setting extends Activity {
-
+public class InitAct extends PiztorAct {
@Override
protected void onCreate(Bundle savedInstanceState) {
+ id = "initAct";
super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_setting);
+ AppMgr.init();
+ setContentView(R.layout.activity_init);
+ }
+
+ @Override
+ protected void onStart() {
+ super.onStart();
+ if (Infomation.token == -1)
+ AppMgr.trigger(AppMgr.noToken);
+ else {
+ //TODO jump to main
+ }
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
- // Inflate the menu; this adds items to the action bar if it is present.
- getMenuInflater().inflate(R.menu.setting, menu);
+ getMenuInflater().inflate(R.menu.init, menu);
return true;
}