默认Mode8 GPS定位

diff --git a/app/src/main/java/com/ic/protocolSrv/Config.java b/app/src/main/java/com/ic/protocolSrv/Config.java
index 3811342..e71d7e2 100644 (file)
--- a/app/src/main/java/com/ic/protocolSrv/Config.java
+++ b/app/src/main/java/com/ic/protocolSrv/Config.java
@@ -37,7 +37,7 @@ import static com.ic.protocolSrv.utils.Util.getSystemProperties;
  * 1.json配置
  * 2.Android.mk配置
  * 3.Config.java默认配置
- *
+ * <p>
  * 数字越小，优先级越高
  */
 public class Config {
@@ -442,7 +442,7 @@ public class Config {
 
 
     public static int getLocationMode(Context context) {
-        return SharePreferenceUtil.getPrefInt(context, KeyLocationMode, ICLocation.NORMAL_MOD);
+        return SharePreferenceUtil.getPrefInt(context, KeyLocationMode, ICLocation.CUSTOM_MOD8_GPS);
     }
 
     private static final String KeyBootUpDate = "bootupdate";
@@ -1057,17 +1057,17 @@ public class Config {
             DefaultLocationCycle = 15 * 60;
             DefaultPPGTestCycleInMinutes = 15;
             DefaultTemperatureTestCycle = 15 * 60;
-        } else if (Config.custom_name.equals("18cube") ) {
+        } else if (Config.custom_name.equals("18cube")) {
             //C46-W100 config
             Config.ConfigAlarm(Runtime.AlarmType.ALARM_SOS, true);
             Config.ConfigAlarm(Runtime.AlarmType.ALARM_LOWBATTERY, true);
             enableSleep = false;
-            DefaultLocationMode = CUSTOM_MOD9_WIFI_FIRST;
             DefaultLocationCycle = 15 * 60;
             DefaultPPGTestCycleInMinutes = 60;
             DefaultTemperatureTestCycle = 0;
             noBroadCastPushTxtNotify = true;
-            forceGPSMoveCheck = true; //即爱对gps不进行运动检测，此变量专门为了给其他协议进行强制运动检测用的。
+            forceGPSMoveCheck = true;
+            DefaultLocationMode = CUSTOM_MOD8_GPS;
         } else {
             DefaultLocationMode = NORMAL_MOD;
             DefaultLocationCycle = 900;

diff --git a/app/src/main/java/com/ic/protocols/protocol_fzd.java b/app/src/main/java/com/ic/protocols/protocol_fzd.java
index 635ccff..36bc6f1 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_fzd.java
+++ b/app/src/main/java/com/ic/protocols/protocol_fzd.java
@@ -1347,7 +1347,6 @@ public class protocol_fzd {
     }
 
     public void handleCR(Connection connection) {
-
         connection.send(CR());
     }