From 6f38860cd5907501d90eb5518ac42978d7dec834 Mon Sep 17 00:00:00 2001 From: sjtufs Date: Fri, 30 Aug 2013 22:33:16 +0800 Subject: update --- client/Piztor/res/drawable/circle_blue.png | Bin 0 -> 1070 bytes client/Piztor/res/drawable/circle_glass.png | Bin 0 -> 1173 bytes client/Piztor/res/drawable/circle_metal.png | Bin 0 -> 894 bytes client/Piztor/res/drawable/circle_paper.png | Bin 0 -> 965 bytes client/Piztor/res/drawable/circle_red.png | Bin 690 -> 892 bytes client/Piztor/res/drawable/circle_tan.png | Bin 0 -> 916 bytes client/Piztor/res/drawable/circle_wood.png | Bin 0 -> 1359 bytes client/Piztor/res/drawable/circle_yellow.png | Bin 0 -> 946 bytes client/Piztor/res/drawable/footbar_checkin.png | Bin 3251 -> 1639 bytes client/Piztor/res/layout/activity_settings.xml | 246 ++++++++------ client/Piztor/res/layout/activity_updateinfo.xml | 121 +++++++ client/Piztor/res/layout/main_footbar.xml | 10 +- client/Piztor/res/layout/settings_headbar.xml | 4 +- client/Piztor/res/values/strings.xml | 4 + .../Piztor/src/com/macaroon/piztor/AlertMaker.java | 24 +- client/Piztor/src/com/macaroon/piztor/AppMgr.java | 8 +- client/Piztor/src/com/macaroon/piztor/Convert.java | 63 ++++ .../Piztor/src/com/macaroon/piztor/EException.java | 75 +++++ .../Piztor/src/com/macaroon/piztor/Infomation.java | 8 +- client/Piztor/src/com/macaroon/piztor/InitAct.java | 9 +- client/Piztor/src/com/macaroon/piztor/LogInfo.java | 12 + client/Piztor/src/com/macaroon/piztor/Login.java | 27 +- client/Piztor/src/com/macaroon/piztor/Main.java | 227 ++++++------- .../src/com/macaroon/piztor/MainActivity.java | 133 ++++++++ client/Piztor/src/com/macaroon/piztor/MapInfo.java | 9 +- .../Piztor/src/com/macaroon/piztor/MapMaker.java | 85 ++--- .../Piztor/src/com/macaroon/piztor/PushClient.java | 106 ++---- client/Piztor/src/com/macaroon/piztor/RGroup.java | 10 + .../Piztor/src/com/macaroon/piztor/RUserInfo.java | 22 ++ client/Piztor/src/com/macaroon/piztor/Req.java | 100 +++++- .../src/com/macaroon/piztor/ReqLocation.java | 16 - .../Piztor/src/com/macaroon/piztor/ReqLogin.java | 16 - .../Piztor/src/com/macaroon/piztor/ReqLogout.java | 12 - .../src/com/macaroon/piztor/ReqSendMessage.java | 14 - .../src/com/macaroon/piztor/ReqStartPush.java | 12 - .../Piztor/src/com/macaroon/piztor/ReqUpdate.java | 16 - .../src/com/macaroon/piztor/ReqUserInfo.java | 15 - .../src/com/macaroon/piztor/ReqUserinfo.java | 15 - client/Piztor/src/com/macaroon/piztor/Res.java | 141 +++++++- .../src/com/macaroon/piztor/ResLocation.java | 18 - .../Piztor/src/com/macaroon/piztor/ResLogin.java | 17 - .../Piztor/src/com/macaroon/piztor/ResLogout.java | 13 - .../src/com/macaroon/piztor/ResPushLocation.java | 18 - .../src/com/macaroon/piztor/ResPushMessage.java | 15 - .../src/com/macaroon/piztor/ResSendMessage.java | 13 - .../src/com/macaroon/piztor/ResStartPush.java | 13 - .../Piztor/src/com/macaroon/piztor/ResUpdate.java | 13 - .../src/com/macaroon/piztor/ResUserInfo.java | 22 -- .../src/com/macaroon/piztor/ResUserinfo.java | 20 -- .../Piztor/src/com/macaroon/piztor/Settings.java | 131 ++++---- .../src/com/macaroon/piztor/SocketClient.java | 373 +++++++++++++-------- client/Piztor/src/com/macaroon/piztor/Transam.java | 219 ++++++------ .../Piztor/src/com/macaroon/piztor/UpdateInfo.java | 5 + 53 files changed, 1418 insertions(+), 1032 deletions(-) create mode 100644 client/Piztor/res/drawable/circle_blue.png create mode 100644 client/Piztor/res/drawable/circle_glass.png create mode 100644 client/Piztor/res/drawable/circle_metal.png create mode 100644 client/Piztor/res/drawable/circle_paper.png create mode 100644 client/Piztor/res/drawable/circle_tan.png create mode 100644 client/Piztor/res/drawable/circle_wood.png create mode 100644 client/Piztor/res/drawable/circle_yellow.png create mode 100644 client/Piztor/res/layout/activity_updateinfo.xml create mode 100644 client/Piztor/src/com/macaroon/piztor/Convert.java create mode 100644 client/Piztor/src/com/macaroon/piztor/EException.java create mode 100644 client/Piztor/src/com/macaroon/piztor/LogInfo.java create mode 100644 client/Piztor/src/com/macaroon/piztor/MainActivity.java create mode 100644 client/Piztor/src/com/macaroon/piztor/RGroup.java create mode 100644 client/Piztor/src/com/macaroon/piztor/RUserInfo.java delete mode 100644 client/Piztor/src/com/macaroon/piztor/ReqLocation.java delete mode 100644 client/Piztor/src/com/macaroon/piztor/ReqLogin.java delete mode 100644 client/Piztor/src/com/macaroon/piztor/ReqLogout.java delete mode 100644 client/Piztor/src/com/macaroon/piztor/ReqSendMessage.java delete mode 100644 client/Piztor/src/com/macaroon/piztor/ReqStartPush.java delete mode 100644 client/Piztor/src/com/macaroon/piztor/ReqUpdate.java delete mode 100644 client/Piztor/src/com/macaroon/piztor/ReqUserInfo.java delete mode 100644 client/Piztor/src/com/macaroon/piztor/ReqUserinfo.java delete mode 100644 client/Piztor/src/com/macaroon/piztor/ResLocation.java delete mode 100644 client/Piztor/src/com/macaroon/piztor/ResLogin.java delete mode 100644 client/Piztor/src/com/macaroon/piztor/ResLogout.java delete mode 100644 client/Piztor/src/com/macaroon/piztor/ResPushLocation.java delete mode 100644 client/Piztor/src/com/macaroon/piztor/ResPushMessage.java delete mode 100644 client/Piztor/src/com/macaroon/piztor/ResSendMessage.java delete mode 100644 client/Piztor/src/com/macaroon/piztor/ResStartPush.java delete mode 100644 client/Piztor/src/com/macaroon/piztor/ResUpdate.java delete mode 100644 client/Piztor/src/com/macaroon/piztor/ResUserInfo.java delete mode 100644 client/Piztor/src/com/macaroon/piztor/ResUserinfo.java create mode 100644 client/Piztor/src/com/macaroon/piztor/UpdateInfo.java (limited to 'client') diff --git a/client/Piztor/res/drawable/circle_blue.png b/client/Piztor/res/drawable/circle_blue.png new file mode 100644 index 0000000..09c3658 Binary files /dev/null and b/client/Piztor/res/drawable/circle_blue.png differ diff --git a/client/Piztor/res/drawable/circle_glass.png b/client/Piztor/res/drawable/circle_glass.png new file mode 100644 index 0000000..826b2b7 Binary files /dev/null and b/client/Piztor/res/drawable/circle_glass.png differ diff --git a/client/Piztor/res/drawable/circle_metal.png b/client/Piztor/res/drawable/circle_metal.png new file mode 100644 index 0000000..d84e1ad Binary files /dev/null and b/client/Piztor/res/drawable/circle_metal.png differ diff --git a/client/Piztor/res/drawable/circle_paper.png b/client/Piztor/res/drawable/circle_paper.png new file mode 100644 index 0000000..973787d Binary files /dev/null and b/client/Piztor/res/drawable/circle_paper.png differ diff --git a/client/Piztor/res/drawable/circle_red.png b/client/Piztor/res/drawable/circle_red.png index 034cea8..fd0efb1 100644 Binary files a/client/Piztor/res/drawable/circle_red.png and b/client/Piztor/res/drawable/circle_red.png differ diff --git a/client/Piztor/res/drawable/circle_tan.png b/client/Piztor/res/drawable/circle_tan.png new file mode 100644 index 0000000..27d10ad Binary files /dev/null and b/client/Piztor/res/drawable/circle_tan.png differ diff --git a/client/Piztor/res/drawable/circle_wood.png b/client/Piztor/res/drawable/circle_wood.png new file mode 100644 index 0000000..ea18f7a Binary files /dev/null and b/client/Piztor/res/drawable/circle_wood.png differ diff --git a/client/Piztor/res/drawable/circle_yellow.png b/client/Piztor/res/drawable/circle_yellow.png new file mode 100644 index 0000000..7c1dfc7 Binary files /dev/null and b/client/Piztor/res/drawable/circle_yellow.png differ diff --git a/client/Piztor/res/drawable/footbar_checkin.png b/client/Piztor/res/drawable/footbar_checkin.png index 0a4b148..f514613 100644 Binary files a/client/Piztor/res/drawable/footbar_checkin.png and b/client/Piztor/res/drawable/footbar_checkin.png differ diff --git a/client/Piztor/res/layout/activity_settings.xml b/client/Piztor/res/layout/activity_settings.xml index 865cbc6..3bd6fef 100644 --- a/client/Piztor/res/layout/activity_settings.xml +++ b/client/Piztor/res/layout/activity_settings.xml @@ -11,121 +11,157 @@ - - + + + + + + + + + + + -