From 9547efe0de7ae6bc35e3aefd9973a51e78008a0a Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 29 Oct 2024 10:47:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[6.7.2]=20[fix]=20[context=20=E9=94=99?= =?UTF-8?q?=E8=AF=AF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt index e33d87b05f..0f6a31cf9c 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningView.kt @@ -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.utils.ResourcesUtils import com.mogo.och.common.module.wigets.dialog.CommonDialogStatus @@ -77,7 +78,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() From 43be0e7073b3a045b53ce2d71e4838849cef2eeb Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Tue, 29 Oct 2024 11:47:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[6.7.0][Fix]=E8=A7=A3=E5=86=B3=E5=8D=8F?= =?UTF-8?q?=E7=A8=8B=E6=9C=AA=E7=A7=BB=E9=99=A4=E5=B7=B2=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=9A=84Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/eagle/core/network/CoroutineDSL.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/CoroutineDSL.kt b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/CoroutineDSL.kt index 51a234aff5..4b137e977e 100644 --- a/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/CoroutineDSL.kt +++ b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/CoroutineDSL.kt @@ -92,7 +92,7 @@ class Request { } } finally { requestKey?.let { - if (deferredMap.contains(requestKey)) { + if (deferredMap.containsKey(requestKey)) { deferredMap.remove(requestKey) } } @@ -110,8 +110,9 @@ inline fun request(requestKey: String? = "", buildRequest: Request.() -> private val deferredMap = ConcurrentHashMap>() fun cancel(requestKey: String) { - if (deferredMap.contains(requestKey)) { + if (deferredMap.containsKey(requestKey)) { deferredMap[requestKey]!!.cancel(CancellationException("manual cancel !")) + deferredMap.remove(requestKey) } }