From 6d2656a1f7ee220a659d31c27d305300855f1093 Mon Sep 17 00:00:00 2001
From: lijia <john_095130@163.com>
Date: Mon, 14 Oct 2024 10:56:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=BE=B7=E8=BD=A8=E8=BF=B9=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/TrackService.java                 | 67 ++++++++++---------
 .../ui/home/HomeFragment.java                 |  3 +-
 2 files changed, 38 insertions(+), 32 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..78a480e 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/TrackService.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/service/TrackService.java
@@ -30,22 +30,22 @@ import java.util.TimerTask;
 public class TrackService extends Service {
 
     private Context con;
-    private TrackInputBean tib=new TrackInputBean();
+    private TrackInputBean tib = new TrackInputBean();
     private LocationGDUtil l;
-    private int timeSum=1000*60*3;
-    private String snn="";
-    private Gson gson=new Gson();
+    private int timeSum = 1000 * 60 * 3;
+    private String snn = "";
+    private Gson gson = new Gson();
     private HuoYuanRequset hyr;
 
-    private Handler hd=new Handler(msg -> {
-        switch (msg.what){
+    private Handler hd = new Handler(msg -> {
+        switch (msg.what) {
             case RequsetCodeConstants.SUCCESS:
-                if(CacheGroup.cacheList.get("genzong")!=null){
-                    BaseBean bb=gson.fromJson(CacheGroup.cacheList.get("genzong"),BaseBean.class);
-                    if(bb.getCode()==200){
-                        Log.e("--轨迹上传--","成功");
-                    }else{
-                        Log.e("--轨迹上传失败:--",bb.getMsg());
+                if (CacheGroup.cacheList.get("genzong") != null) {
+                    BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("genzong"), BaseBean.class);
+                    if (bb.getCode() == 200) {
+                        Log.e("--轨迹上传--", "成功");
+                    } else {
+                        Log.e("--轨迹上传失败:--", bb.getMsg());
                     }
                     CacheGroup.cacheList.remove("genzong");
                 }
@@ -59,32 +59,34 @@ public class TrackService extends Service {
 
     @Nullable
     @Override
-    public IBinder onBind(Intent intent) {return null; }
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
 
     @Override
     public void onCreate() {
         super.onCreate();
-        con=this;
-        hyr=new HuoYuanRequset(con,hd);
-        Log.e("开始循环上传，等待100ms","-----");
+        con = this;
+        hyr = new HuoYuanRequset(con, hd);
+        Log.e("开始循环上传，等待100ms", "-----");
         new Timer().schedule(new TimerTask() {
             @Override
             public void run() {
-                snn=SPUtil.getSP(con,"order","ShippingNoteNumber");
-                if(!snn.equals("")) {
+                snn = SPUtil.getSP(con, "order", "ShippingNoteNumber");
+                if (!snn.equals("")) {
                     l = new LocationGDUtil(con, hd);
                     l.onCreate();
-                }else{
+                } else {
                     onDestroy();
                 }
             }
-        },100,timeSum);
+        }, 100, timeSum);
     }
 
     //开始
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        Log.e("服务开启","-----");
+        Log.e("服务开启", "-----");
         return START_STICKY;
 
     }
@@ -94,16 +96,19 @@ public class TrackService extends Service {
         super.onDestroy();
     }
 
-    public void genzong(){
-            //经度
-            tib.setLatitude(l.getLatitude()+"");
-            //纬度
-            tib.setLongitude(l.getLongitude()+"");
-            Log.e("经度",l.getLatitude()+"");
-            Log.e("维度",l.getLongitude()+"");
-            //单号
-            tib.setShippingNoteNumber(snn);
-            hyr.trackTracking(tib);
+    public void genzong() {
+        if (l == null || l.getLatitude() == 0d) {
+            return;
+        }
+        //经度
+        tib.setLatitude(l.getLatitude() + "");
+        //纬度
+        tib.setLongitude(l.getLongitude() + "");
+        Log.e("经度", l.getLatitude() + "");
+        Log.e("维度", l.getLongitude() + "");
+        //单号
+        tib.setShippingNoteNumber(snn);
+        hyr.trackTracking(tib);
     }
 
 }
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java
index eb858e8..2559ce1 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java
@@ -694,7 +694,8 @@ public class HomeFragment extends BaseFragment {
                 qr.getBankCardList();
             }
             ur.getDriverExpire();
-            hyr.startOrder(curWaybillId==-1 ? 0 : curWaybillId);
+//            hyr.startOrder(curWaybillId==-1 ? 0 : curWaybillId);
+            hyr.startOrder(0);
             ur.driverAuthData();
         }
 //            oldTime= Calendar.getInstance().getTimeInMillis();