From 26cca6a45416bbce3038685bf98b1305ba3ceb78 Mon Sep 17 00:00:00 2001
From: yezhiqiu <123456@qq.com>
Date: Thu, 10 Sep 2026 18:36:52 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E9=A6=96=E6=AC=A1=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=AE=BE=E5=A4=87=E5=AE=A0=E7=89=A9=E6=B2=A1=E7=BB=8F?=
 =?UTF-8?q?=E7=BA=AC=E5=BA=A6=E6=97=B6=EF=BC=8C=E7=94=A8=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E6=98=BE=E7=A4=BA=E5=9C=A8=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E4=B8=8A=202.=E5=90=AF=E7=94=A8=20R8=20=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=B2=BE=E7=AE=80=EF=BC=8F=E6=B7=B7=E6=B7=86=E5=8F=8A=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E8=A3=81=E5=89=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetSelector.xml            |  2 +-
 .../compile-file-map.properties               |  2 +-
 app/build.gradle                              | 11 ++++++----
 app/proguard-rules.pro                        | 10 +++++++++
 .../java/com/abbidot/tracker/MyApplication.kt |  2 ++
 .../tracker/ui/activity/SplashActivity.kt     | 21 +++++++++++-------
 .../tracker/ui/fragment/map/MapV3Fragment.kt  | 15 ++++++++++++-
 app/src/main/res/values-it/strings.xml        |  4 ++--
 .../abbidot/baselibrary/constant/MMKVKey.kt   |  2 ++
 .../interceptor/CommonRequestInterceptor.kt   |  5 ++++-
 .../com/abbidot/baselibrary/util/AppUtils.kt  | 22 +++++++++++++++++++
 build.gradle                                  |  2 +-
 gradle.properties                             |  3 ++-
 13 files changed, 81 insertions(+), 20 deletions(-)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 7113d41..0990919 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,7 +4,7 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2026-08-11T09:47:57.797377200Z">
+        <DropdownSelection timestamp="2026-09-10T09:58:20.491101800Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="PhysicalDevice" identifier="serial=3A251FDJH000CE" />
diff --git a/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
index 31b5784..5e7c409 100644
--- a/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
+++ b/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
@@ -1 +1 @@
-#Tue Sep 08 18:11:01 CST 2026
+#Thu Sep 10 18:18:21 CST 2026
diff --git a/app/build.gradle b/app/build.gradle
index 338729a..ca469b7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,8 +29,8 @@ android {
         minSdkVersion 24
         targetSdkVersion 35
         versionCode 2501
-        versionName "2.5.1"
-//        versionName "2.5.1-Beta1"
+//        versionName "2.5.1"
+        versionName "2.5.1-Beta1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -97,6 +97,9 @@ android {
             storePassword keyKeyStorePassword
             keyAlias keyKeyAlias
             keyPassword keyKeyAliasPassword
+            enableV1Signing = true
+            enableV2Signing = true
+            enableV3Signing = true // 推荐开启v3签名，Android 9+支持，防重打包更好
         }
         debug {
             storeFile keyKeyStoreFile
@@ -302,8 +305,8 @@ dependencies {
 //    https://docs.jiguang.cn/jpush/client/Android/android_guide
 //    implementation 'cn.jiguang.sdk:jcore:3.1.2'  // 此处以JCore 2.7.2 版本为例。
 //    implementation 'cn.jiguang.sdk:jpush:4.6.0'  // 此处以JPush 4.0.0 版本为例
-    implementation 'cn.jiguang.sdk:jcore-google:5.3.7'  // 此处以JCore 2.7.2 版本为例。
-    implementation 'cn.jiguang.sdk:jpush-google:6.0.7'  // 此处以JPush 4.0.0 版本为例
+    implementation 'cn.jiguang.sdk:jcore-google:5.5.2'  // 此处以JCore 2.7.2 版本为例。
+    implementation 'cn.jiguang.sdk:jpush-google:6.2.1'  // 此处以JPush 4.0.0 版本为例
     // 接入华为厂商
 //    implementation 'com.huawei.hms:push:6.1.0.300'
 //    implementation 'cn.jiguang.sdk.plugin:huawei:4.0.0'// 极光厂商插件版本与接入 JPush 版本保持一致，下同
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 1e5a97d..5cf0bbd 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -140,6 +140,16 @@
 -keepnames class com.google.gson.internal.** { *; }
 -keep class com.google.gson.internal.LinkedTreeMap { *; }
 
+# GMS & Firebase 基础保留规则
+-keep class com.google.android.gms.** { *; }
+-dontwarn com.google.android.gms.**
+-keep class com.google.firebase.** { *; }
+-dontwarn com.google.firebase.**
+
+# 保留注解，R8 full mode容易丢失
+-keepattributes Signature,RuntimeVisibleAnnotations,InnerClasses,EnclosingMethod
+
+
 # ==============================
 # 项目实体类/数据类 —— 这是核心，开启混淆后必崩的关键！！
 # ==============================
diff --git a/app/src/main/java/com/abbidot/tracker/MyApplication.kt b/app/src/main/java/com/abbidot/tracker/MyApplication.kt
index a19f5ad..29f9ddc 100644
--- a/app/src/main/java/com/abbidot/tracker/MyApplication.kt
+++ b/app/src/main/java/com/abbidot/tracker/MyApplication.kt
@@ -48,6 +48,8 @@ class MyApplication : Application() {
             Toaster.init(this)
             Toaster.setView(R.layout.toast_my_layout)
 
+            AppUtils.saveUniqueId(this)
+
             initLocationServer()
 
 //            JPushInterface.setDebugMode(true)
diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/SplashActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/SplashActivity.kt
index 8506464..6a2f32e 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/activity/SplashActivity.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/activity/SplashActivity.kt
@@ -22,6 +22,7 @@ import com.abbidot.baselibrary.util.AppUtils
 import com.abbidot.baselibrary.util.LogUtil
 import com.abbidot.baselibrary.util.MMKVUtil
 import com.abbidot.baselibrary.util.Utils
+import com.abbidot.baselibrary.util.rsa.Base64
 import com.abbidot.tracker.R
 import com.abbidot.tracker.constant.KeyNames
 import com.abbidot.tracker.databinding.ActivitySplashBinding
@@ -38,6 +39,7 @@ import com.hjq.toast.Toaster
 import com.qmuiteam.qmui.arch.QMUIActivity
 import com.stripe.android.PaymentConfiguration
 import com.tencent.mm.opensdk.openapi.IWXAPI
+import java.nio.charset.StandardCharsets
 import java.util.Calendar
 
 
@@ -79,16 +81,20 @@ class SplashActivity : QMUIActivity() {
         // 清除所有通知,角标数字
         notificationManager.cancelAll()
 
-        Utils.SECRET_KEY = Util.getMetadata(applicationContext, KeyNames.HTTP_REQUEST_KEY)
+        val encodedAppSecret = Util.getMetadata(applicationContext, KeyNames.HTTP_REQUEST_KEY)
+        val sb = StringBuilder(encodedAppSecret)
+        sb.deleteCharAt(5)
+        sb.deleteCharAt(9)
+        val encodedAppSecretSB = sb.toString()
+        val decodedBytes = Base64.decode2(encodedAppSecretSB)
+        val appSecret = String(decodedBytes, StandardCharsets.UTF_8)
+        Utils.SECRET_KEY = appSecret
         Utils.CARD_RSA_KEY = Util.getMetadata(applicationContext, KeyNames.CARD_RSA_KEY)
         INetworkService.apply {
             //国内外服务器切换域名
             BASE_URL = if (AppUtils.isDebug()) BASE_URL_TEST
-            else if (AppUtils.isChina())
-                BASE_URL_CN
-            else
-                BASE_URL_ABROAD
-
+            else if (AppUtils.isChina()) BASE_URL_CN
+            else BASE_URL_ABROAD
         }
 
         SRBleUtil.instance.init(application)
@@ -144,8 +150,7 @@ class SplashActivity : QMUIActivity() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
             overrideActivityTransition(OVERRIDE_TRANSITION_CLOSE, enter, exit)
         } else {
-            @Suppress("DEPRECATION")
-            overridePendingTransition(enter, exit)
+            @Suppress("DEPRECATION") overridePendingTransition(enter, exit)
         }
     }
 
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 a67bc31..3a5a961 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
@@ -780,10 +780,23 @@ class MapV3Fragment : BaseFragment<FragmentMapV3Binding>(FragmentMapV3Binding::i
             if (latitude == 0.0 && longitude == 0.0) {
                 if (!mCountDownTimerViewModel.isStartCountDown) {
                     mHomeMapCommon.clearMarker()
-                    isMoveCamera = true
+//                    isMoveCamera = true
                     mCountDownTimerViewModel.startCountDown(30)
                     mViewBinding.llHomeMapTopPet.homeDataPetNameSmall.setText(R.string.txt_locating)
                     mViewBinding.ilHomeMapPetLocation.root.visibility = View.INVISIBLE
+
+                    //宠物经纬度为0就用手机定位
+                    val userGpsLat = MMKVUtil.getDouble(MMKVKey.UserGpsLat)
+                    val userGpsLon = MMKVUtil.getDouble(MMKVKey.UserGpsLon)
+                    if (userGpsLat == 0.0 && userGpsLon == 0.0) {
+                        val isOutOfChina =
+                            LonAndLatUtil.isLocationOutOfChina(userGpsLat, userGpsLon)
+                        MMKVUtil.putBoolean(MMKVKey.isGpsToGCJ02, !isOutOfChina)
+                        mHomeMapCommon.refreshPetCurrentLocation(
+                            userGpsLat, userGpsLon, isMoveCamera
+                        )
+                        isMoveCamera = false
+                    }
                 }
                 mHomeMapCommon.switchShowLocation(ConstantInt.UserLocationType)
             } else {
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 17f409a..a23da32 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -36,7 +36,7 @@
     <string name="txt_change_email_tip">Invierà il codice di verifica a %s.</string>
     <string name="txt_upgrade_unlock">Passa a Prime per sbloccare\nFunzionalità esclusive!</string>
     <string name="txt_new_firmware_version">Rilevata nuova versione firmware: %s</string>
-    <string name="txt_invites_you_check">"%@" ti invita a effettuare il check-in su "%@"</string>
+    <string name="txt_invites_you_check">"%s" ti invita a effettuare il check-in su "%s"</string>
     <string name="txt_subscription_expired">Il tuo abbonamento è scaduto,\ntipreghiamo di ricaricarlo</string>
     <string name="txt_fences_set">Set recinzioni %s</string>
     <string name="txt_is_nearby">%s è nelle vicinanze</string>
@@ -420,7 +420,7 @@
     <string name="txt_about_live">Informazioni su Live</string>
     <string name="txt_about_live_tip">Il Live Tracking si interromperà tra un\'ora, ma puoi interromperlo prima per risparmiare batteria.</string>
     <string name="txt_resting">Riposando</string>
-    <string name="txt_resting_time">TEMPO DI RIPOSO</string>
+    <string name="txt_resting_time">Tempo di riposo</string>
     <string name="txt_no_signal">Nessun segnale</string>
     <string name="txt_wifi">WiFi</string>
     <string name="txt_set_measurement_units">Seleziona unità di misura</string>
diff --git a/baselibrary/src/main/java/com/abbidot/baselibrary/constant/MMKVKey.kt b/baselibrary/src/main/java/com/abbidot/baselibrary/constant/MMKVKey.kt
index 07a82ef..8d45e73 100644
--- a/baselibrary/src/main/java/com/abbidot/baselibrary/constant/MMKVKey.kt
+++ b/baselibrary/src/main/java/com/abbidot/baselibrary/constant/MMKVKey.kt
@@ -45,6 +45,7 @@ import androidx.annotation.StringDef
     MMKVKey.UserGpsLon,
     MMKVKey.UserGpsSpeed,
     MMKVKey.isFirstCheckBleOpen,
+    MMKVKey.UUID,
     MMKVKey.Shared
 )
 @Retention(AnnotationRetention.SOURCE)
@@ -87,6 +88,7 @@ annotation class MMKVKey {
 
         //只使用谷歌地图
         const val OnlyGoogleMap = "onlyGoogleMap"
+        const val UUID = "uuid"
 
         //是否gps坐标转换火星坐标
         const val isGpsToGCJ02 = "gpsToGCJ02"
diff --git a/baselibrary/src/main/java/com/abbidot/baselibrary/network/interceptor/CommonRequestInterceptor.kt b/baselibrary/src/main/java/com/abbidot/baselibrary/network/interceptor/CommonRequestInterceptor.kt
index 762e3a3..ef0538d 100644
--- a/baselibrary/src/main/java/com/abbidot/baselibrary/network/interceptor/CommonRequestInterceptor.kt
+++ b/baselibrary/src/main/java/com/abbidot/baselibrary/network/interceptor/CommonRequestInterceptor.kt
@@ -75,7 +75,9 @@ class CommonRequestInterceptor : Interceptor {
             }
         }
 
-        val sign = if (paramList.size > 0) {
+        val uuid = MMKVUtil.getString(MMKVKey.UUID)
+        paramList.add("uuid$uuid")
+        val sign = if (paramList.isNotEmpty()) {
             //按key的字母排序
             paramList.sort()
             Utils.get32Md5Value(Utils.SECRET_KEY + paramList.joinToString(""))
@@ -85,6 +87,7 @@ class CommonRequestInterceptor : Interceptor {
 
         val token = MMKVUtil.getString(MMKVKey.Token)
         builder.addHeader("token", token)
+        builder.addHeader("uuid", uuid)
         builder.addHeader("sign", sign)
 
         return chain.proceed(builder.build())
diff --git a/baselibrary/src/main/java/com/abbidot/baselibrary/util/AppUtils.kt b/baselibrary/src/main/java/com/abbidot/baselibrary/util/AppUtils.kt
index 4ce5581..c7d6399 100644
--- a/baselibrary/src/main/java/com/abbidot/baselibrary/util/AppUtils.kt
+++ b/baselibrary/src/main/java/com/abbidot/baselibrary/util/AppUtils.kt
@@ -1,12 +1,16 @@
 package com.abbidot.baselibrary.util
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.content.res.Resources
+import android.provider.Settings
+import android.text.TextUtils
 import com.abbidot.baselibrary.constant.MMKVKey
 import java.util.Locale
+import java.util.UUID
 
 
 /**
@@ -106,6 +110,24 @@ class AppUtils {
             return lang.contains("CN") || lang.contains("ZH")
         }
 
+        /**
+         * 保存唯一标识到本地
+         */
+        @SuppressLint("HardwareIds")
+        fun saveUniqueId(context: Context) {
+            var uuid = MMKVUtil.getString(MMKVKey.UUID)
+            if (TextUtils.isEmpty(uuid)) {
+                val androidId =
+                    Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID)
+                        ?: ""
+                uuid = if (TextUtils.isEmpty(androidId))
+                    UUID.randomUUID().toString()
+                else
+                    androidId
+                MMKVUtil.putString(MMKVKey.UUID, uuid)
+            }
+        }
+
         /**
          * 获取系统国家地区
          */
diff --git a/build.gradle b/build.gradle
index 8010dcd..cbb0ec0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
 //        maven { url "https://maven.google.com" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.11.1'
+        classpath 'com.android.tools.build:gradle:8.12.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.4.4'
 //        classpath 'com.google.dagger:hilt-android-gradle-plugin:2.46.1'
diff --git a/gradle.properties b/gradle.properties
index 392d46f..f048349 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,7 +14,7 @@
 BAIDU_MAP_KEY=YT2CmlqAkpMyzmw1AKNIBlYlBtHESEaW
 BUGLY_KEY=06fc0a9cd1
 GOOGLE_MAP_KEY=AIzaSyCFEqlOoo2274NsX7tzoQjs_DA7B9N7-gY
-HTTP_REQUEST_KEY=8989JUIMSKHKehmasdfWEkjhf\!*jfsadf8453
+HTTP_REQUEST_KEY=ODk4OPUpVSSU1TS0hLZWhtYXNkZldFa2poZiEqamZzYWRmODQ1Mw==
 MAPBOX_ACCESS_TOKEN=pk.eyJ1Ijoic2hhbnJlbnRlY2giLCJhIjoiY2t5bzNnNm41MWQyZzJubjd4NzN6MXJnMyJ9.NPjPb__sEUug9PK4L0hlSA
 MAPBOX_DOWNLOADS_TOKEN=sk.eyJ1Ijoic2hhbnJlbnRlY2giLCJhIjoiY2t5bndlZnNuMDdjajJvcjBzOTcxcnVvbiJ9.VR_gh0uqZNVyUN92aACCiQ
 STRIPE_RELEASE_KEY=pk_live_51N0gBGCUI9XSagUNNDNWc77OdwDWXVSGIdf8WHjvGfe5plUOfs7eq7uyTEQ3ma1xXHlavwInuw9WZOJQ6Z9FVjLq00VsFpc1Rv
@@ -26,6 +26,7 @@ android.nonTransitiveRClass=false
 android.suppressUnsupportedCompileSdk=34
 android.useAndroidX=true
 kotlin.code.style=official
+android.r8.optimizedResourceShrinking=true
 # 修复 R8 混淆阶段的 Java heap space OOM（AGP 8.x + 多模块 consumer-rules 合并 至少需要 8GB）
 # - Gradle Daemon: -Xmx8g（之前 2g 严重不足）
 # - Metaspace: 2048m（之前 1g 容易在规则解析/注解处理时触顶 Metaspace OOM）