diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/device/AddPairedSuccessActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/device/AddPairedSuccessActivity.kt
index 2f0230f..fcc3eb5 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/activity/device/AddPairedSuccessActivity.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/activity/device/AddPairedSuccessActivity.kt
@@ -227,7 +227,6 @@ class AddPairedSuccessActivity :
             }
             //绑定默认宠物
             mPetRelationViewModel.mBindPetLiveData.observe(this@AddPairedSuccessActivity) {
-//                setButtonEnabled(mViewBinding.btnPairSuccessActivate, ConstantInt.Type1)
                 dealRequestResult(it, object : GetResultCallback {
                     override fun onResult(any: Any) {
                         XEventBus.post(EventName.RefreshPet)
@@ -247,10 +246,10 @@ class AddPairedSuccessActivity :
                         }, 1000)
                     }
 
-//                    override fun onRequestError(exceptionCode: String?) {
-//                        super.onRequestError(exceptionCode)
-//                        setButtonEnabled(mViewBinding.btnPairSuccessActivate, ConstantInt.Type1)
-//                    }
+                    override fun onRequestError(exceptionCode: String?) {
+                        super.onRequestError(exceptionCode)
+                        setButtonEnabled(mViewBinding.btnPairSuccessActivate, ConstantInt.Type1)
+                    }
                 })
             }
         }
diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/PaymentSuccessActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/PaymentSuccessActivity.kt
index 20d0aeb..dd833e4 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/PaymentSuccessActivity.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/PaymentSuccessActivity.kt
@@ -138,7 +138,6 @@ class PaymentSuccessActivity :
             if (TextUtils.isEmpty(mMac)) return@observe
             if (mMac == receiveData.mac) {
                 val data = receiveData.data
-//                    setButtonEnabled(mViewBinding.btnPaymentSuccessContinue, ConstantInt.Type1)
                 parseData(data)
             }
         }
@@ -162,6 +161,7 @@ class PaymentSuccessActivity :
                 override fun onRequestError(exceptionCode: String?) {
                     LogUtil.e("支付成功后，更新绑定状态------->请求宠物数据错误onRequestError，再次请求")
                     if (exceptionCode == mNetworkRequestsFailLimit) {
+                        setButtonEnabled(mViewBinding.btnPaymentSuccessContinue, ConstantInt.Type1)
                     } else {
                         mAddTrackerViewModel.updatePayDeviceState(
                             this@PaymentSuccessActivity, mPayResult!!.deviceId
@@ -193,6 +193,11 @@ class PaymentSuccessActivity :
                         }
                     }
                 }
+
+                override fun onRequestError(exceptionCode: String?) {
+                    super.onRequestError(exceptionCode)
+                    setButtonEnabled(mViewBinding.btnPaymentSuccessContinue, ConstantInt.Type1)
+                }
             })
         }
         //添加默认宠物
@@ -208,6 +213,11 @@ class PaymentSuccessActivity :
                         }
                     }
                 }
+
+                override fun onRequestError(exceptionCode: String?) {
+                    super.onRequestError(exceptionCode)
+                    setButtonEnabled(mViewBinding.btnPaymentSuccessContinue, ConstantInt.Type1)
+                }
             })
         }
         //绑定默认宠物
@@ -229,6 +239,11 @@ class PaymentSuccessActivity :
                         }
                     }, 1000)
                 }
+
+                override fun onRequestError(exceptionCode: String?) {
+                    super.onRequestError(exceptionCode)
+                    setButtonEnabled(mViewBinding.btnPaymentSuccessContinue, ConstantInt.Type1)
+                }
             })
         }
     }
diff --git a/app/src/main/java/com/abbidot/tracker/ui/fragment/map/baidumap/FencesAddEditBaiduMapFragment.kt b/app/src/main/java/com/abbidot/tracker/ui/fragment/map/baidumap/FencesAddEditBaiduMapFragment.kt
index e649de1..5fa3dff 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/fragment/map/baidumap/FencesAddEditBaiduMapFragment.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/fragment/map/baidumap/FencesAddEditBaiduMapFragment.kt
@@ -290,14 +290,14 @@ class FencesAddEditBaiduMapFragment : BaseBaiduMapFragment() {
                 stepLatLng.latitude,
                 stepLatLng.longitude
             )
-            //限制圆半径50m
-            val limitRadius = 100 / stepDistance * 50
-            //限制矩形边长100m
-            val limitSide = 100 / stepDistance * 100
+            //限制圆半径30m
+            val limitRadius = 100 / stepDistance * 30
+            //限制矩形边长60m
+            val limitSide = 100 / stepDistance * 60
             LogUtil.e("scaleLimitDistance,$stepDistance,$limitRadius,$limitSide,${mapStatus.zoom}")
             mFencesCircleView.mLimitRadius = limitRadius.toFloat()
             mFencesRectView.mLimitSide = limitSide.toFloat()
-            mFencesPolygonView.mLimitSide = limitSide.toFloat()
+//            mFencesPolygonView.mLimitSide = limitSide.toFloat()
         }
     }
 
diff --git a/app/src/main/java/com/abbidot/tracker/ui/fragment/map/googlemap/FencesAddEditGoogleMapFragment.kt b/app/src/main/java/com/abbidot/tracker/ui/fragment/map/googlemap/FencesAddEditGoogleMapFragment.kt
index 7a3e85f..359668d 100644
--- a/app/src/main/java/com/abbidot/tracker/ui/fragment/map/googlemap/FencesAddEditGoogleMapFragment.kt
+++ b/app/src/main/java/com/abbidot/tracker/ui/fragment/map/googlemap/FencesAddEditGoogleMapFragment.kt
@@ -192,14 +192,14 @@ class FencesAddEditGoogleMapFragment : BaseGoogleMapFragment() {
                 stepLatLng.latitude,
                 stepLatLng.longitude
             )
-            //限制圆半径50m
-            val limitRadius = 100 / stepDistance * 50
-            //限制矩形边长100m
-            val limitSide = 100 / stepDistance * 100
+            //限制圆半径30m
+            val limitRadius = 100 / stepDistance * 30
+            //限制矩形边长60m
+            val limitSide = 100 / stepDistance * 60
             LogUtil.e("ScaleLimitDistance,$stepDistance,$limitRadius,$limitSide,${cameraPosition.zoom}")
             mFencesCircleView.mLimitRadius = limitRadius.toFloat()
             mFencesRectView.mLimitSide = limitSide.toFloat()
-            mFencesPolygonView.mLimitSide = limitSide.toFloat()
+//            mFencesPolygonView.mLimitSide = limitSide.toFloat()
         }
     }