From 6e4913720d8b176d39a3eae85e98bb60ceaccfd8 Mon Sep 17 00:00:00 2001
From: yezhiqiu <123456@qq.com>
Date: Fri, 9 Oct 2026 18:16:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=80=E9=94=AE=E5=AE=9A?=
 =?UTF-8?q?=E4=BD=8D=E6=8C=89=E9=92=AE=E8=B7=9F=E9=9A=8F=E7=9B=B4=E6=92=AD?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=B8=80=E8=B5=B7=E9=9A=90=E8=97=8F=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                       |  2 +-
 .../abbidot/tracker/ui/fragment/map/MapV3Fragment.kt   | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 685fb0e..787e0aa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,7 +30,7 @@ android {
         targetSdkVersion 35
         versionCode 2601
 //        versionName "2.6.1"
-        versionName "2.6.1-Beta1"
+        versionName "2.6.1-Beta2"
 4
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
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 babef40..63aa215 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
@@ -954,6 +954,10 @@ class MapV3Fragment : BaseFragment<FragmentMapV3Binding>(FragmentMapV3Binding::i
                         View.VISIBLE
                     }
                 }
+            //直播状态下隐藏刷新位置按钮
+            mViewBinding.ivHomeMapRefreshLocation.visibility =
+                if (liveFlag == ConstantInt.Type1) View.INVISIBLE
+                else View.VISIBLE
             //把最新经纬度更新到获取绑定宠物接口上，切换宠物数据不会有老的数据
             getHomeV2Activity()?.let { m ->
                 m.getPet(false)?.let { p ->
@@ -1019,7 +1023,7 @@ class MapV3Fragment : BaseFragment<FragmentMapV3Binding>(FragmentMapV3Binding::i
                     if (!mLocationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
                         val intent = Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)
                         startActivity(intent)
-                    } else if (isRequestPetData && mPetList.size == 0) {
+                    } else if (isRequestPetData && mPetList.isEmpty()) {
                         showToast(R.string.no_bind_pet)
                     } else {
                         goLive(true)
@@ -1027,7 +1031,7 @@ class MapV3Fragment : BaseFragment<FragmentMapV3Binding>(FragmentMapV3Binding::i
                 } else if (type == 1) {
                     if (!SRBleUtil.instance.isBleEnable(mContext)) {
                         SRBleUtil.instance.openBluetooth(mContext)
-                    } else if (isRequestPetData && mPetList.size == 0) {
+                    } else if (isRequestPetData && mPetList.isEmpty()) {
                         showToast(R.string.no_bind_pet)
                     } else {
                         goLive(false)
@@ -1219,6 +1223,8 @@ class MapV3Fragment : BaseFragment<FragmentMapV3Binding>(FragmentMapV3Binding::i
                         return
                     }
 //                    locationPermissionsTip()
+                    v.visibility = View.GONE
+                    ivHomeMapRefreshLocation.visibility = View.INVISIBLE
                     goLive(true)
                 }