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

Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local

Browse Source
This commit is contained in:
donghongyu-pc
2024-10-29 11:48:48 +08:00
parent 8fd0e4f0c0 43be0e7073
commit becc43c132
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt
View File

@@ -9,6 +9,7 @@ import androidx.lifecycle.findViewTreeViewModelStoreOwner
import com.mogo.commons.AbsMogoApplication
import com.mogo.eagle.core.utilcode.kotlin.onClick
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.util.ActivityUtils
import com.mogo.och.common.module.manager.autopilot.line.LineManager
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
import com.mogo.och.common.module.utils.ResourcesUtils
@@ -78,7 +79,7 @@ class TaskRunningView: ConstraintLayout, TaskRunningModel.SwtichLineViewCallback
.confirmStr(ResourcesUtils.getString(R.string.bus_dialog_confirm))
.cancelStr(ResourcesUtils.getString(R.string.bus_dialog_cancel))
.status(CommonDialogStatus.Status.ask)
.build(AbsMogoApplication.getApp())
.build(context)
closeLineConfirmDialog.setClickListener(object : CommonDialogStatus.ClickListener {
override fun confirm() {
viewModel?.completeTask()

5
core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/CoroutineDSL.kt
View File

@@ -92,7 +92,7 @@ class Request<T> {
}
} finally {
requestKey?.let {
if (deferredMap.contains(requestKey)) {
if (deferredMap.containsKey(requestKey)) {
deferredMap.remove(requestKey)
}
}
@@ -110,8 +110,9 @@ inline fun <T> request(requestKey: String? = "", buildRequest: Request<T>.() ->
private val deferredMap = ConcurrentHashMap<String, Deferred<Any>>()
fun cancel(requestKey: String) {
if (deferredMap.contains(requestKey)) {
if (deferredMap.containsKey(requestKey)) {
deferredMap[requestKey]!!.cancel(CancellationException("manual cancel !"))
deferredMap.remove(requestKey)
}
}