diff options
| author | Myth Yang <[email protected]> | 2013-08-23 20:17:23 +0800 |
|---|---|---|
| committer | Myth Yang <[email protected]> | 2013-08-23 20:17:23 +0800 |
| commit | 589d2b52b1135e876ee4c76dd2bf11c7a7cd973a (patch) | |
| tree | f475e3f965dab88983c2c0ae4b3abd71081ad182 /client/activity-demo | |
| parent | a33ed0eabe94748b7ff6604af58dd25a0024bf04 (diff) | |
idiot
Diffstat (limited to 'client/activity-demo')
44 files changed, 186 insertions, 633 deletions
diff --git a/client/activity-demo/Piztor.rar b/client/activity-demo/Piztor.rar Binary files differnew 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differnew 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differnew 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_ Binary files differindex 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 { @Override protected void onDraw(Canvas canvas) { super.onDraw(canvas); - canvas.drawBitmap(b, 0, 0, mPaint); + cout.println(myLocation.x + " -- " + myLocation.y); + canvas.drawCircle(myLocation.x, myLocation.y, 5, mPaint); + //canvas.drawBitmap(b, 0, 0, mPaint); + /*for (int i = 1; i < Location.size(); i++) { + canvas.drawCircle(Location.get(i).x, Location.get(i).y, 2, oPaint); + }*/ // canvas.restore(); } @Override public boolean onTouchEvent(MotionEvent e) { -// v.add(new PointF(e.getX(), e.getY())); + // v.add(new PointF(e.getX(), e.getY())); c.drawRect(e.getX() - 1, e.getY() + 1, e.getX() + 1, e.getY() - 1, mPaint); + invalidate(); return true; } - void drawLocation(double x, double y) { + void changMyLocation(double x, double y) { if (centerX < 0) { centerX = x; centerY = y; } - int x1 = (int)(getWidth() / 2 + (x - centerX) * scale); - int y1 = (int)(getHeight() / 2 + (y - centerY) * scale); - c.drawRect(x1 - 1, y1 + 1, x1 + 1, y1 - 1, mPaint); + int x1 = (int) (getWidth() / 2 + (x - centerX) * scale); + int y1 = (int) (getHeight() / 2 + (y - centerY) * scale); + myLocation.x = x1; + myLocation.y = y1; + cout.println(x + " " + y); invalidate(); } - + void drawString(String s) { mPaint.setTextSize(15); c.drawText(s, 0, getHeight() / 2, mPaint); invalidate(); } - + }
\ No newline at end of file diff --git a/client/activity-demo/Piztor/src/com/example/piztor/Rmsg.java b/client/activity-demo/Piztor/src/com/example/piztor/Rmsg.java new file mode 100644 index 0000000..8f4f587 --- /dev/null +++ b/client/activity-demo/Piztor/src/com/example/piztor/Rmsg.java @@ -0,0 +1,12 @@ +package com.example.piztor; + +public class Rmsg{ + int id; + double lat; + double lot; + Rmsg(int i,double l,double ll){ + id = i; + lat = l; + lot = ll; + } +}
\ No newline at end of file diff --git a/client/activity-demo/Piztor/src/com/example/piztor/Running.java b/client/activity-demo/Piztor/src/com/example/piztor/Running.java index 4ea1526..f4b6135 100644 --- a/client/activity-demo/Piztor/src/com/example/piztor/Running.java +++ b/client/activity-demo/Piztor/src/com/example/piztor/Running.java @@ -29,7 +29,9 @@ public class Running extends Activity { protected void onStart() { super.onStart(); v = (MyView) findViewById(R.id.view); - v.setup(c, b, 31, 121); + v.setup(c, b, -1, -1); + Tracker tr = new Tracker(controller, Running.this); + new Thread(tr).run(); } @Override diff --git a/client/activity-demo/Piztor/src/com/example/piztor/SocketClient.java b/client/activity-demo/Piztor/src/com/example/piztor/SocketClient.java index e66b5bc..472da0d 100644 --- a/client/activity-demo/Piztor/src/com/example/piztor/SocketClient.java +++ b/client/activity-demo/Piztor/src/com/example/piztor/SocketClient.java @@ -36,8 +36,7 @@ public class SocketClient { case 0: String id = (String) req.contain.get(1); String pass = (String) req.contain.get(2); - out.writeUTF(id); - out.writeUTF(pass); + out.writeBytes(id + "\0" + pass); break; case 1: int tk1 = (Integer) req.contain.get(1); @@ -45,7 +44,7 @@ public class SocketClient { String mess = (String) req.contain.get(3); out.writeInt(tk1); out.writeInt(acc); - out.writeUTF(mess); + out.writeBytes(mess); break; case 2: int tk2 = (Integer) req.contain.get(1); @@ -74,6 +73,7 @@ public class SocketClient { r.contain.add(0); r.contain.add(id); r.contain.add(status); + System.out.println(id); break; case 1: r.contain.add(1); @@ -89,11 +89,10 @@ public class SocketClient { r.contain.add(n); for (int i = 1; i <= n; i++) { int tid = in.readInt(); - double lot = in.readDouble(); double lat = in.readDouble(); - r.contain.add(tid); - r.contain.add(lot); - r.contain.add(lat); + double lot = in.readDouble(); + Rmsg a = new Rmsg(tid,lat,lot); + r.contain.add(a); } break; } diff --git a/client/activity-demo/Piztor/src/com/example/piztor/Tracker.java b/client/activity-demo/Piztor/src/com/example/piztor/Tracker.java index ceda506..0222325 100644 --- a/client/activity-demo/Piztor/src/com/example/piztor/Tracker.java +++ b/client/activity-demo/Piztor/src/com/example/piztor/Tracker.java @@ -1,34 +1,41 @@ package com.example.piztor; - import java.util.Timer; import java.util.TimerTask; +import android.content.Context; + public class Tracker implements Runnable { - private static final long TIME_DELTA = 1000 * 60 * 5; - public final Context mContext; - + private static final long TIME_DELTA = 1000 * 10; // 10 seconds + public Timer timer; + private final Context mContext; Controller controller; - public Tracker(Controller newController) { + public Tracker(Controller newController, Context context) { + timer = new Timer(); + mContext = context; controller = newController; } - public Timer timer; public void run() { - TimerTask task = new GPSTask(); - timer.schedule(new GPSTask(), 0, TIME_DELTA); + GPSTask t = new GPSTask(); + t.run(); + //timer.s +// timer.schedule(new GPSTask(), 0, TIME_DELTA); } class GPSTask extends TimerTask { + @Override public void run() { GPSTracker tracker; - tracker = new GPSTracker(Tracker.this); - - double latitude = tracker.getLatitude(); - double longitude = tracker.getLongitude(); - - controller.recieveLocation(latitude, longitude); + tracker = new GPSTracker(mContext); + System.out.println("can get location?"); + if(tracker.canGetLocation()) { + double latitude = tracker.getLatitude(); + double longitude = tracker.getLongitude(); + System.out.println("yes!"); + controller.recieveLocation(latitude, longitude); + } } } } diff --git a/client/activity-demo/Piztor/src/com/example/piztor/Transam.java b/client/activity-demo/Piztor/src/com/example/piztor/Transam.java index e39abd5..db76d06 100644 --- a/client/activity-demo/Piztor/src/com/example/piztor/Transam.java +++ b/client/activity-demo/Piztor/src/com/example/piztor/Transam.java @@ -71,7 +71,9 @@ public class Transam implements Runnable { handler.sendMessage(msg); client.closeSocket(); }catch (UnknownHostException e){ + e.printStackTrace(); }catch (IOException e){ + e.printStackTrace(); } } diff --git a/client/activity-demo/src/com/example/piztor/Controller.java b/client/activity-demo/src/com/example/piztor/Controller.java deleted file mode 100644 index 6e55581..0000000 --- a/client/activity-demo/src/com/example/piztor/Controller.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.example.piztor; - -import java.io.Serializable; -import android.content.Intent; - -public class Controller { - String userToken; - Running run; - - Controller() { - run = null; - userToken = null; - } - - void setRun(Running run) { - this.run = run; - } - - void recieveInfo(Myrespond r) { - if (r.wrong != null) { - System.out.println(r.wrong); - } else { - System.out.println("yeal!"); - } - } - - void recieveLocation(double x, double y) { - run.v.drawLocation(x, y); - } -} diff --git a/client/activity-demo/src/com/example/piztor/Login.java b/client/activity-demo/src/com/example/piztor/Login.java deleted file mode 100644 index e7712c4..0000000 --- a/client/activity-demo/src/com/example/piztor/Login.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.example.piztor; - -public class Login { - MainActivity main; - - Login(MainActivity main) { - this.main = main; - } - - void success(int token) { - main.start(); - System.out.println("token!"); - } - - void failed() { - System.out.println("fuck!!"); - } -} diff --git a/client/activity-demo/src/com/example/piztor/MainActivity.java b/client/activity-demo/src/com/example/piztor/MainActivity.java deleted file mode 100644 index 333bfd4..0000000 --- a/client/activity-demo/src/com/example/piztor/MainActivity.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.example.piztor; - -import java.io.PrintStream; -import java.util.Vector; - -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; -import android.view.Menu; -import android.view.View; -import android.widget.Button; -import android.widget.EditText; - -public class MainActivity extends Activity { - PrintStream cout = System.out; - Button b; - EditText username, password, ip, port; - Login login; - public final static String SER_KEY = "CONTROL"; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - login = new Login(this); - 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"); - Vector<Object> r = new Vector<Object>(); - r.add(0); - r.add(username.getText().toString()); - r.add(password.getText().toString()); - Transam t = new Transam(ip.getText().toString(), Integer - .parseInt(port.getText().toString()), new Myrequest(r), - login); - new Thread(t).run(); - } - }); - username = (EditText) findViewById(R.id.username); - password = (EditText) findViewById(R.id.password); - ip = (EditText) findViewById(R.id.ip); - port = (EditText) findViewById(R.id.port); - cout.println("onCreate!"); - } - - void start() { - Intent i = new Intent(); - i.setClass(MainActivity.this, Running.class); - startActivity(i); - } - - @Override - protected void onStart() { - super.onStart(); - cout.println("onStart!"); - } - - @Override - protected void onRestart() { - super.onRestart(); - cout.println("onRestart!"); - } - - @Override - protected void onResume() { - super.onResume(); - // cout.println("onResume!"); - // v.drawString("!!!!!"); - } - - @Override - protected void onPause() { - super.onPause(); - cout.println("onPause!"); - } - - @Override - protected void onStop() { - super.onStop(); - cout.println("onStop!"); - } - - @Override - protected void onDestroy() { - super.onDestroy(); - cout.println("onDestroy!"); - } - - @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/activity-demo/src/com/example/piztor/MyView.java b/client/activity-demo/src/com/example/piztor/MyView.java deleted file mode 100644 index 1627e4c..0000000 --- a/client/activity-demo/src/com/example/piztor/MyView.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.example.piztor; - -import java.io.*; -import android.content.*; -import android.graphics.*; -import android.graphics.Paint.Style; -import android.util.*; -import android.view.*; - -public class MyView extends View { - static PrintStream cout = System.out; - private Paint mPaint; - public Canvas c = null; - public Bitmap b = null; - public double scale = 100; - public double centerX, centerY; -// Vector<PointF> v; - - void setup(Canvas c, Bitmap b, double x, double y) { - this.c = c; - this.b = b; - centerX = x; - centerY = y; - } - - public MyView(Context context) { - super(context); -// v = new Vector<PointF>(); - mPaint = new Paint(); - mPaint.setColor(Color.RED); - mPaint.setStyle(Style.FILL); - } - - public MyView(Context context, AttributeSet attr) { - super(context, attr); -// v = new Vector<PointF>(); - mPaint = new Paint(); - mPaint.setColor(Color.RED); - mPaint.setStyle(Style.FILL); - } - - @Override - protected void onDraw(Canvas canvas) { - super.onDraw(canvas); - canvas.drawBitmap(b, 0, 0, mPaint); - // canvas.restore(); - } - - @Override - public boolean onTouchEvent(MotionEvent e) { -// v.add(new PointF(e.getX(), e.getY())); - c.drawRect(e.getX() - 1, e.getY() + 1, e.getX() + 1, e.getY() - 1, - mPaint); - invalidate(); - return true; - } - - void drawLocation(double x, double y) { - if (centerX < 0) { - centerX = x; - centerY = y; - } - int x1 = (int)(getWidth() / 2 + (x - centerX) * scale); - int y1 = (int)(getHeight() / 2 + (y - centerY) * scale); - c.drawRect(x1 - 1, y1 + 1, x1 + 1, y1 - 1, mPaint); - invalidate(); - } - - void drawString(String s) { - mPaint.setTextSize(15); - c.drawText(s, 0, getHeight() / 2, mPaint); - invalidate(); - } - -}
\ No newline at end of file diff --git a/client/activity-demo/src/com/example/piztor/Myrequest.java b/client/activity-demo/src/com/example/piztor/Myrequest.java deleted file mode 100644 index 9397e0c..0000000 --- a/client/activity-demo/src/com/example/piztor/Myrequest.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.example.piztor; - -import java.util.Vector; - -public class Myrequest{ - public Vector<Object> contain; - Myrequest(Vector<Object> info){ - contain = info; - } -}
\ No newline at end of file diff --git a/client/activity-demo/src/com/example/piztor/Myrespond.java b/client/activity-demo/src/com/example/piztor/Myrespond.java deleted file mode 100644 index 2398f2b..0000000 --- a/client/activity-demo/src/com/example/piztor/Myrespond.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.example.piztor; - -import java.util.Vector; - -public class Myrespond{ - public Vector<Object> contain; - public String wrong; - Myrespond(){ - wrong = null; - contain = new Vector<Object>(); - } -}
\ No newline at end of file diff --git a/client/activity-demo/src/com/example/piztor/Running.java b/client/activity-demo/src/com/example/piztor/Running.java deleted file mode 100644 index 4ea1526..0000000 --- a/client/activity-demo/src/com/example/piztor/Running.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.example.piztor; - -import java.io.PrintStream; - -import android.os.Bundle; -import android.app.Activity; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.view.Menu; - -public class Running extends Activity { - PrintStream cout = System.out; - MyView v; - Bitmap b; - Canvas c; - Controller controller; - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - b = Bitmap.createBitmap(720, 1280, Bitmap.Config.ARGB_8888); - c = new Canvas(b); - controller = new Controller(); - controller.setRun(this); - setContentView(R.layout.activity_running); - cout.println("running is created!!!"); - } - - @Override - protected void onStart() { - super.onStart(); - v = (MyView) findViewById(R.id.view); - v.setup(c, b, 31, 121); - } - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.running, menu); - return true; - } - -} diff --git a/client/activity-demo/src/com/example/piztor/SocketClient.java b/client/activity-demo/src/com/example/piztor/SocketClient.java deleted file mode 100644 index e66b5bc..0000000 --- a/client/activity-demo/src/com/example/piztor/SocketClient.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.example.piztor; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.io.PrintStream; -import java.net.Socket; -import java.net.UnknownHostException; - -public class SocketClient { - static PrintStream cout = System.out; - static Socket client; - - public SocketClient(String site, int port) throws UnknownHostException, - IOException { - try { - cout.println(site + " " + port); - client = new Socket(site, port); - cout.println("connected successfully!!!"); - } catch (UnknownHostException e) { - cout.println("unknownhostexception!!"); - throw e; - } catch (IOException e) { - cout.println("IOException!!"); - throw e; - } - } - - public Myrespond sendMsg(Myrequest req) throws IOException { - try { - DataOutputStream out = new DataOutputStream( - client.getOutputStream()); - int tmp = (Integer) req.contain.get(0); - out.writeByte(tmp); - switch (tmp) { - case 0: - String id = (String) req.contain.get(1); - String pass = (String) req.contain.get(2); - out.writeUTF(id); - out.writeUTF(pass); - break; - case 1: - int tk1 = (Integer) req.contain.get(1); - int acc = (Integer) req.contain.get(2); - String mess = (String) req.contain.get(3); - out.writeInt(tk1); - out.writeInt(acc); - out.writeUTF(mess); - break; - case 2: - int tk2 = (Integer) req.contain.get(1); - double slot = (Double) req.contain.get(2); - double slat = (Double) req.contain.get(3); - out.writeInt(tk2); - out.writeDouble(slot); - out.writeDouble(slat); - break; - case 3: - int tk3 = (Integer) req.contain.get(1); - int gid = (Integer) req.contain.get(2); - out.writeInt(tk3); - out.writeInt(gid); - break; - } - out.flush(); - client.shutdownOutput(); - DataInputStream in = new DataInputStream(client.getInputStream()); - int type = in.readUnsignedByte(); - Myrespond r = new Myrespond(); - switch (type) { - case 0: - int id = in.readInt(); - int status = in.readUnsignedByte(); - r.contain.add(0); - r.contain.add(id); - r.contain.add(status); - break; - case 1: - r.contain.add(1); - // reserved - break; - case 2: - r.contain.add(2); - // reserved - break; - case 3: - int n = in.readInt(); - r.contain.add(3); - r.contain.add(n); - for (int i = 1; i <= n; i++) { - int tid = in.readInt(); - double lot = in.readDouble(); - double lat = in.readDouble(); - r.contain.add(tid); - r.contain.add(lot); - r.contain.add(lat); - } - break; - } - return r; - } catch (IOException e) { - throw e; - } - } - - public void closeSocket() { - try { - client.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - -} diff --git a/client/activity-demo/src/com/example/piztor/Transam.java b/client/activity-demo/src/com/example/piztor/Transam.java deleted file mode 100644 index e39abd5..0000000 --- a/client/activity-demo/src/com/example/piztor/Transam.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.example.piztor; -import java.io.IOException; -import java.net.UnknownHostException; -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 boolean flag = true; - public boolean reqlog = false; - public int cnt = 4; - public int port; - public String ip; - Thread thread; - Myrequest req; - Myrespond res; - Controller core; - Login log; - - - Transam(String i,int p,Myrequest r,Login l){ - port = p; - ip = i; - req = r; - log = l; - reqlog = true; - } - - Transam(String i,int p,Myrequest r,Controller c){ - port = p; - ip = i; - req = r; - core = c; - } - - public void run() { - final thd t = new thd(); - flag = false; - thread = new Thread(t); - cnt = 4; - thread.start(); - timer = new Timer(); - TimerTask task = new Timertk(); - timer.schedule(task,2000,2000); - } - - class thd implements Runnable { - @Override - public void run() { - try{ - SocketClient client = new SocketClient(ip,port); - res = client.sendMsg(req); - if(!reqlog){ - core.recieveInfo(res); - } - else{ - if((Integer) res.contain.get(2)==0){ - int t = (Integer) res.contain.get(1); - log.success(t); - } - else{ - log.failed(); - } - } - Message msg = new Message(); - msg.what = 1; - handler.sendMessage(msg); - client.closeSocket(); - }catch (UnknownHostException e){ - }catch (IOException e){ - } - - } - } - - @SuppressLint("HandlerLeak") - Handler handler = new Handler(){ - public void handleMessage(Message msg) { - switch (msg.what) { - case 1: - flag = true; - break; - case 2: - if(!reqlog){ - res = new Myrespond(); - res.wrong = msg.obj.toString(); - core.recieveInfo(res); - } - else{ - log.failed(); - } - break; - case 3: - 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 = 2; - handler.sendMessage(msg); - timer.cancel(); - } - else if(flag==true){ - timer.cancel(); - } - } - }; -}
\ No newline at end of file |