Merge branch 'master' of github.com:Determinant/piztor

7 files changed, 5 insertions, 8 deletions

diff --git a/client/activity-demo/Piztor/bin/Piztor.apk b/client/activity-demo/Piztor/bin/Piztor.apk
index a27d301..dbb2bb2 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 0c22f74..d6bef19 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/MainActivity$1.class b/client/activity-demo/Piztor/bin/classes/com/example/piztor/MainActivity$1.class
index b99a90c..f3e6088 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 e8f5052..e390cf2 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/Transam.class b/client/activity-demo/Piztor/bin/classes/com/example/piztor/Transam.class
index 63abd5b..a94e978 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/src/com/example/piztor/MainActivity.java b/client/activity-demo/Piztor/src/com/example/piztor/MainActivity.java
index bf8d755..38c6938 100644
--- a/client/activity-demo/Piztor/src/com/example/piztor/MainActivity.java
+++ b/client/activity-demo/Piztor/src/com/example/piztor/MainActivity.java
@@ -43,12 +43,9 @@ public class MainActivity extends Activity {
 				}
 				else{
 					 Vector<Object> r = new Vector<Object>();
-					 r.add(2);
+					 r.add(3);
 					 r.add(login.tk);
-					 double lot = 123.456;
-					 double lat = 654.321;
-					 r.add(lot);
-					 r.add(lat);
+					 r.add(1);
 					 Transam t = new Transam(ip.getText().toString(), Integer
 					 .parseInt(port.getText().toString()), new Myrequest(r),
 					 c);
@@ -72,7 +69,7 @@ public class MainActivity extends Activity {
 	@Override
 	protected void onStart() {
 		super.onStart();
-		ip.setText("192.168.1.101");
+		ip.setText("69.85.86.42");
 		port.setText("9990");
 		username.setText("hello");
 		password.setText("world");
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 db76d06..50b4186 100644
--- a/client/activity-demo/Piztor/src/com/example/piztor/Transam.java
+++ b/client/activity-demo/Piztor/src/com/example/piztor/Transam.java
@@ -12,7 +12,7 @@ public class Transam implements Runnable {
 	public Timer timer;
 	public boolean flag = true;
 	public boolean reqlog = false;
-	public int cnt = 4;
+	public int cnt = 2;
 	public int port;
 	public String ip;
 	Thread thread;
@@ -45,7 +45,7 @@ public class Transam implements Runnable {
     	thread.start();
     	timer = new Timer();
     	TimerTask task = new Timertk();
-    	timer.schedule(task,2000,2000);
+    	timer.schedule(task,5000,5000);
 	}
 	
 	class thd implements Runnable {