yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.1.0] 更新到站接口请求标识位

Browse Source
This commit is contained in:
wangmingjun
2023-09-27 14:09:27 +08:00
parent 0e086b5c3d
commit 65ee24fff3
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
View File

@@ -31,7 +31,6 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
import com.mogo.eagle.core.utilcode.util.*
import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager
import com.mogo.och.common.module.biz.common.socketmessage.data.OCHOperationalMessage
@@ -119,7 +118,7 @@ object TaxiTaskModel {
private var mPrepareTaskDelayRunnable: Runnable? = null
private var mIsArrivedSiteTag = false //到站标志位,防止围栏触发多次调用到站接口
private var mIsArrivedSiteStartTag = false //到站接口请求标志位,防止围栏触发多次调用到站接口, true 接口请求, false : 接口请求完成
fun addTaskWithOrderListener(tag: String, listener: ITaxiTaskWithOrderCallback) {
if (mTaxiTaskWithOrderCallbackMap.containsKey(tag)) {
@@ -557,12 +556,12 @@ object TaxiTaskModel {
siteId: Long, isArriveAtEndSite: Boolean,
isArrivedNearestStation: Boolean = false
) {
if (mIsArrivedSiteTag) {
if (mIsArrivedSiteStartTag) {
DebugView.printInfoMsg("arriveSite接口正在调用中")
i(TAG, message = "arriveSite接口正在调用中 mIsArrivedSite = $mIsArrivedSiteTag")
i(TAG, message = "arriveSite接口正在调用中 mIsArrivedSite = $mIsArrivedSiteStartTag")
return
}
mIsArrivedSiteTag = true
mIsArrivedSiteStartTag = true
DebugView.printInfoMsg("[上报ArriveSite] siteId=$siteId, isArriveAtEndSite=$isArriveAtEndSite")
i(TAG, message = "submitArriveSite: siteId=$siteId isArriveAtEndSite=$isArriveAtEndSite")
TaxiTaskWithOrderServiceManager.arriveSite(
@@ -570,8 +569,10 @@ object TaxiTaskModel {
siteId,
object : OchCommonServiceCallback<BaseData> {
override fun onSuccess(data: BaseData?) {
mIsArrivedSiteTag = false
if (data == null || data.code != 0) return
if (data == null || data.code != 0) {
mIsArrivedSiteStartTag = false
return
}
DebugView.printInfoMsg("[上报ArriveSite] success siteId=$siteId, isArriveAtEndSite=$isArriveAtEndSite")
d(TAG, "submitArriveSite-onSuccess data=" + GsonUtil.jsonFromObject(data))
mDriveToNearestStationTask = null
@@ -587,7 +588,7 @@ object TaxiTaskModel {
override fun onError() {
super.onError()
mIsArrivedSiteTag = false
mIsArrivedSiteStartTag = false
if (!NetworkUtils.isConnected(mContext)) { // 网络异常,接口重试
ToastUtils.showShort("网络出现异常,请稍后重试")
DebugView.printErrorMsg("[上报ArriveSite] 网络出现异常,请稍后重试")
@@ -598,7 +599,7 @@ object TaxiTaskModel {
}
override fun onFail(code: Int, msg: String?) {
mIsArrivedSiteTag = false
mIsArrivedSiteStartTag = false
DebugView.printErrorMsg("[上报ArriveSite] failed, code=$code, msg=$msg")
d(TAG, "code=$code msg=$msg")
ToastUtils.showShort("到站接口请求出现异常,请稍后重试,code=$code msg=$msg")
@@ -718,6 +719,7 @@ object TaxiTaskModel {
//注意: 需要去除到达乘客上车点的节点, 这个节点不拉取任务
if (result.currentStatus == TaskStatusEnum.CompleteTask.code
) {
mIsArrivedSiteStartTag = false //任务完成说明到站, 更新到站标识位, 不再到站接口请求成功更新
mADASStatusCallback?.updateAutopilotStatus()
mTaxiTaskWithOrderCallbackMap.forEach {
val listener = it.value