From: TrillGates <williamtrillgates@gmail.com>
Date: Tue, 2 Nov 2021 03:15:18 +0000 (+0800)
Subject: 添加了log
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=c70302ffa4a1b4f888295601536043f4e7a20ae9;p=icsupport.git

添加了log
---

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index bfc382e9..f5abfba9 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -75,6 +75,8 @@ import com.enqualcomm.support.utils.mqttConnection;
 import com.ic.fzd.weather.IFZDWeatherCallback;
 import com.ic.fzd.weather.IFZDWeatherService;
 import com.ic.jni.ICJniUtils;
+import com.ic.protocolSrv.IFZDCallback;
+import com.ic.protocolSrv.IFZDService;
 import com.ic.protocols.protocolAPIHelper;
 import com.ic.s123.IS123WeatherCallback;
 import com.ic.s123.IS123WeatherService;
@@ -1615,7 +1617,6 @@ public class CoreService extends Service {
         }
         ICLogger.i("triggerLocationProcess ");
         locationClient.triggerLocationProcess();
-
     }
 
     public void setHeartBeatAlarm() {
diff --git a/app/src/main/java/com/enqualcomm/support/LocationClient.java b/app/src/main/java/com/enqualcomm/support/LocationClient.java
index fa998aa3..a84e1e4c 100644
--- a/app/src/main/java/com/enqualcomm/support/LocationClient.java
+++ b/app/src/main/java/com/enqualcomm/support/LocationClient.java
@@ -589,12 +589,13 @@ public class LocationClient {
             gps_ok = true;
         if (runtime.getLocationInstance().getLocationStat() == ICLocation.LOCATION_STAT.LOCATION_GPS_TIEMOUT)
             gps_nosignal = true;
+        ICLogger.d("runtime.getLocationInstance().isDataChanged() ==> " + runtime.getLocationInstance().isDataChanged());
+        ICLogger.d("runtime.getLocationInstance() ==> " + runtime.getLocationInstance());
         lbs_ok = (runtime.getLocationInstance().isDataChanged() == false
                 || (runtime.getLocationInstance().getMNC().equals("0")
                 && runtime.getLocationInstance().getMCC().equals("0")
                 && runtime.getLocationInstance().getGSMStationCID() == 0
                 && runtime.getLocationInstance().getLAC() == 0)) ? false : true;
-
         //        ICLogger.i("getMNC "+runtime.getLocationInstance().getMNC()+" getMCC "+runtime.getLocationInstance().getMCC()+" getGSMStationCID " + runtime.getLocationInstance().getGSMStationCID()+ " getLAC "+runtime.getLocationInstance().getLAC()+" changed "+runtime.getLocationInstance().isDataChanged());
         ICLogger.i("waitAndSendLocation " + checktimes + ", lbs=" + lbs_ok + ", wifi=" + wifi_ok + ", gps=" + gps_ok + ", mode=" + mode);
         if (mNoMoveAndNoGPSsignalSkipGpsFlag) {
diff --git a/app/src/main/java/com/enqualcomm/support/bean/ICLocation.java b/app/src/main/java/com/enqualcomm/support/bean/ICLocation.java
index 61738e8b..9763027c 100644
--- a/app/src/main/java/com/enqualcomm/support/bean/ICLocation.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/ICLocation.java
@@ -360,4 +360,19 @@ public class ICLocation {
         return currentLBS;
     }
 
+    @Override
+    public String toString() {
+        return "ICLocation{" +
+                "MCC='" + MCC + '\'' +
+                ", MNC='" + MNC + '\'' +
+                ", LAC=" + LAC +
+                ", CID=" + CID +
+                ", rxlevel=" + rxlevel +
+                ", datachanged=" + datachanged +
+                ", lastMCC='" + lastMCC + '\'' +
+                ", lastMNC='" + lastMNC + '\'' +
+                ", lastLAC=" + lastLAC +
+                ", lastCID=" + lastCID +
+                '}';
+    }
 }
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 af39da37..fed5d234 100644
--- a/app/src/main/java/com/ic/protocols/protocol_fzd.java
+++ b/app/src/main/java/com/ic/protocols/protocol_fzd.java
@@ -1356,7 +1356,6 @@ public class protocol_fzd {
     }
 
     public void handleCR(Connection connection) {
-
         connection.send(CR());
     }