summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTeddy <ted.sybil@gmail.com>2013-08-26 09:48:29 +0800
committerTeddy <ted.sybil@gmail.com>2013-08-26 09:48:29 +0800
commit9b9993e33932058cc78d1882a301eefd22380b45 (patch)
treee0f86e718ffc18b7f5941cd71a721e3b461296c6
parent7f91994a99cb7d23a22d949454e861e879a68e98 (diff)
parent6400b18210587cb25b475bc2d3979b9a6da5eda4 (diff)
Merge branch 'master' of github.com:Determinant/piztor
-rw-r--r--client/Piztor/.classpath9
-rw-r--r--client/Piztor/.project33
-rw-r--r--client/Piztor/.settings/org.eclipse.jdt.core.prefs4
-rw-r--r--client/Piztor/AndroidManifest.xml42
-rw-r--r--client/Piztor/ic_launcher-web.pngbin0 -> 130248 bytes
-rw-r--r--client/Piztor/proguard-project.txt20
-rw-r--r--client/Piztor/project.properties14
-rw-r--r--client/Piztor/res/drawable-hdpi/ic_launcher.pngbin0 -> 6165 bytes
-rw-r--r--client/Piztor/res/drawable-mdpi/ic_launcher.pngbin0 -> 3245 bytes
-rw-r--r--client/Piztor/res/drawable-xhdpi/ic_launcher.pngbin0 -> 9545 bytes
-rw-r--r--client/Piztor/res/drawable-xxhdpi/ic_launcher.pngbin0 -> 17793 bytes
-rw-r--r--client/Piztor/res/drawable/bottom_img.pngbin0 -> 525331 bytes
-rw-r--r--client/Piztor/res/drawable/footbar_background.pngbin0 -> 23943 bytes
-rw-r--r--client/Piztor/res/drawable/footbar_btn_checkin_style.xml7
-rw-r--r--client/Piztor/res/drawable/footbar_btn_fetch_style.xml6
-rw-r--r--client/Piztor/res/drawable/footbar_btn_focus_style.xml6
-rw-r--r--client/Piztor/res/drawable/footbar_btn_search_style.xml6
-rw-r--r--client/Piztor/res/drawable/footbar_btn_settings_style.xml6
-rw-r--r--client/Piztor/res/drawable/footbar_checkin.pngbin0 -> 468 bytes
-rw-r--r--client/Piztor/res/drawable/footbar_checkin_1.pngbin0 -> 3371 bytes
-rw-r--r--client/Piztor/res/drawable/footbar_fetch.pngbin0 -> 2541 bytes
-rw-r--r--client/Piztor/res/drawable/footbar_fetch_1.pngbin0 -> 3093 bytes
-rw-r--r--client/Piztor/res/drawable/footbar_marker.pngbin0 -> 1866 bytes
-rw-r--r--client/Piztor/res/drawable/footbar_marker_1.pngbin0 -> 3288 bytes
-rw-r--r--client/Piztor/res/drawable/footbar_search.pngbin0 -> 2127 bytes
-rw-r--r--client/Piztor/res/drawable/footbar_search_1.pngbin0 -> 3589 bytes
-rw-r--r--client/Piztor/res/drawable/footbar_select_bg.pngbin0 -> 8919 bytes
-rw-r--r--client/Piztor/res/drawable/footbar_settings.pngbin0 -> 1372 bytes
-rw-r--r--client/Piztor/res/drawable/footbar_settings_1.pngbin0 -> 3442 bytes
-rw-r--r--client/Piztor/res/drawable/footbar_unselect_bg.pngbin0 -> 165 bytes
-rw-r--r--client/Piztor/res/drawable/horizontal_line.pngbin0 -> 796 bytes
-rw-r--r--client/Piztor/res/drawable/navigation_back.pngbin0 -> 1324 bytes
-rw-r--r--client/Piztor/res/drawable/navigation_back_1.pngbin0 -> 401 bytes
-rw-r--r--client/Piztor/res/drawable/title_logo.pngbin0 -> 1031640 bytes
-rw-r--r--client/Piztor/res/drawable/topbar_background.pngbin0 -> 23763 bytes
-rw-r--r--client/Piztor/res/layout/activity_gather.xml23
-rw-r--r--client/Piztor/res/layout/activity_init.xml16
-rw-r--r--client/Piztor/res/layout/activity_login.xml92
-rw-r--r--client/Piztor/res/layout/activity_main.xml23
-rw-r--r--client/Piztor/res/layout/activity_settings.xml149
-rw-r--r--client/Piztor/res/layout/gather_footbar.xml133
-rw-r--r--client/Piztor/res/layout/gather_timer.xml16
-rw-r--r--client/Piztor/res/layout/login_bottom.xml13
-rw-r--r--client/Piztor/res/layout/main_footbar.xml107
-rw-r--r--client/Piztor/res/layout/main_headbar.xml29
-rw-r--r--client/Piztor/res/layout/settings_headbar.xml29
-rw-r--r--client/Piztor/res/menu/init.xml9
-rw-r--r--client/Piztor/res/menu/login.xml9
-rw-r--r--client/Piztor/res/menu/main.xml9
-rw-r--r--client/Piztor/res/menu/setting.xml9
-rw-r--r--client/Piztor/res/values-sw600dp/dimens.xml8
-rw-r--r--client/Piztor/res/values-sw720dp-land/dimens.xml9
-rw-r--r--client/Piztor/res/values-v11/styles.xml11
-rw-r--r--client/Piztor/res/values-v14/styles.xml12
-rw-r--r--client/Piztor/res/values/dimens.xml7
-rw-r--r--client/Piztor/res/values/strings.xml21
-rw-r--r--client/Piztor/res/values/styles.xml20
-rw-r--r--client/Piztor/src/com/macaroon/piztor/ActMgr.java67
-rw-r--r--client/Piztor/src/com/macaroon/piztor/AppMgr.java89
-rw-r--r--client/Piztor/src/com/macaroon/piztor/GPSTracker.java241
-rw-r--r--client/Piztor/src/com/macaroon/piztor/InitAct.java34
-rw-r--r--client/Piztor/src/com/macaroon/piztor/Login.java104
-rw-r--r--client/Piztor/src/com/macaroon/piztor/Main.java205
-rw-r--r--client/Piztor/src/com/macaroon/piztor/PiztorAct.java60
-rw-r--r--client/Piztor/src/com/macaroon/piztor/PiztorExcepiton.java10
-rw-r--r--client/Piztor/src/com/macaroon/piztor/Req.java14
-rw-r--r--client/Piztor/src/com/macaroon/piztor/ReqLocation.java14
-rw-r--r--client/Piztor/src/com/macaroon/piztor/ReqLogin.java16
-rw-r--r--client/Piztor/src/com/macaroon/piztor/ReqUpdate.java16
-rw-r--r--client/Piztor/src/com/macaroon/piztor/Res.java11
-rw-r--r--client/Piztor/src/com/macaroon/piztor/ResLocation.java18
-rw-r--r--client/Piztor/src/com/macaroon/piztor/ResLogin.java15
-rw-r--r--client/Piztor/src/com/macaroon/piztor/ResUpdate.java13
-rw-r--r--client/Piztor/src/com/macaroon/piztor/Rlocation.java13
-rw-r--r--client/Piztor/src/com/macaroon/piztor/Settings.java22
-rw-r--r--client/Piztor/src/com/macaroon/piztor/SocketClient.java107
-rw-r--r--client/Piztor/src/com/macaroon/piztor/Tracker.java68
-rw-r--r--client/Piztor/src/com/macaroon/piztor/Transam.java139
-rw-r--r--client/Piztor/src/com/macaroon/piztor/UserInfo.java7
-rw-r--r--client/README.rst1
80 files changed, 2191 insertions, 0 deletions
diff --git a/client/Piztor/.classpath b/client/Piztor/.classpath
new file mode 100644
index 0000000..7bc01d9
--- /dev/null
+++ b/client/Piztor/.classpath
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="gen"/>
+ <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+ <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+ <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+ <classpathentry kind="output" path="bin/classes"/>
+</classpath>
diff --git a/client/Piztor/.project b/client/Piztor/.project
new file mode 100644
index 0000000..97100ec
--- /dev/null
+++ b/client/Piztor/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>Piztor</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>com.android.ide.eclipse.adt.ApkBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/client/Piztor/.settings/org.eclipse.jdt.core.prefs b/client/Piztor/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..b080d2d
--- /dev/null
+++ b/client/Piztor/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/client/Piztor/AndroidManifest.xml b/client/Piztor/AndroidManifest.xml
new file mode 100644
index 0000000..b18d8e2
--- /dev/null
+++ b/client/Piztor/AndroidManifest.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.macaroon.piztor"
+ android:versionCode="1"
+ android:versionName="1.0" >
+
+ <uses-sdk
+ android:minSdkVersion="8"
+ android:targetSdkVersion="17" />
+
+ <application
+ android:allowBackup="true"
+ android:icon="@drawable/ic_launcher"
+ android:label="@string/app_name"
+ android:theme="@android:style/Theme.Black.NoTitleBar" >
+ <activity
+ android:name="com.macaroon.piztor.InitAct"
+ android:label="@string/app_name" >
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+ <activity
+ android:name="com.macaroon.piztor.Login"
+ android:label="@string/title_activity_login" >
+ </activity>
+ <activity
+ android:name="com.macaroon.piztor.Main"
+ android:label="@string/title_activity_main" >
+ </activity>
+ <activity
+ android:name="com.macaroon.piztor.Setting"
+ android:label="@string/title_activity_setting" >
+ </activity>
+ </application>
+
+ <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+
+</manifest>
diff --git a/client/Piztor/ic_launcher-web.png b/client/Piztor/ic_launcher-web.png
new file mode 100644
index 0000000..3cd0ac2
--- /dev/null
+++ b/client/Piztor/ic_launcher-web.png
Binary files differ
diff --git a/client/Piztor/proguard-project.txt b/client/Piztor/proguard-project.txt
new file mode 100644
index 0000000..f2fe155
--- /dev/null
+++ b/client/Piztor/proguard-project.txt
@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
diff --git a/client/Piztor/project.properties b/client/Piztor/project.properties
new file mode 100644
index 0000000..ce39f2d
--- /dev/null
+++ b/client/Piztor/project.properties
@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-18
diff --git a/client/Piztor/res/drawable-hdpi/ic_launcher.png b/client/Piztor/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000..ddc6c13
--- /dev/null
+++ b/client/Piztor/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/client/Piztor/res/drawable-mdpi/ic_launcher.png b/client/Piztor/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000..7b6698a
--- /dev/null
+++ b/client/Piztor/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/client/Piztor/res/drawable-xhdpi/ic_launcher.png b/client/Piztor/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..20ea43a
--- /dev/null
+++ b/client/Piztor/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/client/Piztor/res/drawable-xxhdpi/ic_launcher.png b/client/Piztor/res/drawable-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..e1ca5c2
--- /dev/null
+++ b/client/Piztor/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/client/Piztor/res/drawable/bottom_img.png b/client/Piztor/res/drawable/bottom_img.png
new file mode 100644
index 0000000..2725ea8
--- /dev/null
+++ b/client/Piztor/res/drawable/bottom_img.png
Binary files differ
diff --git a/client/Piztor/res/drawable/footbar_background.png b/client/Piztor/res/drawable/footbar_background.png
new file mode 100644
index 0000000..488e8f2
--- /dev/null
+++ b/client/Piztor/res/drawable/footbar_background.png
Binary files differ
diff --git a/client/Piztor/res/drawable/footbar_btn_checkin_style.xml b/client/Piztor/res/drawable/footbar_btn_checkin_style.xml
new file mode 100644
index 0000000..6dbeb21
--- /dev/null
+++ b/client/Piztor/res/drawable/footbar_btn_checkin_style.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item android:state_pressed="true" android:drawable="@drawable/footbar_checkin_1"></item>
+ <item android:state_pressed="false" android:drawable="@drawable/footbar_checkin"></item>
+
+</selector>
diff --git a/client/Piztor/res/drawable/footbar_btn_fetch_style.xml b/client/Piztor/res/drawable/footbar_btn_fetch_style.xml
new file mode 100644
index 0000000..379d526
--- /dev/null
+++ b/client/Piztor/res/drawable/footbar_btn_fetch_style.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item android:state_pressed="true" android:drawable="@drawable/footbar_fetch_1"></item>
+ <item android:state_pressed="false" android:drawable="@drawable/footbar_fetch"></item>
+</selector>
diff --git a/client/Piztor/res/drawable/footbar_btn_focus_style.xml b/client/Piztor/res/drawable/footbar_btn_focus_style.xml
new file mode 100644
index 0000000..5932f2f
--- /dev/null
+++ b/client/Piztor/res/drawable/footbar_btn_focus_style.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item android:state_pressed="true" android:drawable="@drawable/footbar_marker_1"></item>
+ <item android:state_pressed="false" android:drawable="@drawable/footbar_marker"></item>
+</selector>
diff --git a/client/Piztor/res/drawable/footbar_btn_search_style.xml b/client/Piztor/res/drawable/footbar_btn_search_style.xml
new file mode 100644
index 0000000..ac786ef
--- /dev/null
+++ b/client/Piztor/res/drawable/footbar_btn_search_style.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item android:state_pressed="true" android:drawable="@drawable/footbar_search_1"></item>
+ <item android:state_pressed="false" android:drawable="@drawable/footbar_search"></item>
+</selector>
diff --git a/client/Piztor/res/drawable/footbar_btn_settings_style.xml b/client/Piztor/res/drawable/footbar_btn_settings_style.xml
new file mode 100644
index 0000000..fca6230
--- /dev/null
+++ b/client/Piztor/res/drawable/footbar_btn_settings_style.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <item android:state_pressed="true" android:drawable="@drawable/footbar_settings_1"></item>
+ <item android:state_pressed="false" android:drawable="@drawable/footbar_settings"></item>
+</selector>
diff --git a/client/Piztor/res/drawable/footbar_checkin.png b/client/Piztor/res/drawable/footbar_checkin.png
new file mode 100644
index 0000000..90afba7
--- /dev/null
+++ b/client/Piztor/res/drawable/footbar_checkin.png
Binary files differ
diff --git a/client/Piztor/res/drawable/footbar_checkin_1.png b/client/Piztor/res/drawable/footbar_checkin_1.png
new file mode 100644
index 0000000..a478d36
--- /dev/null
+++ b/client/Piztor/res/drawable/footbar_checkin_1.png
Binary files differ
diff --git a/client/Piztor/res/drawable/footbar_fetch.png b/client/Piztor/res/drawable/footbar_fetch.png
new file mode 100644
index 0000000..32d24d2
--- /dev/null
+++ b/client/Piztor/res/drawable/footbar_fetch.png
Binary files differ
diff --git a/client/Piztor/res/drawable/footbar_fetch_1.png b/client/Piztor/res/drawable/footbar_fetch_1.png
new file mode 100644
index 0000000..208094f
--- /dev/null
+++ b/client/Piztor/res/drawable/footbar_fetch_1.png
Binary files differ
diff --git a/client/Piztor/res/drawable/footbar_marker.png b/client/Piztor/res/drawable/footbar_marker.png
new file mode 100644
index 0000000..3de909f
--- /dev/null
+++ b/client/Piztor/res/drawable/footbar_marker.png
Binary files differ
diff --git a/client/Piztor/res/drawable/footbar_marker_1.png b/client/Piztor/res/drawable/footbar_marker_1.png
new file mode 100644
index 0000000..08c8715
--- /dev/null
+++ b/client/Piztor/res/drawable/footbar_marker_1.png
Binary files differ
diff --git a/client/Piztor/res/drawable/footbar_search.png b/client/Piztor/res/drawable/footbar_search.png
new file mode 100644
index 0000000..3549f84
--- /dev/null
+++ b/client/Piztor/res/drawable/footbar_search.png
Binary files differ
diff --git a/client/Piztor/res/drawable/footbar_search_1.png b/client/Piztor/res/drawable/footbar_search_1.png
new file mode 100644
index 0000000..1e6ac28
--- /dev/null
+++ b/client/Piztor/res/drawable/footbar_search_1.png
Binary files differ
diff --git a/client/Piztor/res/drawable/footbar_select_bg.png b/client/Piztor/res/drawable/footbar_select_bg.png
new file mode 100644
index 0000000..9d7e5af
--- /dev/null
+++ b/client/Piztor/res/drawable/footbar_select_bg.png
Binary files differ
diff --git a/client/Piztor/res/drawable/footbar_settings.png b/client/Piztor/res/drawable/footbar_settings.png
new file mode 100644
index 0000000..455bd0b
--- /dev/null
+++ b/client/Piztor/res/drawable/footbar_settings.png
Binary files differ
diff --git a/client/Piztor/res/drawable/footbar_settings_1.png b/client/Piztor/res/drawable/footbar_settings_1.png
new file mode 100644
index 0000000..6b0a2ab
--- /dev/null
+++ b/client/Piztor/res/drawable/footbar_settings_1.png
Binary files differ
diff --git a/client/Piztor/res/drawable/footbar_unselect_bg.png b/client/Piztor/res/drawable/footbar_unselect_bg.png
new file mode 100644
index 0000000..3e1e65e
--- /dev/null
+++ b/client/Piztor/res/drawable/footbar_unselect_bg.png
Binary files differ
diff --git a/client/Piztor/res/drawable/horizontal_line.png b/client/Piztor/res/drawable/horizontal_line.png
new file mode 100644
index 0000000..ccd6aa2
--- /dev/null
+++ b/client/Piztor/res/drawable/horizontal_line.png
Binary files differ
diff --git a/client/Piztor/res/drawable/navigation_back.png b/client/Piztor/res/drawable/navigation_back.png
new file mode 100644
index 0000000..3bdda98
--- /dev/null
+++ b/client/Piztor/res/drawable/navigation_back.png
Binary files differ
diff --git a/client/Piztor/res/drawable/navigation_back_1.png b/client/Piztor/res/drawable/navigation_back_1.png
new file mode 100644
index 0000000..a20b4ef
--- /dev/null
+++ b/