From 09acfc1564b28fa4d25b580eb4e7c2938d8843e8 Mon Sep 17 00:00:00 2001
From: yezhiqiu <123456@qq.com>
Date: Fri, 9 Oct 2026 16:27:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0g40=E8=93=9D=E7=89=99?=
 =?UTF-8?q?=E4=B8=80=E9=94=AE=E5=AE=9A=E4=BD=8D=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tracker/ui/fragment/map/MapV3Fragment.kt  | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/abbidot/tracker/ui/fragment/map/MapV3Fragment.kt b/app/src/main/java/com/abbidot/tracker/ui/fragment/map/MapV3Fragment.kt
index 32629d2..babef40 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/fragment/map/MapV3Fragment.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/fragment/map/MapV3Fragment.kt
@@ -421,11 +421,21 @@ class MapV3Fragment : BaseFragment<FragmentMapV3Binding>(FragmentMapV3Binding::i
         if (null != data && data.isNotEmpty()) {
             val data0 = SRBleCmdUtil.instance.byteToInt(data[0])
             val data1 = SRBleCmdUtil.instance.byteToInt(data[1])
-//            val data2 = SRBleCmdUtil.instance.byteToInt(data[2])
+            val data2 = SRBleCmdUtil.instance.byteToInt(data[2])
             if (data0 == 0x2C && data1 == 1) {
-                stopRefreshLocation()
                 getHomeV2Activity()?.getPet(false)?.let {
-                    mMapViewModel.getMapDeviceStatus(it.deviceId, false)
+                    //g40
+                    if (it.deviceType == ConstantInt.Type2) {
+                        if (data2 == 0x00) {
+                            mMapViewModel.setupRefreshLocation(it.deviceId)
+                        } else {
+                            stopRefreshLocation()
+                            mMapViewModel.getMapDeviceStatus(it.deviceId, false)
+                        }
+                    } else {
+                        stopRefreshLocation()
+                        mMapViewModel.getMapDeviceStatus(it.deviceId, false)
+                    }
                 }
             }
         }
@@ -1087,10 +1097,10 @@ class MapV3Fragment : BaseFragment<FragmentMapV3Binding>(FragmentMapV3Binding::i
                     showToast(R.string.txt_locate_works, gravity = Gravity.CENTER)
                 } else if (SRBleUtil.instance.isMacConnect(pet.macID)) {
                     //g40
-                    if (pet.deviceType == ConstantInt.Type2) {
-                        showToast(R.string.txt_pet_close, gravity = Gravity.CENTER)
-                        return
-                    }
+//                    if (pet.deviceType == ConstantInt.Type2) {
+//                        showToast(R.string.txt_pet_close, gravity = Gravity.CENTER)
+//                        return
+//                    }
                     val userGpsLat = MMKVUtil.getDouble(MMKVKey.UserGpsLat)
                     val userGpsLon = MMKVUtil.getDouble(MMKVKey.UserGpsLon)
                     if (userGpsLat == 0.0 && userGpsLon == 0.0) {