idiot

44 files changed, 186 insertions, 633 deletions

diff --git a/client/activity-demo/Piztor.rar b/client/activity-demo/Piztor.rar
new file mode 100644
index 0000000..5ebf80c
--- /dev/null
+++ b/client/activity-demo/Piztor.rar
diff --git a/client/activity-demo/Piztor/.classpath b/client/activity-demo/Piztor/.classpath
index 7bc01d9..5176974 100644
--- a/client/activity-demo/Piztor/.classpath
+++ b/client/activity-demo/Piztor/.classpath
@@ -1,9 +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="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/client/activity-demo/Piztor/AndroidManifest.xml b/client/activity-demo/Piztor/AndroidManifest.xml
index 9561604..10e170f 100644
--- a/client/activity-demo/Piztor/AndroidManifest.xml
+++ b/client/activity-demo/Piztor/AndroidManifest.xml
@@ -3,6 +3,12 @@
     package="com.example.piztor"
     android:versionCode="1"
     android:versionName="1.0" >
+    
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+	<uses-permission android:name="android.permission.WAKE_LOCK"/>
+	<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
 
     <uses-sdk
         android:minSdkVersion="9"
diff --git a/client/activity-demo/Piztor/bin/AndroidManifest.xml b/client/activity-demo/Piztor/bin/AndroidManifest.xml
index 9561604..10e170f 100644
--- a/client/activity-demo/Piztor/bin/AndroidManifest.xml
+++ b/client/activity-demo/Piztor/bin/AndroidManifest.xml
@@ -3,6 +3,12 @@
     package="com.example.piztor"
     android:versionCode="1"
     android:versionName="1.0" >
+    
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+	<uses-permission android:name="android.permission.WAKE_LOCK"/>
+	<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
 
     <uses-sdk
         android:minSdkVersion="9"
diff --git a/client/activity-demo/Piztor/bin/Piztor.apk b/client/activity-demo/Piztor/bin/Piztor.apk
index fc36012..a27d301 100644
--- a/client/activity-demo/Piztor/bin/Piztor.apk
+++ b/client/activity-demo/Piztor/bin/Piztor.apk
diff --git a/client/activity-demo/Piztor/bin/classes.dex b/client/activity-demo/Piztor/bin/classes.dex
index f8a5442..0c22f74 100644
--- a/client/activity-demo/Piztor/bin/classes.dex
+++ b/client/activity-demo/Piztor/bin/classes.dex
diff --git a/client/activity-demo/Piztor/bin/classes/com/example/piztor/Controller.class b/client/activity-demo/Piztor/bin/classes/com/example/piztor/Controller.class
index 0b98ba7..e9b16d2 100644
--- a/client/activity-demo/Piztor/bin/classes/com/example/piztor/Controller.class
+++ b/client/activity-demo/Piztor/bin/classes/com/example/piztor/Controller.class
diff --git a/client/activity-demo/Piztor/bin/classes/com/example/piztor/GPSTracker$1.class b/client/activity-demo/Piztor/bin/classes/com/example/piztor/GPSTracker$1.class
index ffabec6..997b8f5 100644
--- a/client/activity-demo/Piztor/bin/classes/com/example/piztor/GPSTracker$1.class
+++ b/client/activity-demo/Piztor/bin/classes/com/example/piztor/GPSTracker$1.class
diff --git a/client/activity-demo/Piztor/bin/classes/com/example/piztor/GPSTracker$2.class b/client/activity-demo/Piztor/bin/classes/com/example/piztor/GPSTracker$2.class
index ae2fc52..a01d5ea 100644
--- a/client/activity-demo/Piztor/bin/classes/com/example/piztor/GPSTracker$2.class
+++ b/client/activity-demo/Piztor/bin/classes/com/example/piztor/GPSTracker$2.class
diff --git a/client/activity-demo/Piztor/bin/classes/com/example/piztor/GPSTracker.class b/client/activity-demo/Piztor/bin/classes/com/example/piztor/GPSTracker.class
index ae8c248..ae89879 100644
--- a/client/activity-demo/Piztor/bin/classes/com/example/piztor/GPSTracker.class
+++ b/client/activity-demo/Piztor/bin/classes/com/example/piztor/GPSTracker.class
diff --git a/client/activity-demo/Piztor/bin/classes/com/example/piztor/Login.class b/client/activity-demo/Piztor/bin/classes/com/example/piztor/Login.class
index 8145ba5..dd08b6f 100644
--- a/client/activity-demo/Piztor/bin/classes/com/example/piztor/Login.class
+++ b/client/activity-demo/Piztor/bin/classes/com/example/piztor/Login.class
diff --git a/client/activity-demo/Piztor/bin/classes/com/example/piztor/MainActivity$1.class b/client/activity-demo/Piztor/bin/classes/com/example/piztor/MainActivity$1.class
index 333a3c3..b99a90c 100644
--- a/client/activity-demo/Piztor/bin/classes/com/example/piztor/MainActivity$1.class
+++ b/client/activity-demo/Piztor/bin/classes/com/example/piztor/MainActivity$1.class
diff --git a/client/activity-demo/Piztor/bin/classes/com/example/piztor/MainActivity.class b/client/activity-demo/Piztor/bin/classes/com/example/piztor/MainActivity.class
index 90f6d2e..e8f5052 100644
--- a/client/activity-demo/Piztor/bin/classes/com/example/piztor/MainActivity.class
+++ b/client/activity-demo/Piztor/bin/classes/com/example/piztor/MainActivity.class
diff --git a/client/activity-demo/Piztor/bin/classes/com/example/piztor/MyView.class b/client/activity-demo/Piztor/bin/classes/com/example/piztor/MyView.class
index 19f49c1..441b92c 100644
--- a/client/activity-demo/Piztor/bin/classes/com/example/piztor/MyView.class
+++ b/client/activity-demo/Piztor/bin/classes/com/example/piztor/MyView.class
diff --git a/client/activity-demo/Piztor/bin/classes/com/example/piztor/Rmsg.class b/client/activity-demo/Piztor/bin/classes/com/example/piztor/Rmsg.class
new file mode 100644
index 0000000..9bcd917
--- /dev/null
+++ b/client/activity-demo/Piztor/bin/classes/com/example/piztor/Rmsg.class
diff --git a/client/activity-demo/Piztor/bin/classes/com/example/piztor/Running.class b/client/activity-demo/Piztor/bin/classes/com/example/piztor/Running.class
index 05f560c..4ed4b3d 100644
--- a/client/activity-demo/Piztor/bin/classes/com/example/piztor/Running.class
+++ b/client/activity-demo/Piztor/bin/classes/com/example/piztor/Running.class
diff --git a/client/activity-demo/Piztor/bin/classes/com/example/piztor/SocketClient.class b/client/activity-demo/Piztor/bin/classes/com/example/piztor/SocketClient.class
index 29afa9c..339dde4 100644
--- a/client/activity-demo/Piztor/bin/classes/com/example/piztor/SocketClient.class
+++ b/client/activity-demo/Piztor/bin/classes/com/example/piztor/SocketClient.class
diff --git a/client/activity-demo/Piztor/bin/classes/com/example/piztor/Tracker$GPSTask.class b/client/activity-demo/Piztor/bin/classes/com/example/piztor/Tracker$GPSTask.class
index a72e8f3..493b9e2 100644
--- a/client/activity-demo/Piztor/bin/classes/com/example/piztor/Tracker$GPSTask.class
+++ b/client/activity-demo/Piztor/bin/classes/com/example/piztor/Tracker$GPSTask.class
diff --git a/client/activity-demo/Piztor/bin/classes/com/example/piztor/Tracker.class b/client/activity-demo/Piztor/bin/classes/com/example/piztor/Tracker.class
index 4cc54cd..c3d6f0c 100644
--- a/client/activity-demo/Piztor/bin/classes/com/example/piztor/Tracker.class
+++ b/client/activity-demo/Piztor/bin/classes/com/example/piztor/Tracker.class
diff --git a/client/activity-demo/Piztor/bin/classes/com/example/piztor/Transam$1.class b/client/activity-demo/Piztor/bin/classes/com/example/piztor/Transam$1.class
index 5999fc1..91cf629 100644
--- a/client/activity-demo/Piztor/bin/classes/com/example/piztor/Transam$1.class
+++ b/client/activity-demo/Piztor/bin/classes/com/example/piztor/Transam$1.class
diff --git a/client/activity-demo/Piztor/bin/classes/com/example/piztor/Transam$Timertk.class b/client/activity-demo/Piztor/bin/classes/com/example/piztor/Transam$Timertk.class
index 42f06c9..34edfdf 100644
--- a/client/activity-demo/Piztor/bin/classes/com/example/piztor/Transam$Timertk.class
+++ b/client/activity-demo/Piztor/bin/classes/com/example/piztor/Transam$Timertk.class
diff --git a/client/activity-demo/Piztor/bin/classes/com/example/piztor/Transam$thd.class b/client/activity-demo/Piztor/bin/classes/com/example/piztor/Transam$thd.class
index e402d5b..a40ea07 100644
--- a/client/activity-demo/Piztor/bin/classes/com/example/piztor/Transam$thd.class
+++ b/client/activity-demo/Piztor/bin/classes/com/example/piztor/Transam$thd.class
diff --git a/client/activity-demo/Piztor/bin/classes/com/example/piztor/Transam.class b/client/activity-demo/Piztor/bin/classes/com/example/piztor/Transam.class
index 60f93bf..63abd5b 100644
--- a/client/activity-demo/Piztor/bin/classes/com/example/piztor/Transam.class
+++ b/client/activity-demo/Piztor/bin/classes/com/example/piztor/Transam.class
diff --git a/client/activity-demo/Piztor/bin/dexedLibs/android-support-v4-47342e257aecfcb7fb303475c203fee3.jar b/client/activity-demo/Piztor/bin/dexedLibs/android-support-v4-47342e257aecfcb7fb303475c203fee3.jar
new file mode 100644
index 0000000..b263924
--- /dev/null
+++ b/client/activity-demo/Piztor/bin/dexedLibs/android-support-v4-47342e257aecfcb7fb303475c203fee3.jar
diff --git a/client/activity-demo/Piztor/bin/resources.ap_ b/client/activity-demo/Piztor/bin/resources.ap_
index 859ad06..f0851cf 100644
--- a/client/activity-demo/Piztor/bin/resources.ap_
+++ b/client/activity-demo/Piztor/bin/resources.ap_
diff --git a/client/activity-demo/Piztor/src/com/example/piztor/Controller.java b/client/activity-demo/Piztor/src/com/example/piztor/Controller.java
index 6e55581..d6e75d7 100644
--- a/client/activity-demo/Piztor/src/com/example/piztor/Controller.java
+++ b/client/activity-demo/Piztor/src/com/example/piztor/Controller.java
@@ -1,7 +1,5 @@
 package com.example.piztor;
 
-import java.io.Serializable;
-import android.content.Intent;
 
 public class Controller {
 	String userToken;
@@ -25,6 +23,7 @@ public class Controller {
 	}
 
 	void recieveLocation(double x, double y) {
-		run.v.drawLocation(x, y);
+		System.out.println(x + "  xxxx " + y);
+		run.v.changMyLocation(x, y);
 	}
 }
diff --git a/client/activity-demo/Piztor/src/com/example/piztor/GPSTracker.java b/client/activity-demo/Piztor/src/com/example/piztor/GPSTracker.java
index e592ba3..13cb868 100644
--- a/client/activity-demo/Piztor/src/com/example/piztor/GPSTracker.java
+++ b/client/activity-demo/Piztor/src/com/example/piztor/GPSTracker.java
@@ -1,4 +1,5 @@
 package com.example.piztor;

+

 import android.app.AlertDialog;

 import android.app.Service;

 import android.content.Context;

@@ -33,7 +34,7 @@ public class GPSTracker extends Service implements LocationListener {
 	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 = 10 * 60 * 1; // 1 minute

+	private static final long MIN_TIME_BW_UPDATES = 1000 * 10; // 10 seconds

 

 	// Declaring a Location Manager

 	protected LocationManager locationManager;

@@ -56,7 +57,7 @@ public class GPSTracker extends Service implements LocationListener {
 			isNetworkEnabled = locationManager

 					.isProviderEnabled(LocationManager.NETWORK_PROVIDER);

 

-			if (!isGPSEnabled && !isNetworkEnabled) {

+			if (!isGPSEnabled) {

 				// no network provider is enabled

 			} else {

 				this.canGetLocation = true;

@@ -101,79 +102,84 @@ public class GPSTracker extends Service implements LocationListener {
 

 		return location;

 	}

-	

+

 	/**

-	 * Stop using GPS listener

-	 * Calling this function will stop using GPS in your app

-	 */

-	public void stopUsingGPS(){

-		if(locationManager != 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){

+	 * */

+	public double getLatitude() {

+		if (location != null) {

 			latitude = location.getLatitude();

 		}

-		

+

 		// return latitude

 		return latitude;

 	}

-	

+

 	/**

 	 * Function to get longitude

-	 */

-	public double getLongitude(){

-		if(location != null){

+	 * */

+	public double getLongitude() {

+		if (location != null) {

 			longitude = location.getLongitude();

 		}

-		

+

 		// return longitude

 		return longitude;

 	}

-	

+

 	/**

 	 * Function to check GPS/wifi enabled

+	 * 

 	 * @return boolean

-	 */

+	 * */

 	public boolean canGetLocation() {

 		return this.canGetLocation;

 	}

-	

+

 	/**

-	 * Function to show settings alert dialog

-	 * On pressing Settings button will lauch Settings Options

-	 */

-	public void showSettingsAlert(){

+	 * 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();

+

+		// 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

@@ -196,4 +202,5 @@ public class GPSTracker extends Service implements LocationListener {
 	public IBinder onBind(Intent arg0) {

 		return null;

 	}

+

 }

diff --git a/client/activity-demo/Piztor/src/com/example/piztor/Login.java b/client/activity-demo/Piztor/src/com/example/piztor/Login.java
index e7712c4..de5cded 100644
--- a/client/activity-demo/Piztor/src/com/example/piztor/Login.java
+++ b/client/activity-demo/Piztor/src/com/example/piztor/Login.java
@@ -2,13 +2,15 @@ package com.example.piztor;
 
 public class Login {
 	MainActivity main;
+	int tk;
 	
 	Login(MainActivity main) {
 		this.main = main;
 	}
 	
 	void success(int token) {
-		main.start();
+		//main.start();
+		tk = token;
 		System.out.println("token!");
 	}
 	
diff --git a/client/activity-demo/Piztor/src/com/example/piztor/MainActivity.java b/client/activity-demo/Piztor/src/com/example/piztor/MainActivity.java
index 333bfd4..bf8d755 100644
--- a/client/activity-demo/Piztor/src/com/example/piztor/MainActivity.java
+++ b/client/activity-demo/Piztor/src/com/example/piztor/MainActivity.java
@@ -16,6 +16,8 @@ public class MainActivity extends Activity {
 	Button b;
 	EditText username, password, ip, port;
 	Login login;
+	Controller c;
+	boolean flag = false;
 	public final static String SER_KEY = "CONTROL";
 
 	@Override
@@ -23,17 +25,12 @@ public class MainActivity extends Activity {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_main);
 		login = new Login(this);
+		c = new Controller();
 		b = (Button) findViewById(R.id.login);
+		
 		b.setOnClickListener(new View.OnClickListener() {
 			public void onClick(View v) {
-				cout.println(username.getText().toString());
-				cout.println(password.getText().toString());
-				cout.println(ip.getText().toString());
-				cout.println(port.getText().toString());
-				ip.setText("192.168.1.102");
-				port.setText("9990");
-				username.setText("hello");
-				password.setText("world");
+				if(flag==false){
 				 Vector<Object> r = new Vector<Object>();
 				 r.add(0);
 				 r.add(username.getText().toString());
@@ -42,6 +39,21 @@ public class MainActivity extends Activity {
 				 .parseInt(port.getText().toString()), new Myrequest(r),
 				 login);
 				 new Thread(t).run();
+				 flag = true;
+				}
+				else{
+					 Vector<Object> r = new Vector<Object>();
+					 r.add(2);
+					 r.add(login.tk);
+					 double lot = 123.456;
+					 double lat = 654.321;
+					 r.add(lot);
+					 r.add(lat);
+					 Transam t = new Transam(ip.getText().toString(), Integer
+					 .parseInt(port.getText().toString()), new Myrequest(r),
+					 c);
+					 new Thread(t).run();
+				}
 			}
 		});
 		username = (EditText) findViewById(R.id.username);
@@ -60,6 +72,10 @@ public class MainActivity extends Activity {
 	@Override
 	protected void onStart() {
 		super.onStart();
+		ip.setText("192.168.1.101");
+		port.setText("9990");
+		username.setText("hello");
+		password.setText("world");
 		cout.println("onStart!");
 	}
 
diff --git a/client/activity-demo/Piztor/src/com/example/piztor/MyView.java b/client/activity-demo/Piztor/src/com/example/piztor/MyView.java
index 1627e4c..a213013 100644
--- a/client/activity-demo/Piztor/src/com/example/piztor/MyView.java
+++ b/client/activity-demo/Piztor/src/com/example/piztor/MyView.java
@@ -1,39 +1,55 @@
 package com.example.piztor;
 
-import java.io.*;
-import android.content.*;
-import android.graphics.*;
+import java.io.PrintStream;
+import java.util.Vector;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
 import android.graphics.Paint.Style;
-import android.util.*;
-import android.view.*;
+import android.graphics.Point;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
 
 public class MyView extends View {
 	static PrintStream cout = System.out;
-	private Paint mPaint;
+	private Paint mPaint, oPaint;
 	public Canvas c = null;
 	public Bitmap b = null;
-	public double scale = 100;
+	public double scale = 1;
 	public double centerX, centerY;
-//	Vector<PointF> v;
+	
+	
+	Point myLocation;
+	Vector<Point> Location;
 
 	void setup(Canvas c, Bitmap b, double x, double y) {
 		this.c = c;
 		this.b = b;
 		centerX = x;
 		centerY = y;
+		myLocation = new Point(10, 10);
+		Location = new Vector<Point>();
+		Location.add(myLocation);
 	}
 
 	public MyView(Context context) {
 		super(context);
-//		v = new Vector<PointF>();
+		// v = new Vector<PointF>();
 		mPaint = new Paint();
 		mPaint.setColor(Color.RED);
 		mPaint.setStyle(Style.FILL);
+		oPaint = new Paint();
+		oPaint.setColor(Color.BLUE);
+		oPaint.setStyle(Style.FILL);
 	}
 
 	public MyView(Context context, AttributeSet attr) {
 		super(context, attr);
-//		v = new Vector<PointF>();
+		// v = new Vector<PointF>();
 		mPaint = new Paint();
 		mPaint.setColor(Color.RED);
 		mPaint.setStyle(Style.FILL);
@@ -42,34 +58,42 @@ public class MyView extends View {