From cfac9983eb97f476d6667c2cc7c4db769f7140b5 Mon Sep 17 00:00:00 2001 From: aibingbing Date: Wed, 4 Sep 2024 16:07:14 +0800 Subject: [PATCH] =?UTF-8?q?[6.6.0][FSM]=20fix:=20FSM=20=E7=8A=B6=E6=80=81?= =?UTF-8?q?=20=E9=9C=80=E8=A6=81=E5=9C=A8=E7=8A=B6=E6=80=81=E6=A0=8F?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=EF=BC=8C=E5=90=8C=E6=97=B6=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=BD=B1=E5=93=8D=E8=87=AA=E5=8A=A8=E9=A9=BE=E9=A9=B6=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E7=8A=B6=E6=80=81=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo_core_function_devatools/status/ui/StatusView.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt index dc180f0e9c..45326bbbc8 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/ui/StatusView.kt @@ -9,6 +9,7 @@ import androidx.recyclerview.widget.* import com.mogo.eagle.core.utilcode.kotlin.* import com.mogo.eagle.core.utilcode.rv.divider.* import com.zhjt.mogo_core_function_devatools.R +import com.zhjt.mogo_core_function_devatools.status.entity.FSMStatus import com.zhjt.mogo_core_function_devatools.status.entity.IAutopilotPreLaunchStatus import com.zhjt.mogo_core_function_devatools.status.entity.Status import com.zhjt.mogo_core_function_devatools.status.model.StatusModel @@ -48,11 +49,11 @@ internal class StatusView(private val model: StatusModel, ctx: Context): Constra .horizontalInnerSpace(10.PX) .build() ) - val adapter = model.status.value?.let { data -> StatusAdapter(context, data.second.filter { it !is IAutopilotPreLaunchStatus }) }?.also { adapter -> itx.adapter = adapter } + val adapter = model.status.value?.let { data -> StatusAdapter(context, data.second.filter { (it !is IAutopilotPreLaunchStatus) && (it !is FSMStatus)}) }?.also { adapter -> itx.adapter = adapter } adapter?.let { _ -> model.status.observeForever(Observer>> { data -> val old = adapter.data - val update = data.second.filter { it !is IAutopilotPreLaunchStatus } + val update = data.second.filter { (it !is IAutopilotPreLaunchStatus) && (it !is FSMStatus)}) } val result = DiffUtil.calculateDiff(StatusDiffCallback(old, update)) adapter.data = update result.dispatchUpdatesTo(adapter)