From 32275aa66faa5371467e291b7d19a5e782f8aade Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 18 十二月 2024 16:47:18 +0800
Subject: [PATCH] 1.修改取水口坐标相关代码

---
 app/src/main/java/com/dayu/pipirrapp/service/MyLocationService.java |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/dayu/pipirrapp/service/MyLocationService.java b/app/src/main/java/com/dayu/pipirrapp/service/MyLocationService.java
index a55e156..7e8a6bd 100644
--- a/app/src/main/java/com/dayu/pipirrapp/service/MyLocationService.java
+++ b/app/src/main/java/com/dayu/pipirrapp/service/MyLocationService.java
@@ -29,6 +29,7 @@
 import com.dayu.pipirrapp.R;
 import com.dayu.pipirrapp.activity.MainActivity;
 import com.dayu.pipirrapp.bean.db.LatLonBean;
+import com.dayu.pipirrapp.utils.CommonKeyName;
 import com.dayu.pipirrapp.utils.MyLog;
 import com.dayu.pipirrapp.utils.ToastUtil;
 import com.jeremyliao.liveeventbus.LiveEventBus;
@@ -41,6 +42,7 @@
  * 澶囨敞锛�
  */
 public class MyLocationService extends Service {
+
 
     private LocationManager locationManager;
     private MyLocationListener listener;
@@ -66,7 +68,9 @@
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         MyLog.i("onStartCommand()");
-        isSingle = intent.getBooleanExtra("isSingle", false);
+        if (intent != null) {
+            isSingle = intent.getBooleanExtra("isSingle", false);
+        }
         if (!isSingle) {
             // 鍦ˋPI11涔嬪悗鏋勫缓Notification鐨勬柟寮�
             Notification.Builder builder = new Notification.Builder
@@ -117,8 +121,8 @@
         PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE);
 
         Notification notification = new NotificationCompat.Builder(this, "location_channel")
-                .setContentTitle("瀹氫綅鏈嶅姟")
-                .setContentText("瀹氫綅鏈嶅姟姝e湪鍚庡彴杩愯")
+                .setContentTitle("宸℃瀹氫綅")
+                .setContentText("宸℃瀹氫綅鏈嶅姟姝e湪鍚庡彴杩愯")
                 .setSmallIcon(R.mipmap.ic_launcher)
                 .setContentIntent(pendingIntent)
                 .build();
@@ -158,7 +162,7 @@
                 MyLog.i("鍘熺敓瀹氫綅娌℃湁鏉冮檺>>>>");
                 return;
             }
-            locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER , 1000, 0, listener);
+            locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 1000, 0, listener);
         } catch (Exception e) {
             CrashReport.postCatchedException(e);
         }
@@ -218,13 +222,13 @@
 
             String longitude = "Longitude:" + location.getLongitude();
             String latitude = "Latitude:" + location.getLatitude();
-            MyLog.i("鍘熺敓瀹氫綅onLocationChanged:  Latitude锛�" + latitude + "  Longitude锛�" + longitude);
+            MyLog.d("鍘熺敓瀹氫綅onLocationChanged:  Latitude锛�" + latitude + "  Longitude锛�" + longitude);
             postPosition(location.getLatitude(), location.getLongitude());
 //            鏄惁涓�娆℃�у畾浣�
             if (isSingle) {
                 stopSelf();  // 鑾峰彇鍒扮粡绾害浠ュ悗锛屽仠姝㈣service
             }
-            ToastUtil.showToast(MyLocationService.this, "鍘熺敓瀹氫綅onLocationChanged:  Latitude锛�" + latitude + "  Longitude锛�" + longitude);
+//            ToastUtil.showToast(MyLocationService.this, "鍘熺敓瀹氫綅onLocationChanged:  Latitude锛�" + latitude + "  Longitude锛�" + longitude);
         }
 
         // 鐘舵�佹敼鍙樻椂
@@ -286,13 +290,14 @@
         LatLonBean latLonBean = new LatLonBean();
         latLonBean.setLatitude(latitude);
         latLonBean.setLongitude(longitude);
-        LiveEventBus.get("location").post(latLonBean);
+        LiveEventBus.get(CommonKeyName.locationData).post(latLonBean);
     }
 
 
     @Override
     public void onDestroy() {
         MyLog.i("MyLocationService--onDestroy");
+
         // 鍋滄鍓嶅彴鏈嶅姟--鍙傛暟锛氳〃绀烘槸鍚︾Щ闄や箣鍓嶇殑閫氱煡
         stopForeground(true);
         // 鑾峰彇NotificationManager骞跺彇娑堥�氱煡锛岀‘淇濋�氱煡琚Щ闄�

--
Gitblit v1.8.0