summaryrefslogtreecommitdiff
path: root/client/src
diff options
context:
space:
mode:
authorTeddy <[email protected]>2013-08-26 08:50:47 +0800
committerTeddy <[email protected]>2013-08-26 08:50:47 +0800
commit7a606637907476942c1f6686137ada6898d7eb14 (patch)
tree1510da0a6764f18a66958ebae6587353ac6e019c /client/src
parent537d01ac3e78dec6828e068979dcd061e8f68a98 (diff)
purged the repo
Diffstat (limited to 'client/src')
-rw-r--r--client/src/com/macaroon/piztor/ActMgr.java67
-rw-r--r--client/src/com/macaroon/piztor/AppMgr.java89
-rw-r--r--client/src/com/macaroon/piztor/GPSTracker.java241
-rw-r--r--client/src/com/macaroon/piztor/InitAct.java34
-rw-r--r--client/src/com/macaroon/piztor/Login.java104
-rw-r--r--client/src/com/macaroon/piztor/Main.java51
-rw-r--r--client/src/com/macaroon/piztor/PiztorAct.java60
-rw-r--r--client/src/com/macaroon/piztor/PiztorExcepiton.java10
-rw-r--r--client/src/com/macaroon/piztor/Req.java14
-rw-r--r--client/src/com/macaroon/piztor/ReqLocation.java14
-rw-r--r--client/src/com/macaroon/piztor/ReqLogin.java16
-rw-r--r--client/src/com/macaroon/piztor/ReqUpdate.java16
-rw-r--r--client/src/com/macaroon/piztor/Res.java11
-rw-r--r--client/src/com/macaroon/piztor/ResLocation.java18
-rw-r--r--client/src/com/macaroon/piztor/ResLogin.java15
-rw-r--r--client/src/com/macaroon/piztor/ResUpdate.java13
-rw-r--r--client/src/com/macaroon/piztor/Rlocation.java13
-rw-r--r--client/src/com/macaroon/piztor/Setting.java31
-rw-r--r--client/src/com/macaroon/piztor/Settings.java22
-rw-r--r--client/src/com/macaroon/piztor/SocketClient.java107
-rw-r--r--client/src/com/macaroon/piztor/Tracker.java68
-rw-r--r--client/src/com/macaroon/piztor/Transam.java139
-rw-r--r--client/src/com/macaroon/piztor/UserInfo.java7
23 files changed, 0 insertions, 1160 deletions
diff --git a/client/src/com/macaroon/piztor/ActMgr.java b/client/src/com/macaroon/piztor/ActMgr.java
deleted file mode 100644
index f5ff994..0000000
--- a/client/src/com/macaroon/piztor/ActMgr.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.macaroon.piztor;
-
-import java.util.*;
-
-import android.annotation.SuppressLint;
-
-@SuppressLint("UseSparseArrays")
-public class ActMgr {
- final static int Create = -1;
- // event
- PiztorAct act;
- ActStatus nowStatus;
- HashMap<ActStatus, HashMap<Integer, ActStatus>> mp;
-
- 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>());
- }
- }
-
- void trigger(int event) {
- System.out.println(act.id + " : " + event);
- if (mp.get(nowStatus).containsKey(event)) {
- nowStatus.leave(event);
- nowStatus = mp.get(nowStatus).get(event);
- 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);
- }
- }
-
- void add(ActStatus a, int event, ActStatus b) {
- if (mp.containsKey(a)) {
- HashMap<Integer, ActStatus> h = mp.get(a);
- h.put(event, b);
- mp.put(a, h);
- } else {
- HashMap<Integer, ActStatus> h = new HashMap<Integer, ActStatus>();
- h.put(event, b);
- mp.put(a, h);
- }
- }
-}
-
-abstract class ActStatus {
- abstract void enter(int e);
-
- abstract void leave(int e);
-}
-
-class EmptyStatus extends ActStatus {
- @Override
- void enter(int e) {
- }
-
- @Override
- void leave(int e) {
- }
-
-}
diff --git a/client/src/com/macaroon/piztor/AppMgr.java b/client/src/com/macaroon/piztor/AppMgr.java
deleted file mode 100644
index 10e8e1a..0000000
--- a/client/src/com/macaroon/piztor/AppMgr.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.macaroon.piztor;
-
-import java.util.HashMap;
-
-import android.annotation.SuppressLint;
-import android.content.Intent;
-import android.os.Handler;
-
-@SuppressLint("UseSparseArrays")
-public class AppMgr {
- // Status
- public enum ActivityStatus{
- create, start, resume, restart, stop, pause, destroy
- }
- static ActivityStatus status;
- static PiztorAct nowAct;
- //TODO fix
- static Handler fromTransam, fromGPS;
- static Transam transam = null;
- static Tracker tracker = null;
- static Thread tTransam, tGPS;
- //Event
-
- final static int noToken = 101;
- final static int loginSuccess = 102;
-
-
- static HashMap<Class<?>, HashMap<Integer, Class<?>>> mp;
-
- static void setStatus(ActivityStatus st) {
- status = st;
- }
-
- static void trigger(int event) {
- Intent i = new Intent();
- System.out.println(nowAct.id + " : " + event);
- if (mp.get(nowAct.getClass()) == null)
- System.out.println("first");
- else if (mp.get(nowAct.getClass()) == null)
- System.out.println("second");
- i.setClass(nowAct, mp.get(nowAct.getClass()).get(event));
- nowAct.startActivity(i);
- }
-
- static void add(Class<?> a, Integer event, Class<?> b) {
- if (mp.containsKey(a))
- mp.get(a).put(event, b);
- else {
- HashMap<Integer, Class<?>> h = new HashMap<Integer, Class<?>>();
- h.put(event, b);
- mp.put(a, h);
- }
- }
-
- static void addTransition(Class<?> a, int i, Class<?> b) {
- if (mp.containsKey(a)) {
- HashMap<Integer, Class<?>> h = mp.get(a);
- h.put(i, b);
- mp.put(a, h);
- } else {
- HashMap<Integer, Class<?>> h = new HashMap<Integer, Class<?>>();
- h.put(i, b);
- mp.put(a, h);
- }
- }
-
- static void addStatus(Class<?> a) {
- mp.put(a, new HashMap<Integer, Class<?>>());
- }
-
- static void init() {
- mp = new HashMap<Class<?>, HashMap<Integer, Class<?>>>();
- fromTransam = new Handler();
- transam = new Transam(Infomation.ip, Infomation.port, fromTransam);
- fromGPS = new Handler();
- tracker = new Tracker(nowAct.getApplicationContext(), fromGPS);
- tTransam = new Thread(transam);
- tTransam.start();
- tGPS = new Thread(tracker);
- tGPS.start();
- System.out.println("!!!!!!");
- addStatus(InitAct.class);
- addStatus(Login.class);
- addStatus(Main.class);
- addTransition(InitAct.class, noToken, Login.class);
- addTransition(Login.class, loginSuccess, Main.class);
- }
-
-}
diff --git a/client/src/com/macaroon/piztor/GPSTracker.java b/client/src/com/macaroon/piztor/GPSTracker.java
deleted file mode 100644
index 7e89d21..0000000
--- a/client/src/com/macaroon/piztor/GPSTracker.java
+++ /dev/null
@@ -1,241 +0,0 @@
-package com.macaroon.piztor;
-
-import android.app.AlertDialog;
-import android.app.Service;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.location.Location;
-import android.location.LocationListener;
-import android.location.LocationManager;
-import android.location.GpsStatus;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.os.SystemClock;
-import android.provider.Settings;
-import android.util.Log;
-
-public class GPSTracker extends Service implements LocationListener, GpsStatus.Listener {
-
- private final Context mContext;
-
- // flag for GPS status
- boolean isGPSEnabled = false;
-
- // flag for network status
- boolean isNetworkEnabled = false;
-
- // flag for GPS status
- boolean canGetLocation = false;
-
- Location location; // location
- double latitude; // latitude
- double longitude; // longitude
-
- // The minimum distance to change Updates in meters
- private static final long MIN_DISTANCE_CHANGE_FOR_UPDATES = 10; // 10 meters
-
- // The minimum time between updates in milliseconds
- private static final long MIN_TIME_BW_UPDATES = 1000 * 3; // 10 seconds
-
- // Declaring a Location Manager
- protected LocationManager locationManager;
-
- // for GPS satellite status listener
- Location mLastLocation;
- long mLastLocationMillis;
- boolean isGPSFix;
-
-
- public GPSTracker(Context context) {
- this.mContext = context;
- isGPSFix = false;
- getLocation();
- }
-
- public Location getLocation() {
- try {
- Log.d("getLocation", "Start getting location......");
-
- locationManager = (LocationManager) mContext
- .getSystemService(LOCATION_SERVICE);
-
- // getting GPS status
- isGPSEnabled = locationManager
- .isProviderEnabled(LocationManager.GPS_PROVIDER);
-
- // getting network status
- isNetworkEnabled = locationManager
- .isProviderEnabled(LocationManager.NETWORK_PROVIDER);
-
- if (!isGPSEnabled) {
- // no network provider is enabled
- } else {
- this.canGetLocation = true;
- if (isNetworkEnabled) {
- locationManager.requestLocationUpdates(
- LocationManager.NETWORK_PROVIDER,
- MIN_TIME_BW_UPDATES,
- MIN_DISTANCE_CHANGE_FOR_UPDATES, this);
-
- Log.d("Network", "Network Updated");
-
- if (locationManager != null) {
- location = locationManager
- .getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
- if (location != null) {
- latitude = location.getLatitude();
- longitude = location.getLongitude();
-
- Log.d("Network", "Received Network Data");
- System.out.println("***From Network: "+latitude + " " + longitude);
- }
- }
- }// end of network section
- // if GPS Enabled get lat/long using GPS Services
- if (isGPSEnabled) {
- if (true) {
- locationManager.requestLocationUpdates(
- LocationManager.GPS_PROVIDER,
- MIN_TIME_BW_UPDATES,
- MIN_DISTANCE_CHANGE_FOR_UPDATES, this);
- Log.d("GPS", "GPS Updated");
- if (locationManager != null) {
- location = locationManager
- .getLastKnownLocation(LocationManager.GPS_PROVIDER);
- if (location != null) {
- latitude = location.getLatitude();
- longitude = location.getLongitude();
-
- Log.d("GPS", "Received GPS Data");
- System.out.println("***From GPS: "+latitude + " " + longitude);
-
- }
- }
- }
- }// end of GPS section
- }// end of fetching data
- return location;
- } catch (Exception e) {
- e.printStackTrace();
- return null;
- }
- }
-
- /**
- * Stop using GPS listener Calling this function will stop using GPS in your
- * app
- * */
- public void stopUsingGPS() {
- if (locationManager != null) {
- locationManager.removeUpdates(GPSTracker.this);
- }
- }
-
- /**
- * Function to get latitude
- * */
- public double getLatitude() {
- if (location != null) {
- latitude = location.getLatitude();
- }
- return latitude;
- }
-
- /**
- * Function to get longitude
- * */
- public double getLongitude() {
- if (location != null) {
- longitude = location.getLongitude();
- }
- return longitude;
- }
-
- /**
- * Function to check GPS/wifi enabled
- *
- * @return boolean
- * */
- public boolean canGetLocation() {
- return this.canGetLocation;
- }
-
- public boolean isGPSFix() {
- return (this.isGPSFix && location != null);
- }
-
- /**
- * Function to show settings alert dialog On pressing Settings button will
- * lauch Settings Options
- * */
- public void showSettingsAlert() {
- AlertDialog.Builder alertDialog = new AlertDialog.Builder(mContext);
-
- // Setting Dialog Title
- alertDialog.setTitle("GPS is settings");
-
- // Setting Dialog Message
- alertDialog
- .setMessage("GPS is not enabled. Do you want to go to settings menu?");
-
- // On pressing Settings button
- alertDialog.setPositiveButton("Settings",
- new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int which) {
- Intent intent = new Intent(
- Settings.ACTION_LOCATION_SOURCE_SETTINGS);
- mContext.startActivity(intent);
- }
- });
-
- // on pressing cancel button
- alertDialog.setNegativeButton("Cancel",
- new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int which) {
- dialog.cancel();
- }
- });
-
- // Showing Alert Message
- alertDialog.show();
- }
-
- @Override
- public void onLocationChanged(Location location) {
- if (location == null) return;
- mLastLocationMillis = SystemClock.elapsedRealtime();
- mLastLocation = location;
- }
-
- @Override
- public void onProviderDisabled(String provider) {
- }
-
- @Override
- public void onProviderEnabled(String provider) {
- }
-
- @Override
- public void onStatusChanged(String provider, int status, Bundle extras) {
- }
-
- @Override
- public IBinder onBind(Intent arg0) {
- return null;
- }
-
- @Override
- public void onGpsStatusChanged(int event) {
- switch (event) {
- case GpsStatus.GPS_EVENT_SATELLITE_STATUS:
- if(mLastLocation != null)
- isGPSFix = (SystemClock.elapsedRealtime() - mLastLocationMillis) < 3000;
- break;
-
- case GpsStatus.GPS_EVENT_FIRST_FIX:
- isGPSFix = true;
- break;
- }
- }
-}
diff --git a/client/src/com/macaroon/piztor/InitAct.java b/client/src/com/macaroon/piztor/InitAct.java
deleted file mode 100644
index d5a6059..0000000
--- a/client/src/com/macaroon/piztor/InitAct.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.macaroon.piztor;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.Menu;
-
-public class InitAct extends PiztorAct {
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- id = "initAct";
- super.onCreate(savedInstanceState);
- AppMgr.init();
- setContentView(R.layout.activity_init);
- }
-
- @Override
- protected void onStart() {
- super.onStart();
- if (UserInfo.token == -1)
- AppMgr.trigger(AppMgr.noToken);
- else {
- //TODO jump to main
- }
- }
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- getMenuInflater().inflate(R.menu.init, menu);
- return true;
- }
-
-}
diff --git a/client/src/com/macaroon/piztor/Login.java b/client/src/com/macaroon/piztor/Login.java
deleted file mode 100644
index a931dae..0000000
--- a/client/src/com/macaroon/piztor/Login.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.macaroon.piztor;
-
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.view.Menu;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-
-public class Login extends PiztorAct {
-
-
- ActMgr actMgr;
- Button btnLogin;
- EditText edtUser, edtPass;
-
- int loginButtonClick = 1, retryButtonClick = 2, loginFailed = 3;
-
- Handler hand = new Handler() {
- @Override
- public void handleMessage(Message m) {
- System.out.println(m.what);
- if (m.what == 0) {
- ResLogin res = (ResLogin) m.obj;
- UserInfo.token = res.t;
- actMgr.trigger(AppMgr.loginSuccess);
- } else if (m.what == 101) {
- actMgr.trigger(loginFailed);
- }
- }
- };
-
- class StartStatus extends ActStatus {
-
- @Override
- void enter(int e) {
- }
-
- @Override
- void leave(int e) {
- }
- }
-
- class LoginStatus extends ActStatus {
-
- @Override
- void enter(int e) {
- String user = edtUser.getText().toString();
- String pass = edtPass.getText().toString();
- long nowtime = System.currentTimeMillis();
- System.out.println(user + " : " + pass + "\n");
- AppMgr.transam.send(new ReqLogin(user, pass, nowtime, 1000));
- }
-
- @Override
- void leave(int e) {
-
- }
-
- }
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- id = "login";
- super.onCreate(savedInstanceState);
- ActStatus[] r = new ActStatus[2];
- AppMgr.transam.setHandler(hand);
- r[0] = new StartStatus();
- r[1] = new LoginStatus();
- actMgr = new ActMgr(this, r[0], r);
- actMgr.add(r[0], loginButtonClick, r[1]);
- actMgr.add(r[1], loginFailed, r[0]);
- setContentView(R.layout.activity_login);
- }
-
- @Override
- protected void onStart() {
- super.onStart();
- btnLogin = (Button) findViewById(R.id.login_btn_login);
- edtUser = (EditText) findViewById(R.id.user_id);
- edtPass = (EditText) findViewById(R.id.user_pass);
- btnLogin.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View arg0) {
- actMgr.trigger(loginButtonClick);
- }
- });
- }
-
- @Override
- protected void onResume() {
- super.onResume();
-
- }
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- // Inflate the menu; this adds items to the action bar if it is present.
- getMenuInflater().inflate(R.menu.login, menu);
- return true;
- }
-
-}
diff --git a/client/src/com/macaroon/piztor/Main.java b/client/src/com/macaroon/piztor/Main.java
deleted file mode 100644
index 0b24abd..0000000
--- a/client/src/com/macaroon/piztor/Main.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.macaroon.piztor;
-
-import android.location.Location;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.view.Menu;
-
-public class Main extends PiztorAct {
-
- ActMgr actMgr;
-
- Handler handler = new Handler() {
- @Override
- public void handleMessage(Message m) {
- if (m.what != 0) {
- Location l = (Location) m.obj;
- if (l == null)
- System.out.println("fuck!!!");
- ReqUpdate r = new ReqUpdate(UserInfo.token, l.getLatitude(),
- l.getLongitude(), System.currentTimeMillis(), 1000);
- AppMgr.transam.send(r);
- }
- }
- };
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- id = "Main";
- super.onCreate(savedInstanceState);
- AppMgr.tracker.setHandler(handler);
- EmptyStatus[] r = new EmptyStatus[1];
- r[0] = new EmptyStatus();
- actMgr = new ActMgr(this, r[0], r);
- setContentView(R.layout.activity_main);
- }
-
- @Override
- protected void onStart() {
- super.onStart();
-
- }
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- // Inflate the menu; this adds items to the action bar if it is present.
- getMenuInflater().inflate(R.menu.main, menu);
- return true;
- }
-
-}
diff --git a/client/src/com/macaroon/piztor/PiztorAct.java b/client/src/com/macaroon/piztor/PiztorAct.java
deleted file mode 100644
index ad12b17..0000000
--- a/client/src/com/macaroon/piztor/PiztorAct.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.macaroon.piztor;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class PiztorAct extends Activity {
- String id;
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- System.out.println(id + " on create");
- AppMgr.setStatus(AppMgr.ActivityStatus.create);
- AppMgr.nowAct = this;
- }
-
- @Override
- protected void onStart() {
- super.onStart();
- System.out.println(id + " on start");
- AppMgr.setStatus(AppMgr.ActivityStatus.start);
- AppMgr.nowAct = this;
- }
-
- @Override
- protected void onStop() {
- super.onStop();
- System.out.println(id + " on stop");
- AppMgr.setStatus(AppMgr.ActivityStatus.stop);
- }
-
- @Override
- protected void onResume() {
- super.onResume();
- System.out.println(id + " on resume");
- AppMgr.setStatus(AppMgr.ActivityStatus.resume);
- AppMgr.nowAct = this;
- }
-
- @Override
- protected void onPause() {
- super.onPause();
- System.out.println(id + " on pause");
- AppMgr.setStatus(AppMgr.ActivityStatus.pause);
- }
-
- @Override
- protected void onRestart() {
- super.onRestart();
- System.out.println(id + " on restart");
- AppMgr.setStatus(AppMgr.ActivityStatus.restart);
- }
-
- @Override
- protected void onDestroy() {
- super.onDestroy();
- System.out.println(id + " on destroy");
- AppMgr.setStatus(AppMgr.ActivityStatus.destroy);
- }
-
-}
diff --git a/client/src/com/macaroon/piztor/PiztorExcepiton.java b/client/src/com/macaroon/piztor/PiztorExcepiton.java
deleted file mode 100644
index 6d1861a..0000000
--- a/client/src/com/macaroon/piztor/PiztorExcepiton.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.macaroon.piztor;
-
-class PiztorExcepiton extends Exception{
- private static final long serialVersionUID = -7147530695009854988L;
-
-}
-
-class ClassCannotFind extends PiztorExcepiton {
- //private class
-}
diff --git a/client/src/com/macaroon/piztor/Req.java b/client/src/com/macaroon/piztor/Req.java
deleted file mode 100644
index 32988b8..0000000
--- a/client/src/com/macaroon/piztor/Req.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.macaroon.piztor;
-
-public class Req{
- int type; //request type
- int token; //authentciation
- long time; //current time
- long alive; //alive time
- Req(int t,int k,long tm,long av){
- type = t;
- token = k;
- time = tm;
- alive = av;
- }
-} \ No newline at end of file
diff --git a/client/src/com/macaroon/piztor/ReqLocation.java b/client/src/com/macaroon/piztor/ReqLocation.java
deleted file mode 100644
index 000f373..0000000
--- a/client/src/com/macaroon/piztor/ReqLocation.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.macaroon.piztor;
-
-//--------------------------------------//
-// Ask Location //
-//--------------------------------------//
-
-public class ReqLocation extends Req{
- int gid; //group id;
-
- ReqLocation(int token,int groupid,long time,long alive){
- super(3,token,time,alive); //for type 3
- gid = groupid;
- }
-} \ No newline at end of file
diff --git a/client/src/com/macaroon/piztor/ReqLogin.java b/client/src/com/macaroon/piztor/ReqLogin.java
deleted file mode 100644
index 294cae3..0000000
--- a/client/src/com/macaroon/piztor/ReqLogin.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.macaroon.piztor;
-
-//--------------------------------------//
-// authentication //
-//--------------------------------------//
-
-public class ReqLogin extends Req{
- String user; //username
- String pass; //password
-
- ReqLogin(String u,String p,long time,long alive){
- super(0,0,time,alive); //for type 0
- user = u;
- pass = p;
- }
-} \ No newline at end of file
diff --git a/client/src/com/macaroon/piztor/ReqUpdate.java b/client/src/com/macaroon/piztor/ReqUpdate.java
deleted file mode 100644
index e4b1497..0000000
--- a/client/src/com/macaroon/piztor/ReqUpdate.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.macaroon.piztor;
-
-//--------------------------------------//
-// Update Location //
-//--------------------------------------//
-
-public class ReqUpdate extends Req{
- double lat; //latitude
- double lot; //longitude
-
- ReqUpdate(int token,double latitude,double longitude,long time,long alive){
- super(2,token,time,alive); //for type 2
- lat = latitude;
- lot = longitude;
- }
-} \ No newline at end of file
diff --git a/client/src/com/macaroon/piztor/Res.java b/client/src/com/macaroon/piztor/Res.java
deleted file mode 100644
index 98af108..0000000
--- a/client/src/com/macaroon/piztor/Res.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.macaroon.piztor;
-
-public class Res{
- int t;
- int s;
- Res(int type,int status){
- t = type;
- s = status;
- }
-}
-
diff --git a/client/src/com/macaroon/piztor/ResLocation.java b/client/src/com/macaroon/piztor/ResLocation.java
deleted file mode 100644
index eb90840..0000000
--- a/client/src/com/macaroon/piztor/ResLocation.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.macaroon.piztor;
-
-import java.util.Vector;
-
-//--------------------------------------//
-// Location Info //
-//--------------------------------------//
-
-public class ResLocation extends Res{
- Vector<Rlocation> l; //vector for location info
- int n; //number of location info
-
- ResLocation(int num,Vector<Rlocation> locationvec){
- super(3,255); //for type 3
- l = locationvec;
- n = num;
- }
-} \ No newline at end of file
diff --git a/client/src/com/macaroon/piztor/ResLogin.java b/client/src/com/macaroon/piztor/ResLogin.java
deleted file mode 100644
index 5b597a4..0000000
--- a/client/src/com/macaroon/piztor/ResLogin.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.macaroon.piztor;
-
-
-//--------------------------------------//
-// Respond to login //
-//--------------------------------------//
-
-public class ResLogin extends Res{
- int t; //user token
-
- ResLogin(int token,int status){
- super(0,status); //for type 0
- t = token;
- }
-} \ No newline at end of file
diff --git a/client/src/com/macaroon/piztor/ResUpdate.java b/client/src/com/macaroon/piztor/ResUpdate.java
deleted file mode 100644
index 727eaa3..0000000
--- a/client/src/com/macaroon/piztor/ResUpdate.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.macaroon.piztor;
-
-
-//--------------------------------------//
-// Respond to update location //
-//--------------------------------------//
-
-public class ResUpdate extends Res{
-
- ResUpdate(int status){
- super(2,status); //for type 2
- }
-} \ No newline at end of file
diff --git a/client/src/com/macaroon/piztor/Rlocation.java b/client/src/com/macaroon/piztor/Rlocation.java
deleted file mode 100644
index 142cc9b..0000000
--- a/client/src/com/macaroon/piztor/Rlocation.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.macaroon.piztor;
-
-class Rlocation{
- int i; //id
- double lat; //latitude
- double lot; //longitude
-
- Rlocation(int id,double latitude,double longitude){
- i = id;
- lat = latitude;
- lot = longitude;
- }
-} \ No newline at end of file
diff --git a/client/src/com/macaroon/piztor/Setting.java b/client/src/com/macaroon/piztor/Setting.java
deleted file mode 100644
index 2a2d2fa..0000000
--- a/client/src/com/macaroon/piztor/Setting.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.macaroon.piztor;
-
-import android.os.Bundle;
-import android.view.Menu;
-
-public class InitAct extends PiztorAct {
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- id = "initAct";
- super.onCreate(savedInstanceState);
- 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) {
- getMenuInflater().inflate(R.menu.init, menu);
- return true;
- }
-
-}
diff --git a/client/src/com/macaroon/piztor/Settings.java b/client/src/com/macaroon/piztor/Settings.java
deleted file mode 100644
index 292a112..0000000
--- a/client/src/com/macaroon/piztor/Settings.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.macaroon.piztor;
-
-import android.os.Bundle;
-import android.app.Activity;
-import android.view.Menu;
-
-public class Settings extends Activity {
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_settings);
- }
-
- @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);
- return true;
- }
-
-}
diff --git a/client/src/com/macaroon/piztor/SocketClient.java b/client/src/com/macaroon/piztor/SocketClient.java
deleted file mode 100644
index 18c19da..0000000
--- a/client/src/com/macaroon/piztor/SocketClient.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.macaroon.piztor;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.util.Vector;
-
-import android.os.Handler;
-import android.os.Message;
-
-public class SocketClient {
- static Socket client;
-
- public SocketClient(String site, int port) throws UnknownHostException,
- IOException {
- try {
- client = new Socket(site, port);
- } catch (UnknownHostException e) {
- throw e;
- } catch (IOException e) {
- throw e;
- }
- }
-
- public void sendMsg(Req req,Handler recall) throws IOException {
- try {
- DataOutputStream out = new DataOutputStream(
- client.getOutputStream());
- int tmp = req.type;
- out.writeByte(tmp);
- switch (tmp) {
- case 0:
- ReqLogin rau = (ReqLogin) req;
- String id = rau.user;
- String pa = rau.pass;
- out.writeBytes(id + "\0" + pa);
- break;
- case 2:
- ReqUpdate rup = (ReqUpdate) req;
- int tk2 = rup.token;
- double slat = rup.lat;
- double slot = rup.lot;
- out.writeInt(tk2);
- out.writeDouble(slat);
- out.writeDouble(slot);
- break;
- case 3:
- ReqLocation ras = (ReqLocation) req;
- int tk3 = ras.token;
- int gid = ras.gid;
- out.writeInt(tk3);
- out.writeInt(gid);
- break;
- }
- out.flush();
- client.shutdownOutput();
- DataInputStream in = new DataInputStream(client.getInputStream());
- Message msg = new Message();
- int type = in.readUnsignedByte();
- switch (type) {
- case 0:
- int id = in.readInt();
- int status = in.readUnsignedByte();
- ResLogin rchklogin = new ResLogin(id,status);
- msg.obj = rchklogin;
- msg.what = 0;
- recall.sendMessage(msg);
- break;
- case 2:
- int status1 = in.readUnsignedByte();
- ResUpdate rchkupd = new ResUpdate(status1);
- msg.obj = rchkupd;
- msg.what = 1;
- recall.sendMessage(msg);
- break;
- case 3:
- int n = in.readInt();
- Vector<Rlocation> tmpv = new Vector<Rlocation>();
- for (int i = 1; i <= n; i++) {
- int tid = in.readInt();
- double lat = in.readDouble();
- double lot = in.readDouble();
- tmpv.add(new Rlocation(tid,lat,lot));
- }
- ResLocation rlocin = new ResLocation(n,tmpv);
- msg.obj = rlocin;
- msg.what = 3;
- recall.sendMessage(msg);
- break;
- }
-
- } catch (IOException e) {
- throw e;
- }
- }
-
- public void closeSocket() {
- try {
- client.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
-}
diff --git a/client/src/com/macaroon/piztor/Tracker.java b/client/src/com/macaroon/piztor/Tracker.java
deleted file mode 100644
index 3c46136..0000000
--- a/client/src/com/macaroon/piztor/Tracker.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.macaroon.piztor;
-
-import android.content.Context;
-import java.util.Timer;
-import java.util.TimerTask;
-
-import android.location.Location;
-import android.content.Context;
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
-import android.os.SystemClock;
-
-
-public class Tracker implements Runnable {
-
- private static final long TIME_DELTA = 1000 * 3; // 3 second
- public Timer timer;
- private final Context mContext;
- GPSTracker myTracker;
- Handler mHandler;
- Message message;
-
- public Tracker(Context context, Handler yHandler) {
- timer = new Timer();
- mContext = context;
- myTracker = new GPSTracker(mContext);
- mHandler = yHandler;
- }
-
- void setHandler(Handler hand) {
- mHandler = hand;
- }
-
-
- public void run() {
- GPSTask myTask = new GPSTask();
- timer.schedule(myTask, 0, TIME_DELTA);
- }
-
- class GPSTask extends TimerTask {
- @Override
- public void run() {
- Location location = myTracker.getLocation();
- Log.d("Location", "Fetching location.....");
- if (myTracker.canGetLocation()) {
-
-// Log.d("TTTTTTTTTTTTTTTTTTTTTTTime","TTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTime");
-// System.out.println("GPSTIME" + myTracker.location.getTime());
-// System.out.println("SYSTIME" + SystemClock.elapsedRealtime());
-
- message = new Message();
- message.what = 0;
- message.obj = location;
- if(myTracker.isGPSFix()) {
- message.what = 1;
- } else {
- message.what = 2;
- }
- mHandler.sendMessage(message);
- } else {
- message = new Message();
- message.what = 0;
- mHandler.sendMessage(message);
- }
- }
- }
-}
diff --git a/client/src/com/macaroon/piztor/Transam.java b/client/src/com/macaroon/piztor/Transam.java
deleted file mode 100644
index 3410502..0000000
--- a/client/src/com/macaroon/piztor/Transam.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package com.macaroon.piztor;
-
-import java.io.IOException;
-import java.net.UnknownHostException;
-import java.util.LinkedList;
-import java.util.Queue;
-import java.util.Timer;
-import java.util.TimerTask;
-
-import android.annotation.SuppressLint;
-import android.os.Handler;
-import android.os.Message;
-
-public class Transam implements Runnable {
-
- public Timer timer;
- public Timer mtimer;
- public boolean running = false;
- public boolean flag = true;
- public int cnt = 4;
- Res res;
- Req req;
- public int p; // port
- public String i; // ip
- Thread thread;
- Handler core;
- Handler recall; // recall
- Queue<Req> reqtask; // request task
-
- Transam(String ip, int port, Handler Recall) {
- p = port;
- i = ip;
- recall = Recall;
- reqtask = new LinkedList<Req>();
- }
-
- public void send(Req r) {
- reqtask.offer(r);
-
- }
-
- public void setHandler(Handler Recall) {
- recall = Recall;
- reqtask.clear();
- }
-
- public void run() { // start the main timer
- // TimerTask tmain = new Timertk();
- // mtimer = new Timer();
- // mtimer.schedule(tmain, 100, 100); //check the queue for every 100
- // msec
-
- while (true) {
- if (running == false) {
-
- if (!reqtask.isEmpty()) { // poll the head request
- req = reqtask.poll();
- if (req.time + req.alive < System.currentTimeMillis()) { // time
- // out!
- Message ret = new Message();
- ret.obj = "Time out!";
- ret.what = 100;
- recall.sendMessage(ret);
- } else { // run the request
- final thd t = new thd();
- flag = false;
- thread = new Thread(t);
- cnt = 4;
- running = true;
- thread.start();
- timer = new Timer();
- TimerTask task = new Timertk();
- timer.schedule(task, 2000, 2000);
- }
- }
- }
- }
- }
-
- class tmain extends TimerTask {
- public void run() {
-
- }
- };
-
- class thd implements Runnable {
- public void run() {
- try {
- SocketClient client = new SocketClient(i, p);
- client.sendMsg(req, recall);
- Message msg = new Message();
- msg.what = 1;
- handler.sendMessage(msg);
- client.closeSocket();
- } catch (UnknownHostException e) {
- e.printStackTrace();
- System.out.println("UnknownHostException");
- } catch (IOException e) {
- e.printStackTrace();
- System.out.println("IOException");
- }
-
- }
- }
-
- @SuppressLint("HandlerLeak")
- Handler handler = new Handler() {
- public void handleMessage(Message msg) {
- switch (msg.what) {
- case 1:
- flag = true;
- break;
- case 2:
- final thd t = new thd();
- thread = new Thread(t);
- thread.start();
- break;
- }
- super.handleMessage(msg);
- }
- };
-
- class Timertk extends TimerTask {
- public void run() {
- if (flag == false && cnt > 0) {
- cnt--;
- } else if (cnt == 0) {
- Message msg = new Message();
- msg.obj = "connecting failed";
- msg.what = 101;
- recall.sendMessage(msg);
- timer.cancel();
- } else if (flag == true) {
- timer.cancel();
- running = false;
- }
- }
- };
-} \ No newline at end of file
diff --git a/client/src/com/macaroon/piztor/UserInfo.java b/client/src/com/macaroon/piztor/UserInfo.java
deleted file mode 100644
index 04be578..0000000
--- a/client/src/com/macaroon/piztor/UserInfo.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.macaroon.piztor;
-
-public class UserInfo {
- static String ip = "69.85.86.42";
- static int port = 9990;
- static int token = -1;
-}