ROBOT_DEMO: reduce WifiLocks usage

Use WifiLock only for MotionSpeedPublisher.

diff --git a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/GUI/MainActivity.java b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/GUI/MainActivity.java
index 70ab2e5e0524a449972cb1cb2e3eb291b256007d..2da19d81189151868693e312499938248654c523 100644 (file)
--- a/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/GUI/MainActivity.java
+++ b/orte/contrib/Robot_Demo/src/org/ocera/orte/demo/GUI/MainActivity.java
@@ -115,7 +115,7 @@ public class MainActivity extends Activity {
                motion_speed_subs.cancel();
                hokuyo_view.invalidate();
             mWakeLock.release();
-            mWifiLock.release();
+            //mWifiLock.release();
         }
 
         if (hokuyo_scan != null && !hokuyo_scan.isCancelled()) {
@@ -123,7 +123,7 @@ public class MainActivity extends Activity {
                        hokuyo_scan.cancel();
                        hokuyo_view.invalidate();
                mWakeLock.release();
-               mWifiLock.release();
+               //mWifiLock.release();
         }
     }
     
@@ -345,7 +345,7 @@ public class MainActivity extends Activity {
                                        event.getXPrecision()*event.getX() < normSpeed) {
                                if(!hokuyo_view.isRunningMotion()) {
                                        mWakeLock.acquire();
-                                       mWifiLock.acquire();
+                                       //mWifiLock.acquire();
                                        if (motion_speed_subs == null)
                                                motion_speed_subs = new MotionSpeedSubscribe(appDomain, hokuyo_view);
                                        motion_speed_subs.start();
@@ -358,7 +358,7 @@ public class MainActivity extends Activity {
                                        motion_speed_subs.cancel();
                                        hokuyo_view.invalidate();
                                        mWakeLock.release();
-                                       mWifiLock.release();
+                                       //mWifiLock.release();
                                        Toast.makeText(getApplicationContext(), "Speed Monitor: OFF", Toast.LENGTH_SHORT).show();
                                }
                                return true;
@@ -369,7 +369,7 @@ public class MainActivity extends Activity {
                                                        event.getXPrecision()*event.getX() < hokuyo_view.getWidth() - norm)) {
                                if (!hokuyo_view.isRunning()) {
                                        mWakeLock.acquire();
-                                       mWifiLock.acquire();
+                                       //mWifiLock.acquire();
                                        hokuyo_view.setData(new int[681]);
                                        if (hokuyo_scan == null)
                                                hokuyo_scan = new HokuyoScanSubscribe(appDomain, hokuyo_view);
@@ -383,7 +383,7 @@ public class MainActivity extends Activity {
                                        hokuyo_scan.cancel();
                                        hokuyo_view.invalidate();
                                        mWakeLock.release();
-                                       mWifiLock.release();
+                                       //mWifiLock.release();
                                        Toast.makeText(getApplicationContext(), "Hokuyo LRF: OFF", Toast.LENGTH_SHORT).show();
                                }
                                return true;