diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml index aa80b940b4..3a98c9f5c2 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml @@ -459,5 +459,12 @@ app:layout_constraintStart_toStartOf="parent" /> - + \ No newline at end of file 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 7be0d877f5..f98d70fe28 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 @@ -36,12 +36,12 @@ internal class StatusView(private val model: StatusModel, ctx: Context): Constra override fun onAttachedToWindow() { super.onAttachedToWindow() - val adapter = model.status.value?.let { data -> StatusAdapter(context, data.second.filter { (it !is IAutopilotPreLaunchStatus) || (it is FSMStatus)}) }?.also { adapter -> rv.adapter = adapter } + val adapter = model.status.value?.let { data -> StatusAdapter(context, data.second.filter { it !is IAutopilotPreLaunchStatus }) }?.also { adapter -> rv.adapter = adapter } adapter?.let { _ -> observer?.also { model.status.removeObserver(it) } model.status.observeForever(Observer>> { data -> val old = adapter.data - val update = data.second.filter { (it !is IAutopilotPreLaunchStatus) || (it is FSMStatus) } + val update = data.second.filter { it !is IAutopilotPreLaunchStatus } val result = DiffUtil.calculateDiff(StatusDiffCallback(old, update)) adapter.data = update result.dispatchUpdatesTo(adapter) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/BoneTopStatusLayout.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/BoneTopStatusLayout.kt index 94f0ff979a..862ab006b7 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/BoneTopStatusLayout.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/BoneTopStatusLayout.kt @@ -13,7 +13,7 @@ class BoneTopStatusLayout @JvmOverloads constructor( ) : ConstraintLayout(context, attrs, defStyleAttr) { init { - LayoutInflater.from(context).inflate(R.layout.view_bone_tab, this, true) + LayoutInflater.from(context).inflate(R.layout.view_bone_top_status, this, true) initView() } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/status/StartAutoPilotStatusView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/status/StartAutoPilotStatusView.kt new file mode 100644 index 0000000000..f3bc3bd85c --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/bone/status/StartAutoPilotStatusView.kt @@ -0,0 +1,57 @@ +package com.mogo.eagle.core.function.hmi.ui.bone.status + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager +import com.mogo.eagle.core.function.hmi.R +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.mogo.logger.Logger +import com.zhjt.mogo_core_function_devatools.status.StatusManager +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.ui.AutoPilotLaunchBeforeView + +class StartAutoPilotStatusView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : ConstraintLayout(context, attrs, defStyleAttr) , StatusManager.IStatusListener { + + companion object { + private const val TAG = "StartAutoPilotStatusView" + } + + init { + LayoutInflater.from(context).inflate(R.layout.view_start_autopilot_status, this, true) + initView() + } + + private fun initView() { + + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + StatusManager.addListener(TAG, this) + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + StatusManager.removeListener(TAG) + } + + /** + * @param changed: 变化的数据 + * @param all: 所有状态数据 + */ + override fun onStatusChanged(changed: List, all: List) { + changed.filter { it is IAutopilotPreLaunchStatus }.forEach { status -> + val isError = status.isException() && CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().state != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING + CallerLogger.d(TAG, "--- onChanged ---:$isError") + + } + } +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_fsm_status_bg_error.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_fsm_status_bg_error.png new file mode 100644 index 0000000000..64d2b1e585 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_fsm_status_bg_error.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_fsm_status_bg_normal.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_fsm_status_bg_normal.png new file mode 100644 index 0000000000..b9c99cb2e8 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_fsm_status_bg_normal.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_fsm_status_bg_unknown.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_fsm_status_bg_unknown.png new file mode 100644 index 0000000000..343ac036b7 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_fsm_status_bg_unknown.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_no_fsm_status_bg_error.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_no_fsm_status_bg_error.png new file mode 100644 index 0000000000..e79245a482 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_no_fsm_status_bg_error.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_no_fsm_status_bg_normal.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_no_fsm_status_bg_normal.png new file mode 100644 index 0000000000..9a1b10524e Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_no_fsm_status_bg_normal.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_accelerator_error.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_accelerator_error.png new file mode 100644 index 0000000000..249a739fb6 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_accelerator_error.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_accelerator_normal.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_accelerator_normal.png new file mode 100644 index 0000000000..5bef6918b1 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_accelerator_normal.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_brake_error.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_brake_error.png new file mode 100644 index 0000000000..51c306c78f Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_brake_error.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_brake_normal.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_brake_normal.png new file mode 100644 index 0000000000..0bb5fb3f97 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_brake_normal.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_double_flash_error.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_double_flash_error.png new file mode 100644 index 0000000000..e20a91034b Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_double_flash_error.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_double_flash_normal.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_double_flash_normal.png new file mode 100644 index 0000000000..c8b3c442e8 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_double_flash_normal.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_gear_bg_error.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_gear_bg_error.png new file mode 100644 index 0000000000..2f0c84521b Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_gear_bg_error.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_gear_bg_normal.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_gear_bg_normal.png new file mode 100644 index 0000000000..9157dc77f5 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_gear_bg_normal.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_steer_error.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_steer_error.png new file mode 100644 index 0000000000..0ff6384c69 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_steer_error.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_steer_normal.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_steer_normal.png new file mode 100644 index 0000000000..dad7e453d2 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_status_steer_normal.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_autopilot_status_accelerator.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_autopilot_status_accelerator.xml new file mode 100644 index 0000000000..1a94b5b223 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_autopilot_status_accelerator.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_autopilot_status_brake.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_autopilot_status_brake.xml new file mode 100644 index 0000000000..729338288f --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_autopilot_status_brake.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_autopilot_status_double_flash.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_autopilot_status_double_flash.xml new file mode 100644 index 0000000000..23535cadb3 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_autopilot_status_double_flash.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_autopilot_status_gear.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_autopilot_status_gear.xml new file mode 100644 index 0000000000..d706ab642c --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_autopilot_status_gear.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_autopilot_status_steer.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_autopilot_status_steer.xml new file mode 100644 index 0000000000..dedd6d6cdc --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_autopilot_status_steer.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml index 72b04bcde0..5e25bb8104 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml @@ -7,6 +7,7 @@ android:layout_gravity="center"> - + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_start_autopilot_status.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_start_autopilot_status.xml new file mode 100644 index 0000000000..881603c1f0 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_start_autopilot_status.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file