let wifi scan work

diff --git a/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java b/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java
index 33b8d25..bca55dd 100644 (file)
--- a/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java
+++ b/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java
@@ -49,7 +49,7 @@ public class LBSHelper {
     private LBSHelper.OnWiFiInfoListener mListener;\r
     private LBSHelper.MyPhoneStateListener mMyListener;\r
     int mNetworkType;\r
-    private Timer mTimer;\r
+    private static Timer mTimer;\r
     public deviceStatus runtime;\r
     private BroadcastReceiver wifiChangedReceiver;\r
     private String wifiInfoResult;\r
@@ -97,6 +97,7 @@ public class LBSHelper {
                         LBSHelper.this.wifiManager.startScan();\r
                         if (LBSHelper.this.mListener == null) {\r
                             LBSHelper.this.mMyListener = new MyPhoneStateListener();\r
+\r
                         }\r
 \r
                         if (LBSHelper.this.IS_OPEN) {\r

diff --git a/app/src/main/java/com/ic/protocol/service/protocolMainServer.java b/app/src/main/java/com/ic/protocol/service/protocolMainServer.java
index 68aa148..40d2b0a 100644 (file)
--- a/app/src/main/java/com/ic/protocol/service/protocolMainServer.java
+++ b/app/src/main/java/com/ic/protocol/service/protocolMainServer.java
@@ -254,7 +254,10 @@ public class protocolMainServer extends Service {
         @Override\r
         public void getWifiInfoCallBack(String var1) {\r
 \r
-            log("getWifiInfoCallBack "+var1);\r
+            if (var1 !=null)\r
+                log("getWifiInfoCallBack "+var1);\r
+            else\r
+                log("getWifiInfoCallBack wifi end");\r
         }\r
     }\r
     public void do_timer_task(){\r