ABBIDOT_APP/Abbidot_Android
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.优化激活设备无网络情况

Browse Source 
2.圆形围栏最小半径50m改成30m;矩形围栏最小边长100m改成60m；去掉六边形最小距离限制
This commit is contained in:
yezhiqiu
2026-10-10 18:33:39 +08:00
parent 6e4913720d
commit ea8d083cdc
4 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/abbidot/tracker/ui/activity/device/AddPairedSuccessActivity.kt
View File

@@ -227,7 +227,6 @@ class AddPairedSuccessActivity :
} }
//绑定默认宠物 //绑定默认宠物
mPetRelationViewModel.mBindPetLiveData.observe(this@AddPairedSuccessActivity) { mPetRelationViewModel.mBindPetLiveData.observe(this@AddPairedSuccessActivity) {
// setButtonEnabled(mViewBinding.btnPairSuccessActivate, ConstantInt.Type1)
dealRequestResult(it, object : GetResultCallback { dealRequestResult(it, object : GetResultCallback {
override fun onResult(any: Any) { override fun onResult(any: Any) {
XEventBus.post(EventName.RefreshPet) XEventBus.post(EventName.RefreshPet)
@@ -247,10 +246,10 @@ class AddPairedSuccessActivity :
}, 1000) }, 1000)
} }
// override fun onRequestError(exceptionCode: String?) { override fun onRequestError(exceptionCode: String?) {
// super.onRequestError(exceptionCode) super.onRequestError(exceptionCode)
// setButtonEnabled(mViewBinding.btnPairSuccessActivate, ConstantInt.Type1) setButtonEnabled(mViewBinding.btnPairSuccessActivate, ConstantInt.Type1)
// } }
}) })
} }
} }

17
app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/PaymentSuccessActivity.kt
View File

@@ -138,7 +138,6 @@ class PaymentSuccessActivity :
if (TextUtils.isEmpty(mMac)) return@observe if (TextUtils.isEmpty(mMac)) return@observe
if (mMac == receiveData.mac) { if (mMac == receiveData.mac) {
val data = receiveData.data val data = receiveData.data
// setButtonEnabled(mViewBinding.btnPaymentSuccessContinue, ConstantInt.Type1)
parseData(data) parseData(data)
} }
} }
@@ -162,6 +161,7 @@ class PaymentSuccessActivity :
override fun onRequestError(exceptionCode: String?) { override fun onRequestError(exceptionCode: String?) {
LogUtil.e("支付成功后，更新绑定状态------->请求宠物数据错误onRequestError，再次请求") LogUtil.e("支付成功后，更新绑定状态------->请求宠物数据错误onRequestError，再次请求")
if (exceptionCode == mNetworkRequestsFailLimit) { if (exceptionCode == mNetworkRequestsFailLimit) {
setButtonEnabled(mViewBinding.btnPaymentSuccessContinue, ConstantInt.Type1)
} else { } else {
mAddTrackerViewModel.updatePayDeviceState( mAddTrackerViewModel.updatePayDeviceState(
this@PaymentSuccessActivity, mPayResult!!.deviceId 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) }, 1000)
} }
override fun onRequestError(exceptionCode: String?) {
super.onRequestError(exceptionCode)
setButtonEnabled(mViewBinding.btnPaymentSuccessContinue, ConstantInt.Type1)
}
}) })
} }
} }

10
app/src/main/java/com/abbidot/tracker/ui/fragment/map/baidumap/FencesAddEditBaiduMapFragment.kt
View File

@@ -290,14 +290,14 @@ class FencesAddEditBaiduMapFragment : BaseBaiduMapFragment() {
stepLatLng.latitude, stepLatLng.latitude,
stepLatLng.longitude stepLatLng.longitude
) )
//限制圆半径50m //限制圆半径30m
val limitRadius = 100 / stepDistance * 50 val limitRadius = 100 / stepDistance * 30
//限制矩形边长100m //限制矩形边长60m
val limitSide = 100 / stepDistance * 100 val limitSide = 100 / stepDistance * 60
LogUtil.e("scaleLimitDistance,$stepDistance,$limitRadius,$limitSide,${mapStatus.zoom}") LogUtil.e("scaleLimitDistance,$stepDistance,$limitRadius,$limitSide,${mapStatus.zoom}")
mFencesCircleView.mLimitRadius = limitRadius.toFloat() mFencesCircleView.mLimitRadius = limitRadius.toFloat()
mFencesRectView.mLimitSide = limitSide.toFloat() mFencesRectView.mLimitSide = limitSide.toFloat()
mFencesPolygonView.mLimitSide = limitSide.toFloat() // mFencesPolygonView.mLimitSide = limitSide.toFloat()
} }
} }

10
app/src/main/java/com/abbidot/tracker/ui/fragment/map/googlemap/FencesAddEditGoogleMapFragment.kt
View File

@@ -192,14 +192,14 @@ class FencesAddEditGoogleMapFragment : BaseGoogleMapFragment() {
stepLatLng.latitude, stepLatLng.latitude,
stepLatLng.longitude stepLatLng.longitude
) )
//限制圆半径50m //限制圆半径30m
val limitRadius = 100 / stepDistance * 50 val limitRadius = 100 / stepDistance * 30
//限制矩形边长100m //限制矩形边长60m
val limitSide = 100 / stepDistance * 100 val limitSide = 100 / stepDistance * 60
LogUtil.e("ScaleLimitDistance,$stepDistance,$limitRadius,$limitSide,${cameraPosition.zoom}") LogUtil.e("ScaleLimitDistance,$stepDistance,$limitRadius,$limitSide,${cameraPosition.zoom}")
mFencesCircleView.mLimitRadius = limitRadius.toFloat() mFencesCircleView.mLimitRadius = limitRadius.toFloat()
mFencesRectView.mLimitSide = limitSide.toFloat() mFencesRectView.mLimitSide = limitSide.toFloat()
mFencesPolygonView.mLimitSide = limitSide.toFloat() // mFencesPolygonView.mLimitSide = limitSide.toFloat()
} }
} }