From: snickersun <scy@incartech.cn>
Date: Mon, 13 Apr 2020 03:31:04 +0000 (+0800)
Subject: 1、GPS 常开的时候，确保每次测试前状态都设置为未定位，保证没信号时状态及时切换。
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=0236b9ceee983c21a703f93d4e3f1592afcbbd2e;p=icsupport.git

1、GPS 常开的时候，确保每次测试前状态都设置为未定位，保证没信号时状态及时切换。
2、去掉ScreenOn Off 时对wifi的操作，暂时不管定位以外的wifi状态。
---

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index ad6766c2..99860d6e 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -330,13 +330,17 @@ public class CoreService extends Service {
                 if (CoreService.is_wifi_network_ok) {
                     CoreService.is_wifi_network_ok = false;
                     /*屏幕亮起时，如果wifi用户设置是开启的，则开启wifi*/
-                    Util.turnOnWifiForConnect(runtime.getContextProxy().context, runtime);
+//                    ICLogger.i("turnOnWifiForConnect");
+//                    if (!Util.isWifiIsOpen(runtime.getContextProxy().context,runtime))
+//                        Util.turnOnWifiForConnect(runtime.getContextProxy().context, runtime);
                 }
             } else if ("android.intent.action.SCREEN_OFF".equals(param1Intent.getAction()) && Util.isWifiIsOpen(runtime.getContextProxy().context,runtime)) {
                // CoreService.is_wifi_network_ok = true;
                 if (!runtime.isNoTurnOffWifiOnScreenOff()) {
                     //不关闭wifi when ScreenOff
-                    Util.turnOffWifiForSleep(runtime.getContextProxy().context, runtime);
+                    ICLogger.i("turnOffWifiForConnect");
+//                    if (Util.isWifiIsOpen(runtime.getContextProxy().context,runtime))
+//                        Util.turnOffWifiForSleep(runtime.getContextProxy().context, runtime);
                 }
             }
         }
diff --git a/app/src/main/java/com/enqualcomm/support/LocationClient.java b/app/src/main/java/com/enqualcomm/support/LocationClient.java
index 6b39500e..b7146948 100644
--- a/app/src/main/java/com/enqualcomm/support/LocationClient.java
+++ b/app/src/main/java/com/enqualcomm/support/LocationClient.java
@@ -249,6 +249,7 @@ public class LocationClient {
 
         } else {
           ICLogger.i("GPS is still listening, skip open it!");
+          runtime.getLocationInstance().setLocationStat(ICLocation.LOCATION_STAT.LOCATION_OPEN); //此处为了检测是否定位时可以正确识别状态，以防一直处于GPS定位成功状态
           if (Config.LOG_TOFILE) ICLogger.logToFile("GPS", "GPS is still listening, skip open it!");
         }
       }else{
@@ -451,9 +452,10 @@ public class LocationClient {
             }
             break;
         }
-
-        if(needCheckAgain)
-          AlarmHelper.setRealTimeAlarmInSeconds(runtime.getContextProxy().context,1,ACTION_CHECK_LOCATION_RESULT);
+        ICLogger.i("needCheckAgain "+needCheckAgain);
+        if(needCheckAgain) {
+          AlarmHelper.setRealTimeAlarmInSeconds(runtime.getContextProxy().context, 1, ACTION_CHECK_LOCATION_RESULT);
+        }
   }
 
   public void stopCheckLocationResult(){
@@ -601,7 +603,6 @@ public void updateCellInfo() {
 
         break;
     }
-
       startCheckResult();
   }
 
diff --git a/app/src/main/java/com/enqualcomm/support/NMEAListener.java b/app/src/main/java/com/enqualcomm/support/NMEAListener.java
index be34aa4c..4aeff352 100644
--- a/app/src/main/java/com/enqualcomm/support/NMEAListener.java
+++ b/app/src/main/java/com/enqualcomm/support/NMEAListener.java
@@ -533,6 +533,7 @@ public class NMEAListener implements NmeaListener, LocationListener {
     if (this.listening == false) {
       Settings.Secure.setLocationProviderEnabled(runtime.getContextProxy().getResolver(), GPS_PROVIDER, true);
 
+      runtime.getLocationInstance().setLocationStat(ICLocation.LOCATION_STAT.LOCATION_OPEN);
 
       Criteria criteria = new Criteria();
       criteria.setAccuracy(Criteria.ACCURACY_FINE);// 设置为最大精度
@@ -564,6 +565,9 @@ public class NMEAListener implements NmeaListener, LocationListener {
       return true;//gpsHotStart();
     } else {
       ICLogger.i(" location listening， skip !");
+
+      runtime.getLocationInstance().setLocationStat(ICLocation.LOCATION_STAT.LOCATION_SEARCHING);
+
       if (Config.LOG_TOFILE) ICLogger.logToFile("GPS", " location listening， skip !");
 
       return true;