summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgoblin911 <goblinliu@gmail.com>2013-08-25 21:16:45 +0800
committergoblin911 <goblinliu@gmail.com>2013-08-25 21:16:45 +0800
commit2efdc2f20f0306791ced5ec78a1acddfaf086f42 (patch)
treea85f2b32d6e6da9d7329ab975fea3bd79e1b94b6
parente5599da7fdd344fdcb49e8d6780a1e2ad358ee2d (diff)
parent263967cbb477983ae8680b431c1d93f102971c30 (diff)
Merge branch 'master' of https://github.com/Determinant/piztor
Conflicts: client/Piztor/bin/classes/com/macaroon/piztor/ActMgr.class client/Piztor/bin/classes/com/macaroon/piztor/AppMgr.class client/Piztor/bin/classes/com/macaroon/piztor/R$drawable.class client/Piztor/bin/classes/com/macaroon/piztor/R$id.class client/Piztor/bin/classes/com/macaroon/piztor/R$layout.class client/Piztor/bin/classes/com/macaroon/piztor/R$menu.class client/Piztor/bin/classes/com/macaroon/piztor/R$string.class client/Piztor/gen/com/macaroon/piztor/R.java client/Piztor/res/values/strings.xml client/bin/classes/com/macaroon/piztor/ActStatus.class client/bin/classes/com/macaroon/piztor/EmptyStatus.class client/bin/classes/com/macaroon/piztor/Setting.class client/src/com/macaroon/piztor/AppMgr.java client/src/com/macaroon/piztor/Setting.java
Diffstat
-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--client/AndroidManifest.xml (renamed from client/Piztor/AndroidManifest.xml)0
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/ActMgr.classbin2797 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/ActStatus.classbin328 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/AppMgr$ActivityStatus.classbin1412 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/AppMgr.classbin4548 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/BuildConfig.classbin347 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/EmptyStatus.classbin471 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/InitAct.classbin1136 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/PiztorAct.classbin2205 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/R$attr.classbin343 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/R$dimen.classbin464 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/R$drawable.classbin1399 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/R$id.classbin2291 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/R$layout.classbin823 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/R$menu.classbin479 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/R$string.classbin937 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/R$style.classbin434 -> 0 bytes
-rw-r--r--client/Piztor/bin/classes/com/macaroon/piztor/R.classbin683 -> 0 bytes
-rw-r--r--client/Piztor/ic_launcher-web.pngbin51394 -> 0 bytes
-rw-r--r--client/Piztor/res/drawable-hdpi/ic_launcher.pngbin7658 -> 0 bytes
-rw-r--r--client/Piztor/res/drawable-mdpi/ic_launcher.pngbin3777 -> 0 bytes
-rw-r--r--client/Piztor/res/drawable-xhdpi/ic_launcher.pngbin12516 -> 0 bytes
-rw-r--r--client/Piztor/res/drawable-xxhdpi/ic_launcher.pngbin24777 -> 0 bytes
-rw-r--r--client/README.rst1
-rw-r--r--client/Socket-demo/Login.java6
-rw-r--r--client/Socket-demo/MainActivity.java44
-rw-r--r--client/Socket-demo/Myrequest.java10
-rw-r--r--client/Socket-demo/Myrespond.java12
-rw-r--r--client/Socket-demo/SocketClient.java107
-rw-r--r--client/Socket-demo/Transam.java125
-rw-r--r--client/bin/AndroidManifest.xml (renamed from client/Piztor/bin/AndroidManifest.xml)0
-rw-r--r--client/bin/Piztor.apkbin0 -> 1009696 bytes
-rw-r--r--client/bin/classes.dexbin0 -> 654056 bytes
-rw-r--r--client/bin/dexedLibs/android-support-v4-7d1c360a45ec8a3e1ddee5ade49de497.jarbin0 -> 211326 bytes
-rw-r--r--client/bin/jarlist.cache (renamed from client/gps-demo/AndroidGPSTracking/bin/jarlist.cache)0
-rw-r--r--client/bin/res/drawable-hdpi/ic_launcher.pngbin0 -> 5964 bytes
-rw-r--r--client/bin/res/drawable-mdpi/ic_launcher.pngbin0 -> 3112 bytes
-rw-r--r--client/bin/res/drawable-xhdpi/ic_launcher.pngbin0 -> 9355 bytes
-rw-r--r--client/bin/res/drawable-xxhdpi/ic_launcher.pngbin0 -> 17889 bytes
-rw-r--r--client/bin/res/drawable/bottom_img.pngbin0 -> 526288 bytes
-rw-r--r--client/bin/res/drawable/footbar_background.pngbin0 -> 22626 bytes
-rw-r--r--client/bin/res/drawable/footbar_checkin.pngbin0 -> 253 bytes
-rw-r--r--client/bin/res/drawable/footbar_checkin_1.pngbin0 -> 2958 bytes
-rw-r--r--client/bin/res/drawable/footbar_fetch.pngbin0 -> 1800 bytes
-rw-r--r--client/bin/res/drawable/footbar_fetch_1.pngbin0 -> 2744 bytes
-rw-r--r--client/bin/res/drawable/footbar_marker.pngbin0 -> 986 bytes
-rw-r--r--client/bin/res/drawable/footbar_marker_1.pngbin0 -> 2862 bytes
-rw-r--r--client/bin/res/drawable/footbar_search.pngbin0 -> 1327 bytes
-rw-r--r--client/bin/res/drawable/footbar_search_1.pngbin0 -> 3137 bytes
-rw-r--r--client/bin/res/drawable/footbar_select_bg.pngbin0 -> 8879 bytes
-rw-r--r--client/bin/res/drawable/footbar_settings.pngbin0 -> 1100 bytes
-rw-r--r--client/bin/res/drawable/footbar_settings_1.pngbin0 -> 3003 bytes
-rw-r--r--client/bin/res/drawable/footbar_unselect_bg.pngbin0 -> 119 bytes
-rw-r--r--client/bin/res/drawable/horizontal_line.pngbin0 -> 705 bytes
-rw-r--r--client/bin/res/drawable/navigation_back.pngbin0 -> 397 bytes
-rw-r--r--client/bin/res/drawable/navigation_back_1.pngbin0 -> 170 bytes
-rw-r--r--client/bin/res/drawable/title_logo.pngbin0 -> 116965 bytes
-rw-r--r--client/bin/res/drawable/topbar_background.pngbin0 -> 23541 bytes
-rw-r--r--client/bin/resources.ap_bin0 -> 781019 bytes
-rw-r--r--client/gen/com/macaroon/piztor/BuildConfig.java (renamed from client/Piztor/gen/com/macaroon/piztor/BuildConfig.java)0
-rw-r--r--client/gen/com/macaroon/piztor/R.java164
-rw-r--r--client/gps-demo/AndroidGPSTracking/.AndroidManifest.xml.swpbin12288 -> 0 bytes
-rw-r--r--client/gps-demo/AndroidGPSTracking/.classpath9
-rw-r--r--client/gps-demo/AndroidGPSTracking/.project33
-rw-r--r--client/gps-demo/AndroidGPSTracking/.settings/org.eclipse.jdt.core.prefs4
-rw-r--r--client/gps-demo/AndroidGPSTracking/AndroidManifest.xml26
-rw-r--r--client/gps-demo/AndroidGPSTracking/bin/AndroidGPSTracking.apkbin16993 -> 0 bytes
-rw-r--r--client/gps-demo/AndroidGPSTracking/bin/AndroidManifest.xml26
-rw-r--r--client/gps-demo/AndroidGPSTracking/bin/classes.dexbin9188 -> 0 bytes
-rw-r--r--client/gps-demo/AndroidGPSTracking/bin/classes/com/example/gpstracking/AndroidGPSTrackingActivity$1.classbin1809 -> 0 bytes
-rw-r--r--client/gps-demo/AndroidGPSTracking/bin/classes/com/example/gpstracking/AndroidGPSTrackingActivity.classbin1119 -> 0 bytes
-rw-r--r--client/gps-demo/AndroidGPSTracking/bin/classes/com/example/gpstracking/BuildConfig.classbin355 -> 0 bytes
-rw-r--r--client/gps-demo/AndroidGPSTracking/bin/classes/com/example/gpstracking/GPSTracker$1.classbin1206 -> 0 bytes
-rw-r--r--client/gps-demo/AndroidGPSTracking/bin/classes/com/example/gpstracking/GPSTracker$2.classbin879 -> 0 bytes
-rw-r--r--client/gps-demo/AndroidGPSTracking/bin/classes/com/example/gpstracking/GPSTracker.classbin4488 -> 0 bytes
-rw-r--r--client/gps-demo/AndroidGPSTracking/bin/classes/com/example/gpstracking/R$attr.classbin355 -> 0 bytes
-rw-r--r--client/gps-demo/AndroidGPSTracking/bin/classes/com/example/gpstracking/R$drawable.classbin422 -> 0 bytes
-rw-r--r--client/gps-demo/AndroidGPSTracking/bin/classes/com/example/gpstracking/R$id.classbin408 -> 0 bytes
-rw-r--r--client/gps-demo/AndroidGPSTracking/bin/classes/com/example/gpstracking/R$layout.classbin409 -> 0 bytes
-rw-r--r--client/gps-demo/AndroidGPSTracking/bin/classes/com/example/gpstracking/R$string.classbin442 -> 0 bytes
-rw-r--r--client/gps-demo/AndroidGPSTracking/bin/classes/com/example/gpstracking/R.classbin566 -> 0 bytes
-rw-r--r--client/gps-demo/AndroidGPSTracking/bin/dexedLibs/annotations-5b022f4578500e25e3bfa446659bd7d8.jarbin943 -> 0 bytes
-rw-r--r--client/gps-demo/AndroidGPSTracking/bin/res/drawable-hdpi/ic_launcher.pngbin3966 -> 0 bytes
-rw-r--r--client/gps-demo/AndroidGPSTracking/bin/res/drawable-ldpi/ic_launcher.pngbin1537 -> 0 bytes
-rw-r--r--client/gps-demo/AndroidGPSTracking/bin/res/drawable-mdpi/ic_launcher.pngbin2200 -> 0 bytes
-rw-r--r--client/gps-demo/AndroidGPSTracking/bin/resources.ap_bin10818 -> 0 bytes
-rw-r--r--client/gps-demo/AndroidGPSTracking/default.properties2
-rw-r--r--client/gps-demo/AndroidGPSTracking/gen/com/example/gpstracking/BuildConfig.java6
-rw-r--r--client/gps-demo/AndroidGPSTracking/gen/com/example/gpstracking/R.java26
-rw-r--r--client/gps-demo/AndroidGPSTracking/proguard.cfg40
-rw-r--r--client/gps-demo/AndroidGPSTracking/project.properties11
-rw-r--r--client/gps-demo/AndroidGPSTracking/res/drawable-hdpi/ic_launcher.pngbin10224 -> 0 bytes
-rw-r--r--client/gps-demo/AndroidGPSTracking/res/drawable-ldpi/ic_launcher.pngbin10224 -> 0 bytes
-rw-r--r--client/gps-demo/AndroidGPSTracking/res/drawable-mdpi/ic_launcher.pngbin10224 -> 0 bytes
-rw-r--r--client/gps-demo/AndroidGPSTracking/res/drawable-xhdpi/ic_launcher.pngbin10224 -> 0 bytes
-rw-r--r--client/gps-demo/AndroidGPSTracking/res/layout/main.xml14
-rw-r--r--client/gps-demo/AndroidGPSTracking/res/values/strings.xml7
-rw-r--r--client/gps-demo/AndroidGPSTracking/src/com/example/gpstracking/AndroidGPSTrackingActivity.java50
-rw-r--r--client/gps-demo/AndroidGPSTracking/src/com/example/gpstracking/Tracker.java33
-rw-r--r--client/ic_launcher-web.pngbin0 -> 130248 bytes
-rw-r--r--client/libs/android-support-v4.jar (renamed from client/Piztor/libs/android-support-v4.jar)bin556198 -> 556198 bytes
-rw-r--r--client/proguard-project.txt (renamed from client/Piztor/proguard-project.txt)0
-rw-r--r--client/project.properties (renamed from client/Piztor/project.properties)0
-rw-r--r--client/res/drawable-hdpi/ic_launcher.pngbin0 -> 6165 bytes
-rw-r--r--client/res/drawable-mdpi/ic_launcher.pngbin0 -> 3245 bytes
-rw-r--r--client/res/drawable-xhdpi/ic_launcher.pngbin0 -> 9545 bytes
-rw-r--r--client/res/drawable-xxhdpi/ic_launcher.pngbin0 -> 17793 bytes
-rw-r--r--client/res/drawable/bottom_img.pngbin0 -> 525331 bytes
-rw-r--r--client/res/drawable/footbar_background.pngbin0 -> 23943 bytes
-rw-r--r--client/res/drawable/footbar_btn_checkin_style.xml7
-rw-r--r--client/res/drawable/footbar_btn_fetch_style.xml6
-rw-r--r--client/res/drawable/footbar_btn_focus_style.xml6
-rw-r--r--client/res/drawable/footbar_btn_search_style.xml6
-rw-r--r--client/res/drawable/footbar_btn_settings_style.xml6
-rw-r--r--client/res/drawable/footbar_checkin.pngbin0 -> 468 bytes
-rw-r--r--client/res/drawable/footbar_checkin_1.pngbin0 -> 3371 bytes
-rw-r--r--client/res/drawable/footbar_fetch.pngbin0 -> 2541 bytes
-rw-r--r--client/res/drawable/footbar_fetch_1.pngbin0 -> 3093 bytes
-rw-r--r--client/res/drawable/footbar_marker.pngbin0 -> 1866 bytes
-rw-r--r--client/res/drawable/footbar_marker_1.pngbin0 -> 3288 bytes
-rw-r--r--client/res/drawable/footbar_search.pngbin0 -> 2127 bytes
-rw-r--r--client/res/drawable/footbar_search_1.pngbin0 -> 3589 bytes
-rw-r--r--client/res/drawable/footbar_select_bg.pngbin0 -> 8919 bytes
-rw-r--r--client/res/drawable/footbar_settings.pngbin0 -> 1372 bytes
-rw-r--r--client/res/drawable/footbar_settings_1.pngbin0 -> 3442 bytes
-rw-r--r--client/res/drawable/footbar_unselect_bg.pngbin0 -> 165 bytes
-rw-r--r--client/res/drawable/horizontal_line.pngbin0 -> 796 bytes
-rw-r--r--client/res/drawable/navigation_back.pngbin0 -> 1324 bytes
-rw-r--r--client/res/drawable/navigation_back_1.pngbin0 -> 401 bytes
-rw-r--r--client/res/drawable/title_logo.pngbin0 -> 1031640 bytes
-rw-r--r--client/res/drawable/topbar_background.pngbin0 -> 23763 bytes
-rw-r--r--client/res/layout/activity_gather.xml23
-rw-r--r--client/res/layout/activity_init.xml (renamed from client/Piztor/res/layout/activity_init.xml)0
-rw-r--r--client/res/layout/activity_login.xml92
-rw-r--r--client/res/layout/activity_main.xml23
-rw-r--r--client/res/layout/activity_settings.xml149
-rw-r--r--client/res/layout/gather_footbar.xml133
-rw-r--r--client/res/layout/gather_timer.xml16
-rw-r--r--client/res/layout/login_bottom.xml13
-rw-r--r--client/res/layout/main_footbar.xml107
-rw-r--r--client/res/layout/main_headbar.xml29
-rw-r--r--client/res/layout/settings_headbar.xml29
-rw-r--r--client/res/menu/init.xml (renamed from client/Piztor/res/menu/init.xml)0
-rw-r--r--client/res/menu/login.xml (renamed from client/Piztor/res/menu/main.xml)0
-rw-r--r--client/res/menu/main.xml9
-rw-r--r--client/res/menu/setting.xml9
-rw-r--r--client/res/values-sw600dp/dimens.xml (renamed from client/Piztor/res/values-sw600dp/dimens.xml)0
-rw-r--r--client/res/values-sw720dp-land/dimens.xml (renamed from client/Piztor/res/values-sw720dp-land/dimens.xml)0
-rw-r--r--client/res/values-v11/styles.xml (renamed from client/