From b29e3eaf03cbf5f799a264d491074ac7eab091aa Mon Sep 17 00:00:00 2001
From: lijia <john_095130@163.com>
Date: Tue, 16 Jul 2024 08:57:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE00=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/TrackService.java                 | 19 ++++++++++++-------
 .../util/location/LocationGDUtil.java         |  3 +++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/TrackService.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/TrackService.java
index bfec823..6d71619 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/TrackService.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/TrackService.java
@@ -9,6 +9,7 @@ import android.util.Log;
 
 import androidx.annotation.Nullable;
 
+import com.amap.api.location.AMapLocation;
 import com.google.gson.Gson;
 import com.arpa.hndahesudintocctmsdriver.bean.BaseBean;
 import com.arpa.hndahesudintocctmsdriver.request.HuoYuanRequset;
@@ -32,7 +33,7 @@ public class TrackService extends Service {
     private Context con;
     private TrackInputBean tib=new TrackInputBean();
     private LocationGDUtil l;
-    private int timeSum=1000*60*3;
+    private int timeSum=1000*10;
     private String snn="";
     private Gson gson=new Gson();
     private HuoYuanRequset hyr;
@@ -51,7 +52,11 @@ public class TrackService extends Service {
                 }
                 break;
             case LocationGDUtil.RES:
-                genzong();
+                if(CacheGroup.cacheList.get("getLocation")!=null){
+                    AMapLocation location = gson.fromJson(CacheGroup.cacheList.get("getLocation"), AMapLocation.class);
+                    genzong(location);
+                    CacheGroup.cacheList.remove("getLocation");
+                }
                 break;
         }
         return false;
@@ -94,13 +99,13 @@ public class TrackService extends Service {
         super.onDestroy();
     }
 
-    public void genzong(){
+    public void genzong(AMapLocation location){
             //经度
-            tib.setLatitude(l.getLatitude()+"");
+            tib.setLatitude(location.getLatitude()+"");
             //纬度
-            tib.setLongitude(l.getLongitude()+"");
-            Log.e("经度",l.getLatitude()+"");
-            Log.e("维度",l.getLongitude()+"");
+            tib.setLongitude(location.getLongitude()+"");
+            Log.e("经度",location.getLatitude()+"");
+            Log.e("维度",location.getLongitude()+"");
             //单号
             tib.setShippingNoteNumber(snn);
             hyr.trackTracking(tib);
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/location/LocationGDUtil.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/location/LocationGDUtil.java
index 71aada4..4f8b931 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/location/LocationGDUtil.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/location/LocationGDUtil.java
@@ -8,7 +8,9 @@ import com.amap.api.location.AMapLocation;
 import com.amap.api.location.AMapLocationClient;
 import com.amap.api.location.AMapLocationClientOption;
 import com.amap.api.location.AMapLocationListener;
+import com.arpa.hndahesudintocctmsdriver.util.cache.CacheGroup;
 import com.arpa.hndahesudintocctmsdriver.util.msg.MsgUtil;
+import com.google.gson.Gson;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -74,6 +76,7 @@ public class LocationGDUtil {
                     SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     Date date = new Date(aMapLocation.getTime());
                     df.format(date);
+                    CacheGroup.cacheList.put("getLocation",new Gson().toJson(aMapLocation));
                     MsgUtil.addHdMsgWat(hd,RES);
                     if (mLocationClient!=null) {
                         mLocationClient.onDestroy();