diff options
| author | Teddy <ted.sybil@gmail.com> | 2013-08-25 17:55:34 +0800 |
|---|---|---|
| committer | Teddy <ted.sybil@gmail.com> | 2013-08-25 17:55:34 +0800 |
| commit | f4d0989ae888bc2f83f0bc09cc826f7c79b1b6b5 (patch) | |
| tree | 79c9fbb49a5a857c56843cef01b032e3430aa085 | |
| parent | f74999631c4f83a0c8532d6b7adb348dcd5d5205 (diff) | |
| parent | 0a76dad753ed88a7575c2aafdd068ef6caa7247f (diff) | |
Merge branch 'master' of github.com:Determinant/piztor
| -rw-r--r-- | .classpath (renamed from client/Piztor/.classpath) | 0 | ||||
| -rw-r--r-- | .project (renamed from client/Piztor/.project) | 0 | ||||
| -rw-r--r-- | .settings/org.eclipse.jdt.core.prefs (renamed from client/Piztor/.settings/org.eclipse.jdt.core.prefs) | 0 | ||||
| -rw-r--r-- | AndroidManifest.xml | 42 | ||||
| -rw-r--r-- | bin/AndroidManifest.xml | 42 | ||||
| -rw-r--r-- | bin/Piztor.apk | bin | 0 -> 1009696 bytes | |||
| -rw-r--r-- | bin/classes.dex | bin | 0 -> 654056 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/ActMgr.class | bin | 0 -> 2650 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/ActStatus.class | bin | 0 -> 328 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/AppMgr$ActivityStatus.class | bin | 0 -> 1412 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/AppMgr.class | bin | 0 -> 4546 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/BuildConfig.class (renamed from client/Piztor/bin/classes/com/macaroon/piztor/BuildConfig.class) | bin | 347 -> 347 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/ClassCannotFind.class | bin | 0 -> 329 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/EmptyStatus.class | bin | 0 -> 471 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/GPSTracker$1.class | bin | 0 -> 1190 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/GPSTracker$2.class | bin | 0 -> 859 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/GPSTracker.class | bin | 0 -> 5656 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/InitAct.class | bin | 0 -> 1134 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/Login$1.class | bin | 0 -> 1209 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/Login$2.class | bin | 0 -> 872 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/Login$LoginStatus.class | bin | 0 -> 1698 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/Login$StartStatus.class | bin | 0 -> 653 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/Login.class | bin | 0 -> 2665 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/Main$1.class | bin | 0 -> 1451 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/Main.class | bin | 0 -> 1637 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/PiztorAct.class (renamed from client/Piztor/bin/classes/com/macaroon/piztor/PiztorAct.class) | bin | 2205 -> 2205 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/PiztorExcepiton.class | bin | 0 -> 377 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/R$attr.class (renamed from client/Piztor/bin/classes/com/macaroon/piztor/R$attr.class) | bin | 343 -> 343 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/R$dimen.class (renamed from client/Piztor/bin/classes/com/macaroon/piztor/R$dimen.class) | bin | 464 -> 464 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/R$drawable.class | bin | 0 -> 1399 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/R$id.class | bin | 0 -> 2291 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/R$layout.class | bin | 0 -> 823 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/R$menu.class | bin | 0 -> 479 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/R$string.class | bin | 0 -> 937 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/R$style.class | bin | 0 -> 434 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/R.class (renamed from client/Piztor/bin/classes/com/macaroon/piztor/R.class) | bin | 683 -> 683 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/Req.class | bin | 0 -> 493 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/ReqLocation.class | bin | 0 -> 432 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/ReqLogin.class | bin | 0 -> 509 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/ReqUpdate.class | bin | 0 -> 499 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/Res.class | bin | 0 -> 388 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/ResLocation.class | bin | 0 -> 650 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/ResLogin.class | bin | 0 -> 376 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/ResUpdate.class | bin | 0 -> 337 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/Rlocation.class | bin | 0 -> 469 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/Setting.class | bin | 0 -> 804 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/SocketClient.class | bin | 0 -> 4196 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/Tracker$GPSTask.class | bin | 0 -> 1457 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/Tracker.class | bin | 0 -> 1332 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/Transam$1.class | bin | 0 -> 1064 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/Transam$Timertk.class | bin | 0 -> 1131 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/Transam$thd.class | bin | 0 -> 1643 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/Transam$tmain.class | bin | 0 -> 535 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/Transam.class | bin | 0 -> 2807 bytes | |||
| -rw-r--r-- | bin/classes/com/macaroon/piztor/UserInfo.class | bin | 0 -> 486 bytes | |||
| -rw-r--r-- | bin/dexedLibs/android-support-v4-7d1c360a45ec8a3e1ddee5ade49de497.jar | bin | 0 -> 211326 bytes | |||
| -rw-r--r-- | bin/jarlist.cache (renamed from client/gps-demo/AndroidGPSTracking/bin/jarlist.cache) | 0 | ||||
| -rw-r--r-- | bin/res/drawable-hdpi/ic_launcher.png | bin | 0 -> 5964 bytes | |||
| -rw-r--r-- | bin/res/drawable-mdpi/ic_launcher.png | bin | 0 -> 3112 bytes | |||
| -rw-r--r-- | bin/res/drawable-xhdpi/ic_launcher.png | bin | 0 -> 9355 bytes | |||
| -rw-r--r-- | bin/res/drawable-xxhdpi/ic_launcher.png | bin | 0 -> 17889 bytes | |||
| -rw-r--r-- | bin/res/drawable/bottom_img.png | bin | 0 -> 526288 bytes | |||
| -rw-r--r-- | bin/res/drawable/footbar_background.png | bin | 0 -> 22626 bytes | |||
| -rw-r--r-- | bin/res/drawable/footbar_checkin.png | bin | 0 -> 253 bytes | |||
| -rw-r--r-- | bin/res/drawable/footbar_checkin_1.png | bin | 0 -> 2958 bytes | |||
| -rw-r--r-- | bin/res/drawable/footbar_fetch.png | bin | 0 -> 1800 bytes | |||
| -rw-r--r-- | bin/res/drawable/footbar_fetch_1.png | bin | 0 -> 2744 bytes | |||
| -rw-r--r-- | bin/res/drawable/footbar_marker.png | bin | 0 -> 986 bytes | |||
| -rw-r--r-- | bin/res/drawable/footbar_marker_1.png | bin | 0 -> 2862 bytes | |||
| -rw-r--r-- | bin/res/drawable/footbar_search.png | bin | 0 -> 1327 bytes | |||
| -rw-r--r-- | bin/res/drawable/footbar_search_1.png | bin | 0 -> 3137 bytes | |||
| -rw-r--r-- | bin/res/drawable/footbar_select_bg.png | bin | 0 -> 8879 bytes | |||
| -rw-r--r-- | bin/res/drawable/footbar_settings.png | bin | 0 -> 1100 bytes | |||
| -rw-r--r-- | bin/res/drawable/footbar_settings_1.png | bin | 0 -> 3003 bytes | |||
| -rw-r--r-- | bin/res/drawable/footbar_unselect_bg.png | bin | 0 -> 119 bytes | |||
| -rw-r--r-- | bin/res/drawable/horizontal_line.png | bin | 0 -> 705 bytes | |||
| -rw-r--r-- | bin/res/drawable/navigation_back.png | bin | 0 -> 397 bytes | |||
| -rw-r--r-- | bin/res/drawable/navigation_back_1.png | bin | 0 -> 170 bytes | |||
| -rw-r--r-- | bin/res/drawable/title_logo.png | bin | 0 -> 116965 bytes | |||
| -rw-r--r-- | bin/res/drawable/topbar_background.png | bin | 0 -> 23541 bytes | |||
| -rw-r--r-- | bin/resources.ap_ | bin | 0 -> 781019 bytes | |||
| -rw-r--r-- | gen/com/macaroon/piztor/BuildConfig.java (renamed from client/Piztor/gen/com/macaroon/piztor/BuildConfig.java) | 0 | ||||
| -rw-r--r-- | gen/com/macaroon/piztor/R.java | 164 | ||||
| -rw-r--r-- | ic_launcher-web.png | bin | 0 -> 130248 bytes | |||
| -rw-r--r-- | libs/android-support-v4.jar (renamed from client/Piztor/libs/android-support-v4.jar) | bin | 556198 -> 556198 bytes | |||
| -rw-r--r-- | misc/client/Piztor/.classpath | 9 | ||||
| -rw-r--r-- | misc/client/Piztor/.project | 33 | ||||
| -rw-r--r-- | misc/client/Piztor/.settings/org.eclipse.jdt.core.prefs (renamed from client/gps-demo/AndroidGPSTracking/.settings/org.eclipse.jdt.core.prefs) | 0 | ||||
| -rw-r--r-- | misc/client/Piztor/AndroidManifest.xml (renamed from client/Piztor/AndroidManifest.xml) | 0 | ||||
| -rw-r--r-- | misc/client/Piztor/bin/AndroidManifest.xml (renamed from client/Piztor/bin/AndroidManifest.xml) | 0 | ||||
| -rw-r--r-- | misc/client/Piztor/bin/classes/com/macaroon/piztor/ActMgr.class (renamed from client/Piztor/bin/classes/com/macaroon/piztor/ActMgr.class) | bin | 2616 -> 2616 bytes | |||
| -rw-r--r-- | misc/client/Piztor/bin/classes/com/macaroon/piztor/ActStatus.class (renamed from client/Piztor/bin/classes/com/macaroon/piztor/ActStatus.class) | bin | 328 -> 328 bytes | |||
| -rw-r--r-- | misc/client/Piztor/bin/classes/com/macaroon/piztor/AppMgr$ActivityStatus.class (renamed from client/Piztor/bin/classes/com/macaroon/piztor/AppMgr$ActivityStatus.class) | bin | 1412 -> 1412 bytes | |||
| -rw-r--r-- | misc/client/Piztor/bin/classes/com/macaroon/piztor/AppMgr.class (renamed from client/Piztor/bin/classes/com/macaroon/piztor/AppMgr.class) | bin | 2846 -> 2846 bytes | |||
| -rw-r--r-- | misc/client/Piztor/bin/classes/com/macaroon/piztor/BuildConfig.class | bin | 0 -> 347 bytes | |||
| -rw-r--r-- | misc/client/Piztor/bin/classes/com/macaroon/piztor/EmptyStatus.class (renamed from client/Piztor/bin/classes/com/macaroon/piztor/EmptyStatus.class) | bin | 471 -> 471 bytes | |||
| -rw-r--r-- | misc/client/Piztor/bin/classes/com/macaroon/piztor/InitAct.class (renamed from client/Piztor/bin/classes/com/macaroon/piztor/InitAct.class) | bin | 804 -> 804 bytes | |||
| -rw-r--r-- | misc/client/Piztor/bin/classes/com/macaroon/piztor/PiztorAct.class | bin | 0 -> 2205 bytes | |||
| -rw-r--r-- | misc/client/Piztor/bin/classes/com/macaroon/piztor/R$attr.class | bin | 0 -> 343 bytes | |||
| -rw-r--r-- | misc/client/Piztor/bin/classes/com/macaroon/piztor/R$dimen.class | bin | 0 -> 464 bytes | |||
| -rw-r--r-- | misc/client/Piztor/bin/classes/com/macaroon/piztor/R$drawable.class (renamed from client/Piztor/bin/classes/com/macaroon/piztor/R$drawable.class) | bin | 410 -> 410 bytes | |||
| -rw-r--r-- | misc/client/Piztor/bin/classes/com/macaroon/piztor/R$id.class (renamed from client/Piztor/bin/classes/com/macaroon/piztor/R$id.class) | bin | 396 -> 396 bytes | |||
| -rw-r--r-- | misc/client/Piztor/bin/classes/com/macaroon/piztor/R$layout.class (renamed from client/Piztor/bin/classes/com/macaroon/piztor/R$layout.class) | bin | 406 -> 406 bytes | |||
| -rw-r--r-- | misc/client/Piztor/bin/classes/com/macaroon/piztor/R$menu.class (renamed from client/Piztor/bin/classes/com/macaroon/piztor/R$menu.class) | bin | 419 -> 419 bytes | |||
| -rw-r--r-- | misc/client/Piztor/bin/classes/com/macaroon/piztor/R$string.class (renamed from client/Piztor/bin/classes/com/macaroon/piztor/R$string.class) | bin | 518 -> 518 bytes | |||
| -rw-r--r-- | misc/client/Piztor/bin/classes/com/macaroon/piztor/R$style.class (renamed from client/Piztor/bin/classes/com/macaroon/piztor/R$style.class) | bin | 434 -> 434 bytes | |||
| -rw-r--r-- | misc/client/Piztor/bin/classes/com/macaroon/piztor/R.class | bin | 0 -> 683 bytes | |||
| -rw-r--r-- | misc/client/Piztor/gen/com/macaroon/piztor/BuildConfig.java | 6 | ||||
| -rw-r--r-- | misc/client/Piztor/gen/com/macaroon/piztor/R.java (renamed from client/Piztor/gen/com/macaroon/piztor/R.java) | 0 | ||||
| -rw-r--r-- | misc/client/Piztor/ic_launcher-web.png (renamed from client/Piztor/ic_launcher-web.png) | bin | 51394 -> 51394 bytes | |||
| -rw-r--r-- | misc/client/Piztor/libs/android-support-v4.jar | bin | 0 -> 556198 bytes | |||
| -rw-r--r-- | misc/client/Piztor/proguard-project.txt (renamed from client/Piztor/proguard-project.txt) | 0 | ||||
| -rw-r--r-- | misc/client/Piztor/project.properties (renamed from client/Piztor/project.properties) | 0 | ||||
| -rw-r--r-- | misc/client/Piztor/res/drawable-hdpi/ic_launcher.png (renamed from client/Piztor/res/drawable-hdpi/ic_launcher.png) | bin | 7658 -> 7658 bytes | |||
| -rw-r--r-- | misc/client/Piztor/res/drawable-mdpi/ic_launcher.png (renamed from client/Piztor/res/drawable-mdpi/ic_launcher.png) | bin | 3777 -> 3777 bytes | |||
| -rw-r--r-- | misc/client/Piztor/res/drawable-xhdpi/ic_launcher.png (renamed from client/Piztor/res/drawable-xhdpi/ic_launcher.png) | bin | 12516 -> 12516 bytes | |||
| -rw-r--r-- | misc/client/Piztor/res/drawable-xxhdpi/ic_launcher.png (renamed from client/Piztor/res/drawable-xxhdpi/ic_launcher.png) | bin | 24777 -> 24777 bytes | |||
| -rw-r--r-- | misc/client/Piztor/res/layout/activity_init.xml (renamed from client/Piztor/res/layout/activity_init.xml) | 0 | ||||
| -rw-r--r-- | misc/client/Piztor/res/menu/init.xml (renamed from client/Piztor/res/menu/init.xml) | 0 | ||||
| -rw-r--r-- | misc/client/Piztor/res/menu/main.xml (renamed from client/Piztor/res/menu/main.xml) | 0 | ||||
| -rw-r--r-- | misc/client/Piztor/res/values-sw600dp/dimens.xml (renamed from client/Piztor/res/values-sw600dp/dimens.xml) | 0 | ||||
| -rw-r--r-- | misc/client/Piztor/res/values-sw720dp-land/dimens.xml (renamed from client/Piztor/res/values-sw720dp-land/dimens.xml) | 0 | ||||
| -rw-r--r-- | misc/client/Piztor/res/values-v11/styles.xml (renamed from client/Piztor/res/values-v11/styles.xml) | 0 | ||||
| -rw-r--r-- | misc/client/Piztor/res/values-v14/styles.xml (renamed from client/Piztor/res/values-v14/styles.xml) | 0 | ||||
| -rw-r--r-- | misc/client/Piztor/res/values/dimens.xml (renamed from client/Piztor/res/values/dimens.xml) | 0 | ||||
| -rw-r--r-- | misc/client/Piztor/res/values/strings.xml (renamed from client/Piztor/res/values/strings.xml) | 0 | ||||
| -rw-r--r-- | misc/client/Piztor/res/values/styles.xml (renamed from client/Piztor/res/values/styles.xml) | 0 | ||||
| -rw-r--r-- | misc/client/Piztor/src/com/macaroon/piztor/ActMgr.java (renamed from client/Piztor/src/com/macaroon/piztor/ActMgr.java) | 0 | ||||
| -rw-r--r-- | misc/client/Piztor/src/com/macaroon/piztor/AppMgr.java (renamed from client/Piztor/src/com/macaroon/piztor/AppMgr.java) | 0 | ||||
| -rw-r--r-- | misc/client/Piztor/src/com/macaroon/piztor/InitAct.java (renamed from client/Piztor/src/com/macaroon/piztor/InitAct.java) | 0 | ||||
| -rw-r--r-- | misc/client/Piztor/src/com/macaroon/piztor/PiztorAct.java (renamed from client/Piztor/src/com/macaroon/piztor/PiztorAct.java) | 0 | ||||
| -rw-r--r-- | misc/client/README.rst (renamed from client/README.rst) | 0 | ||||
| -rw-r--r-- | misc/client/Socket-demo/Login.java (renamed from client/Socket-demo/Login.java) | 0 | ||||
| -rw-r--r-- | misc/client/Socket-demo/MainActivity.java (renamed from client/Socket-demo/MainActivity.java) | 0 | ||||
| -rw-r--r-- | misc/client/Socket-demo/Myrequest.java (renamed from client/Socket-demo/Myrequest.java) | 0 | ||||
| -rw-r--r-- | misc/client/Socket-demo/Myrespond.java (renamed from client/Socket-demo/Myrespond.java) | 0 | ||||
| -rw-r--r-- | misc/client/Socket-demo/SocketClient.java (renamed from client/Socket-demo/SocketClient.java) | 0 | ||||
| -rw-r--r-- | misc/client/Socket-demo/Transam.java (renamed from client/Socket-demo/Transam.java) | 0 | ||||
| -rw-r--r-- | misc/client/gps-demo/AndroidGPSTracking/.AndroidManifest.xml.swp (renamed from client/gps-demo/AndroidGPSTracking/.AndroidManifest.xml.swp) | bin | 12288 -> 12288 bytes | |||
| -rw-r--r-- | misc/client/gps-demo/AndroidGPSTracking/.classpath (renamed from client/gps-demo/AndroidGPSTracking/.classpath) | 0 | ||||
| -rw-r--r-- | misc/client/gps-demo/AndroidGPSTracking/.project (renamed from client/gps-demo/AndroidGPSTracking/.project) | 0 | ||||
| -rw-r--r-- | misc/client/gps-demo/AndroidGPSTracking/.settings/org.eclipse.jdt.core.prefs | 4 | ||||
| -rw-r--r-- | misc/client/gps-demo/AndroidGPSTracking/AndroidManifest.xml (renamed from client/gps-demo/AndroidGPSTracking/AndroidManifest.xml) | 0 | ||||
| -rw-r--r-- | misc/client/gps-demo/AndroidGPSTracking/bin/AndroidGPSTracking.apk (renamed from client/gps-demo/AndroidGPSTracking/bin/AndroidGPSTracking.apk) | bin | 16993 -> 16993 bytes | |||
| -rw-r--r-- | misc/client/gps-demo/AndroidGPSTracking/bin/AndroidManifest.xml (renamed from client/gps-demo/AndroidGPSTracking/bin/AndroidManifest.xml) | 0 | ||||
| -rw-r--r-- | misc/client/gps-demo/AndroidGPSTracking/bin/classes.dex (renamed from client/gps-demo/AndroidGPSTracking/bin/classes.dex) | bin | 9188 -> 9188 bytes | |||
| -rw-r--r-- | misc/client/gps-demo/AndroidGPSTracking/bin/classes/com/example/gpstracking/AndroidGPSTrackingActivity$1.class (renamed from client/gps-demo/AndroidGPSTracking/bin/classes/com/example/gpstracking/AndroidGPSTrackingActivity$1.class) | bin | 1809 -> 1809 bytes | |||
| -rw-r--r-- | misc/client/gps-demo/AndroidGPSTracking/bin/classes/com/example/gpstracking/AndroidGPSTrackingActivity.class (renamed from client/gps-demo/AndroidGPSTracking/bin/classes/com/example/gpstracking/AndroidGPSTrackingActivity.class) | bin | 1119 -> 1119 bytes | |||
| -rw-r--r-- | misc/client/gps-demo/AndroidGPSTracking/bin/classes/com/example/gpstracking/BuildConfig.class (renamed from client/gps-demo/AndroidGPSTracking/bin/classes/com/example/gpstracking/BuildConfig.class) | bin | 355 -> 355 bytes | |||
| -rw-r--r-- | misc/client/gps-demo/AndroidGPSTracking/bin/classes/com/example/gpstracking/GPSTracker$1.class (renamed from client/gps-demo/AndroidGPSTracking/bin/classes/com/example/gpstracking/GPSTracker$1.class) | bin | 1206 -> 1206 bytes | |||
| -rw-r--r-- |
