From c0ab984a83936b55a36a4fbaf73983f74f1b53ee Mon Sep 17 00:00:00 2001
From: yezhiqiu <983577727@qq.com>
Date: Fri, 29 May 2026 11:13:58 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0wifi=20zo?=
 =?UTF-8?q?ne=E6=8F=90=E7=A4=BA=E9=A1=B5=EF=BC=8C=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E9=9D=A0=E8=BF=91=E8=AE=BE=E5=A4=87=E7=9A=84=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=EF=BC=8C=E6=9C=89=E6=97=B6=E4=BC=9A=E5=BC=B9=E5=87=BA=E4=BA=86?=
 =?UTF-8?q?=E4=B8=A4=E6=AC=A1bug=202.=E9=99=90=E5=88=B6=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=90=8D=E7=A9=BA=E6=A0=BC=E5=92=8C14=E4=B8=AA=E5=AD=97?=
 =?UTF-8?q?=E6=AF=8D=EF=BC=8C7=E4=B8=AA=E4=B8=AD=E6=96=87=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=203.=E9=99=90=E5=88=B6=E5=9B=B4=E6=A0=8F=E5=90=8D?=
 =?UTF-8?q?=E5=92=8Cwifi=E5=90=8D=E7=A9=BA=E6=A0=BC=E5=92=8C14=E4=B8=AA?=
 =?UTF-8?q?=E5=AD=97=E6=AF=8D=EF=BC=8C7=E4=B8=AA=E4=B8=AD=E6=96=87?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetSelector.xml             |  4 ++--
 .../tracker/ui/activity/HomeV2Activity.kt      |  7 ++++++-
 .../ui/activity/account/ChangeNameActivity.kt  | 18 ++++++++++++++----
 .../fences/AddAndEditFencesZoneBaseActivity.kt | 10 ++++++++++
 .../device/wifi/EditWifiPowerZoneActivity.kt   | 12 ++++++++++++
 .../map/googlemap/BaseGoogleMapFragment.kt     |  4 ++--
 .../main/java/com/abbidot/tracker/util/Util.kt |  4 ++--
 .../java/com/abbidot/tracker/util/ViewUtil.kt  | 13 ++++++++++---
 .../tracker/util/bluetooth/SRBleUtil.kt        |  2 +-
 .../abbidot/baselibrary/constant/ConState.kt   |  4 ++++
 10 files changed, 63 insertions(+), 15 deletions(-)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 704abaf..e47da53 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2026-04-20T07:03:55.586316Z">
+        <DropdownSelection timestamp="2026-05-28T06:43:50.390331300Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=R5CT80BHT3Y" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=GBG5T19625003301" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/HomeV2Activity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/HomeV2Activity.kt
index e5e2c90..7713fba 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/activity/HomeV2Activity.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/activity/HomeV2Activity.kt
@@ -330,7 +330,12 @@ class HomeV2Activity : BaseActivity<ActivityHomeV2Binding>(ActivityHomeV2Binding
         }
         //刷新下邀请家人数据
         XEventBus.observe(this, EventName.RefreshHomeList) {
-            mDataViewModel.getHomeBindPetList(this)
+            getPet(false)?.let {
+                //套餐没有过期
+                if (it.availableOrder == ConstantInt.Type1) {
+                    mDataViewModel.getHomeBindPetList(this)
+                }
+            }
         }
         //删除宠物
         XEventBus.observe(this, EventName.DeletePet) {
diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/account/ChangeNameActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/account/ChangeNameActivity.kt
index db16d15..1205acf 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/activity/account/ChangeNameActivity.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/activity/account/ChangeNameActivity.kt
@@ -3,6 +3,7 @@ package com.abbidot.tracker.ui.activity.account
 import android.text.TextUtils
 import android.view.View
 import androidx.activity.viewModels
+import androidx.core.widget.doAfterTextChanged
 import com.abbidot.baselibrary.constant.EventName
 import com.abbidot.baselibrary.constant.MMKVKey
 import com.abbidot.baselibrary.eventbus.XEventBus
@@ -11,6 +12,7 @@ import com.abbidot.tracker.R
 import com.abbidot.tracker.base.BaseActivity
 import com.abbidot.tracker.constant.GetResultCallback
 import com.abbidot.tracker.databinding.ActivityChangeNameBinding
+import com.abbidot.tracker.util.Util.Companion.limitLetterChinese
 import com.abbidot.tracker.util.ViewUtil
 import com.abbidot.tracker.vm.UserProfileViewModel
 
@@ -27,12 +29,20 @@ class ChangeNameActivity :
 
         val username = MMKVUtil.getString(MMKVKey.UserName)
         mViewBinding.apply {
-            ilChangeNameNameLayout.let {
-                it.etInputContent.setText(username)
-                it.tvInputNameTitle.text = getString(R.string.register_txt_name)
+            ilChangeNameNameLayout.let { edit ->
+                edit.etInputContent.setText(username)
+                edit.tvInputNameTitle.text = getString(R.string.register_txt_name)
                 ViewUtil.instance.setInputViewErrorHideClick(
-                    mContext, it.rlEtInputLayout, tvChangeNameNameErrorTip, it.etInputContent
+                    mContext, edit.rlEtInputLayout, tvChangeNameNameErrorTip, edit.etInputContent
                 )
+                edit.etInputContent.doAfterTextChanged {
+                    it?.let { s ->
+                        val text = s.toString().limitLetterChinese(14)
+                        if (text != s.toString()) {
+                            s.replace(0, s.length, text)
+                        }
+                    }
+                }
             }
 
             setOnClickListenerViews(btnChangeNameSave)
diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/device/fences/AddAndEditFencesZoneBaseActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/device/fences/AddAndEditFencesZoneBaseActivity.kt
index 2c82939..fe34ca9 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/activity/device/fences/AddAndEditFencesZoneBaseActivity.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/activity/device/fences/AddAndEditFencesZoneBaseActivity.kt
@@ -7,6 +7,7 @@ import android.view.MotionEvent
 import android.view.View
 import androidx.activity.viewModels
 import androidx.core.view.isVisible
+import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.commit
 import com.abbidot.baselibrary.constant.EventName
@@ -31,6 +32,7 @@ import com.abbidot.tracker.constant.GetResultCallback
 import com.abbidot.tracker.databinding.ActivityAddEditFencesZoneBinding
 import com.abbidot.tracker.ui.common.map.FencesAddEditMapCommon
 import com.abbidot.tracker.util.Util
+import com.abbidot.tracker.util.Util.Companion.limitLetterChinese
 import com.abbidot.tracker.util.ViewUtil
 import com.abbidot.tracker.util.bluetooth.SRBleCmdUtil
 import com.abbidot.tracker.util.bluetooth.SRBleUtil
@@ -113,6 +115,14 @@ open class AddAndEditFencesZoneBaseActivity :
                 ivFencesZoneRefreshBtn, mShowCenterLocationType
             )
             ilFencesZoneNameInput.tvInputNameTitle.text = getString(R.string.txt_fence_name)
+            ilFencesZoneNameInput.etInputContent.doAfterTextChanged {
+                it?.let { s ->
+                    val text = s.toString().limitLetterChinese(16)
+                    if (text != s.toString()) {
+                        s.replace(0, s.length, text)
+                    }
+                }
+            }
             fencesZoneCircleView.setOnCircleViewScaleClickListener(this@AddAndEditFencesZoneBaseActivity)
             fencesZoneRectView.setOnRectViewRotateScaleClickListener(this@AddAndEditFencesZoneBaseActivity)
             fencesZonePolygonView.setOnPolygonViewPointPullClickListener(this@AddAndEditFencesZoneBaseActivity)
diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/device/wifi/EditWifiPowerZoneActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/device/wifi/EditWifiPowerZoneActivity.kt
index bc3ef53..fd34fa0 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/activity/device/wifi/EditWifiPowerZoneActivity.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/activity/device/wifi/EditWifiPowerZoneActivity.kt
@@ -7,6 +7,7 @@ import android.view.Gravity
 import android.view.View
 import androidx.activity.viewModels
 import androidx.core.content.ContextCompat
+import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.commit
 import com.abbidot.baselibrary.constant.ConState
@@ -33,6 +34,7 @@ import com.abbidot.tracker.databinding.ActivityEditPowerZoneBinding
 import com.abbidot.tracker.ui.activity.HomeV2Activity
 import com.abbidot.tracker.ui.common.map.EditWifiZoneMapCommon
 import com.abbidot.tracker.util.Util
+import com.abbidot.tracker.util.Util.Companion.limitLetterChinese
 import com.abbidot.tracker.util.ViewUtil
 import com.abbidot.tracker.util.bluetooth.SRBleCmdUtil
 import com.abbidot.tracker.util.bluetooth.SRBleUtil
@@ -96,6 +98,14 @@ class EditWifiPowerZoneActivity :
 
         mViewBinding.apply {
             ilWifiNameInputLayout.tvInputNameTitle.text = getString(R.string.txt_zone_name)
+            ilWifiNameInputLayout.etInputContent.doAfterTextChanged {
+                it?.let { s ->
+                    val text = s.toString().limitLetterChinese(16)
+                    if (text != s.toString()) {
+                        s.replace(0, s.length, text)
+                    }
+                }
+            }
 //            ViewUtil.instance.setMapSwitchLocationButtonImage(
 //                ivEditWifiZoneRefreshBtn, mShowCenterLocationType
 //            )
@@ -205,6 +215,7 @@ class EditWifiPowerZoneActivity :
                         XEventBus.post(EventName.RefreshWiFiZone)
                         showToast(R.string.txt_change_successful, true, gravity = Gravity.CENTER)
                     }
+
                     override fun onRequestError(exceptionCode: String?) {
                         super.onRequestError(exceptionCode)
                         isBlockedClick = false
@@ -218,6 +229,7 @@ class EditWifiPowerZoneActivity :
                         XEventBus.post(EventName.DeleteWiFiZone)
                         showToast(R.string.txt_delete_success, true, gravity = Gravity.CENTER)
                     }
+
                     override fun onRequestError(exceptionCode: String?) {
                         super.onRequestError(exceptionCode)
                         isBlockedClick = false
diff --git a/app/src/main/java/com/abbidot/tracker/ui/fragment/map/googlemap/BaseGoogleMapFragment.kt b/app/src/main/java/com/abbidot/tracker/ui/fragment/map/googlemap/BaseGoogleMapFragment.kt
index 86c94e7..e581283 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/fragment/map/googlemap/BaseGoogleMapFragment.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/fragment/map/googlemap/BaseGoogleMapFragment.kt
@@ -845,14 +845,14 @@ abstract class BaseGoogleMapFragment :
             // 1. 降噪
             val filterPoints = filterNoisePoint(newLatLngList)
             // 2. RDP平滑抽稀
-            val smoothPoints = rdpSmooth(filterPoints, epsilon = 1.0)
+            val smoothPoints = rdpSmooth(filterPoints, epsilon = 0.5)
             // 3. 插值加密线条
             val finalPoints = latLngInterpolate(smoothPoints, step = 2)
 
             //先黄黑线
             getPolylineOptions(8f, R.color.line_stroke_color).let {
                 it.geodesic(true)
-                it.addAll(newLatLngList)
+                it.addAll(finalPoints)
                 googleMap.addPolyline(it).apply {
                     startCap = RoundCap()
                     endCap = RoundCap()
diff --git a/app/src/main/java/com/abbidot/tracker/util/Util.kt b/app/src/main/java/com/abbidot/tracker/util/Util.kt
index 02a7c7a..80812b9 100644
--- a/app/src/main/java/com/abbidot/tracker/util/Util.kt
+++ b/app/src/main/java/com/abbidot/tracker/util/Util.kt
@@ -873,8 +873,8 @@ class Util {
 
 
         /**
-         * 限制16个字母或8个中文,限制空格输入
-         * 截断到最大16单位
+         * 限制limitLetterLength个字母或limitLetterLength/2个中文,限制空格输入
+         * 截断到最大limitLetterLength单位
          * @param limitLetterLength 限制字母的个数
          */
         fun String.limitLetterChinese(limitLetterLength: Int): String {
diff --git a/app/src/main/java/com/abbidot/tracker/util/ViewUtil.kt b/app/src/main/java/com/abbidot/tracker/util/ViewUtil.kt
index 95f4e46..86417de 100644
--- a/app/src/main/java/com/abbidot/tracker/util/ViewUtil.kt
+++ b/app/src/main/java/com/abbidot/tracker/util/ViewUtil.kt
@@ -387,7 +387,7 @@ class ViewUtil private constructor() {
     ) {
         viewGroup.apply {
             editText.addTextChangedListener {
-                if (errorView.visibility == View.VISIBLE) {
+                if (errorView.isVisible) {
                     background = ContextCompat.getDrawable(
                         context, R.drawable.shape8_gray_border_white_bg
                     )
@@ -658,7 +658,10 @@ class ViewUtil private constructor() {
                     super.onError(request, throwable)
                     LogUtil.e("${fileName}:imageLoadUrl onError:${throwable.message}")
                     file?.let {
-                        if (it.exists()) it.delete()
+                        if (it.exists()) {
+                            it.delete()
+                            imageLoadUrl(context, imageView, url, errorImageResId)
+                        }
                     }
                 }
 
@@ -948,7 +951,11 @@ class ViewUtil private constructor() {
             })
         }
         return SelectMapTypeDialog(
-            context, mapTypeAdapter, fenceCheckedListener, dashedCheckedListener,showAllPetCheckedListener
+            context,
+            mapTypeAdapter,
+            fenceCheckedListener,
+            dashedCheckedListener,
+            showAllPetCheckedListener
         )
     }
 
diff --git a/app/src/main/java/com/abbidot/tracker/util/bluetooth/SRBleUtil.kt b/app/src/main/java/com/abbidot/tracker/util/bluetooth/SRBleUtil.kt
index b061715..e42def1 100644
--- a/app/src/main/java/com/abbidot/tracker/util/bluetooth/SRBleUtil.kt
+++ b/app/src/main/java/com/abbidot/tracker/util/bluetooth/SRBleUtil.kt
@@ -504,7 +504,7 @@ class SRBleUtil private constructor() {
         if (BleManager.getInstance().scanSate == BleScanState.STATE_SCANNING) {
             isScanInterrupt = true
             XEventBus.post(
-                EventName.ActionConDeviceState, ConState.DEVICE_NOT_FOUND
+                EventName.ActionConDeviceState, ConState.CANCEL_SCAN_DEVICE
             )
             if (TextUtils.isEmpty(log)) LogUtil.e("正在扫描设备,取消蓝牙扫描")
             else LogUtil.e(log)
diff --git a/baselibrary/src/main/java/com/abbidot/baselibrary/constant/ConState.kt b/baselibrary/src/main/java/com/abbidot/baselibrary/constant/ConState.kt
index 5880a2a..b2d4cf1 100644
--- a/baselibrary/src/main/java/com/abbidot/baselibrary/constant/ConState.kt
+++ b/baselibrary/src/main/java/com/abbidot/baselibrary/constant/ConState.kt
@@ -15,6 +15,7 @@ import androidx.annotation.IntDef
     ConState.CONNECTION_FAIL,
     ConState.BLUETOOTH_ON,
     ConState.BLUETOOTH_OFF,
+    ConState.CANCEL_SCAN_DEVICE,
     ConState.DEVICE_NOT_FOUND
 )
 @Retention(AnnotationRetention.SOURCE)
@@ -35,6 +36,9 @@ annotation class ConState {
         //没有找到设备
         const val DEVICE_NOT_FOUND = 4
 
+        //取消扫描蓝牙设备
+        const val CANCEL_SCAN_DEVICE = 8
+
         //未连接,连接失败
         const val CONNECTION_FAIL = 5