From ea8d083cdc203157d235898e5fc9990d4b66d599 Mon Sep 17 00:00:00 2001 From: yezhiqiu <123456@qq.com> Date: Sat, 10 Oct 2026 18:33:39 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E6=BF=80=E6=B4=BB=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E6=97=A0=E7=BD=91=E7=BB=9C=E6=83=85=E5=86=B5=202.?= =?UTF-8?q?=E5=9C=86=E5=BD=A2=E5=9B=B4=E6=A0=8F=E6=9C=80=E5=B0=8F=E5=8D=8A?= =?UTF-8?q?=E5=BE=8450m=E6=94=B9=E6=88=9030m;=E7=9F=A9=E5=BD=A2=E5=9B=B4?= =?UTF-8?q?=E6=A0=8F=E6=9C=80=E5=B0=8F=E8=BE=B9=E9=95=BF100m=E6=94=B9?= =?UTF-8?q?=E6=88=9060m=EF=BC=9B=E5=8E=BB=E6=8E=89=E5=85=AD=E8=BE=B9?= =?UTF-8?q?=E5=BD=A2=E6=9C=80=E5=B0=8F=E8=B7=9D=E7=A6=BB=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/device/AddPairedSuccessActivity.kt | 9 ++++----- .../subscribe/PaymentSuccessActivity.kt | 17 ++++++++++++++++- .../baidumap/FencesAddEditBaiduMapFragment.kt | 10 +++++----- .../googlemap/FencesAddEditGoogleMapFragment.kt | 10 +++++----- 4 files changed, 30 insertions(+), 16 deletions(-) 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() } }