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::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::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) {