diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryAdapter.kt index 15f0de63a3..f40c3b66fb 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryAdapter.kt @@ -34,29 +34,24 @@ class StatusSummaryAdapter(private val ctx: Context, var data: ArrayList { - ivFuncView.setImageResource(R.drawable.driver_server) + ivFuncView.setImageResource(if (entity.isException) R.drawable.icon_over_driver_start_error else R.drawable.icon_over_driver_start_ok) } 1 -> { - ivFuncView.setImageResource(R.drawable.gps) + ivFuncView.setImageResource(if (entity.isException) R.drawable.icon_over_gps_error else R.drawable.icon_over_gps_ok) } 2 -> { - ivFuncView.setImageResource(R.drawable.cloud_socket) + ivFuncView.setImageResource(if (entity.isException) R.drawable.icon_over_socket_error else R.drawable.icon_over_socket_ok) } 3 -> { - ivFuncView.setImageResource(R.drawable.tracing) + ivFuncView.setImageResource(if (entity.isException) R.drawable.icon_over_route_error else R.drawable.icon_over_route_ok) } 4 -> { - ivFuncView.setImageResource(R.drawable.controller) + ivFuncView.setImageResource(if (entity.isException) R.drawable.icon_over_ipc_error else R.drawable.icon_over_ipc_ok) } 5 -> { - ivFuncView.setImageResource(R.drawable.ssl_check) + ivFuncView.setImageResource(if (entity.isException) R.drawable.icon_over_auth_error else R.drawable.icon_over_auth_ok) } } - if (entity.isException) { - tvStatusDesc.setTextColor(Color.parseColor("#FF4444")) - } else { - tvStatusDesc.setTextColor(Color.parseColor("#FFFFFF")) - } tvStatusDesc.text = entity.desc } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt index 4255d48076..3239ff5131 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt @@ -32,21 +32,12 @@ import com.mogo.eagle.core.utilcode.kotlin.PX import com.mogo.eagle.core.utilcode.rv.divider.CommonDividerItemDecoration import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.zhjt.mogo.adas.data.AdasConstants +import me.jessyan.autosize.utils.AutoSizeUtils /** * 状态汇总View控件 */ -class StatusSummaryView @JvmOverloads constructor( - context: Context, - attrs: AttributeSet? = null, - defStyleAttr: Int = 0 -) : FrameLayout( - context, - attrs, - defStyleAttr -), IConnectStatusListener, IMogoStatusChangedListener, - IMoGoDevaToolsListener, IMoGoAutopilotStatusListener, IMoGoAutopilotCarConfigListener, - IMoGoCloudListener { +class StatusSummaryView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : FrameLayout(context, attrs, defStyleAttr), IConnectStatusListener, IMogoStatusChangedListener, IMoGoDevaToolsListener, IMoGoAutopilotStatusListener, IMoGoAutopilotCarConfigListener, IMoGoCloudListener { companion object { private const val TAG = "SummaryStatusView" } @@ -61,13 +52,7 @@ class StatusSummaryView @JvmOverloads constructor( it.add(StatusSummaryEntity(2)) it.add(StatusSummaryEntity(3)) it.add(StatusSummaryEntity(4, "域控未连接", true)) - it.add( - StatusSummaryEntity( - 5, - CallerAutopilotCarConfigListenerManager.getCertFileResult(), - CallerCloudCertManager.getRootCrtF().isNullOrEmpty() - ) - ) + it.add(StatusSummaryEntity(5, CallerAutopilotCarConfigListenerManager.getCertFileResult(), CallerCloudCertManager.getRootCrtF().isNullOrEmpty())) } } @@ -78,12 +63,9 @@ class StatusSummaryView @JvmOverloads constructor( override fun onAttachedToWindow() { super.onAttachedToWindow() - CallerDevaToolsListenerManager.addListener(TAG, this) - // 司机屏Server服务是否开启的状态 - CallerTelematicStatusListenerManager.addListener(TAG, this) - // 云socket连接状态 - MogoStatusManager.getInstance() - .registerStatusChangedListener(TAG, StatusDescriptor.CLOUD_SOCKET, this) + CallerDevaToolsListenerManager.addListener(TAG, this) // 司机屏Server服务是否开启的状态 + CallerTelematicStatusListenerManager.addListener(TAG, this) // 云socket连接状态 + MogoStatusManager.getInstance().registerStatusChangedListener(TAG, StatusDescriptor.CLOUD_SOCKET, this) CallerAutoPilotStatusListenerManager.addListener(TAG, this) CallerAutopilotCarConfigListenerManager.addListener(TAG, this) CallerCloudListenerManager.addListener(TAG, this) @@ -99,12 +81,7 @@ class StatusSummaryView @JvmOverloads constructor( removeDuration = 0 } it.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false) - it.addItemDecoration( - CommonDividerItemDecoration.Builder() - .spanCountTBCare(false) - .horizontalInnerSpace(10.PX) - .build() - ) + it.addItemDecoration(CommonDividerItemDecoration.Builder().spanCountTBCare(false).verticalInnerSpace(AutoSizeUtils.dp2px(context, 20.0f)).build()) StatusSummaryAdapter(context, data).apply { adapter = this it.adapter = this @@ -121,13 +98,10 @@ class StatusSummaryView @JvmOverloads constructor( } override fun onDetachedFromWindow() { - super.onDetachedFromWindow() - // 司机屏Server服务是否开启的状态 + super.onDetachedFromWindow() // 司机屏Server服务是否开启的状态 CallerTelematicStatusListenerManager.removeListener(TAG) - CallerDevaToolsListenerManager.removeListener(TAG) - // 云socket连接状态 - MogoStatusManager.getInstance() - .unregisterStatusChangedListener(TAG, StatusDescriptor.CLOUD_SOCKET, this) + CallerDevaToolsListenerManager.removeListener(TAG) // 云socket连接状态 + MogoStatusManager.getInstance().unregisterStatusChangedListener(TAG, StatusDescriptor.CLOUD_SOCKET, this) CallerAutoPilotStatusListenerManager.removeListener(TAG) CallerAutopilotCarConfigListenerManager.removeListener(TAG) CallerCloudListenerManager.removeListener(TAG) @@ -171,8 +145,7 @@ class StatusSummaryView @JvmOverloads constructor( } override fun tracingStatus(status: Boolean) { - super.tracingStatus(status) - // 发送事件前限制了频率 + super.tracingStatus(status) // 发送事件前限制了频率 UiThreadHandler.post({ if (data.size < 4) return@post data[3].desc = "寻迹算路${if (status) "正常" else "异常"}" @@ -181,10 +154,7 @@ class StatusSummaryView @JvmOverloads constructor( }, UiThreadHandler.MODE.QUEUE) } - override fun onAutopilotIpcConnectStatusChanged( - status: AdasConstants.IpcConnectionStatus, - reason: String? - ) { + override fun onAutopilotIpcConnectStatusChanged(status: AdasConstants.IpcConnectionStatus, reason: String?) { super.onAutopilotIpcConnectStatusChanged(status, reason) var pair: Pair? = null when (status) { @@ -238,8 +208,8 @@ class StatusSummaryView @JvmOverloads constructor( override fun authCrtFile(device: String, root: String) { super.authCrtFile(device, root) - UiThreadHandler.post ({ - if(CallerAutopilotCarConfigListenerManager.getCertFileResult()!= "未开启认证"){ + UiThreadHandler.post({ + if (CallerAutopilotCarConfigListenerManager.getCertFileResult() != "未开启认证") { return@post } if (data.size < 6) return@post @@ -251,7 +221,7 @@ class StatusSummaryView @JvmOverloads constructor( override fun authCrtError(errorMsg: String) { super.authCrtError(errorMsg) - UiThreadHandler.post ({ + UiThreadHandler.post({ if (data.size < 6) return@post data[5].desc = "本机证书下载异常:$errorMsg" data[5].isException = true @@ -262,14 +232,10 @@ class StatusSummaryView @JvmOverloads constructor( override fun onCertificationResult(msg: String) { super.onCertificationResult(msg) hmiAction("证书验证状态", msg, true) - if (!SharedPrefsMgr.getInstance().getBoolean( - "${MoGoConfig.AUTOPILOT_CERTIFICATION}-${DebugConfig.getNetMode()}", - MoGoConfig.AUTOPILOT_CERTIFICATION_DEFAULT_VALUE - ) - ) { + if (!SharedPrefsMgr.getInstance().getBoolean("${MoGoConfig.AUTOPILOT_CERTIFICATION}-${DebugConfig.getNetMode()}", MoGoConfig.AUTOPILOT_CERTIFICATION_DEFAULT_VALUE)) { return } - UiThreadHandler.post ({ + UiThreadHandler.post({ if (data.size < 6) return@post data[5].desc = msg data[5].isException = !msg.contains("成功校验") diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_status_overview.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_status_overview.png new file mode 100644 index 0000000000..cd0cfd0fa7 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_status_overview.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_auth_error.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_auth_error.png new file mode 100644 index 0000000000..a1998a95a8 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_auth_error.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_auth_ok.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_auth_ok.png new file mode 100644 index 0000000000..50cc73c9c6 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_auth_ok.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_driver_start_error.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_driver_start_error.png new file mode 100644 index 0000000000..233b58eb8f Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_driver_start_error.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_driver_start_ok.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_driver_start_ok.png new file mode 100644 index 0000000000..8413fc97ba Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_driver_start_ok.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_gps_error.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_gps_error.png new file mode 100644 index 0000000000..9b814da2a4 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_gps_error.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_gps_ok.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_gps_ok.png new file mode 100644 index 0000000000..ba77e3716b Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_gps_ok.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_ipc_error.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_ipc_error.png new file mode 100644 index 0000000000..e2abecd8ec Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_ipc_error.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_ipc_ok.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_ipc_ok.png new file mode 100644 index 0000000000..4ed1556da5 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_ipc_ok.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_route_error.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_route_error.png new file mode 100644 index 0000000000..951e111d2a Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_route_error.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_route_ok.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_route_ok.png new file mode 100644 index 0000000000..643f1e55bc Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_route_ok.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_socket_error.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_socket_error.png new file mode 100644 index 0000000000..67eb31442f Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_socket_error.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_socket_ok.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_socket_ok.png new file mode 100644 index 0000000000..72f6a0db66 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_over_socket_ok.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_status_summary_layout.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_status_summary_layout.xml index b4577984db..8c253ac4a2 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_status_summary_layout.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_status_summary_layout.xml @@ -1,35 +1,26 @@ - + + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + tools:src="@drawable/icon_over_driver_start_ok"/> + - - \ No newline at end of file + android:layout_gravity="center_vertical" + android:layout_marginStart="@dimen/dp_20" + android:textSize="@dimen/dp_28" + android:textColor="#ffffff" + tools:text="已连接xxxxxxxxxxxxxxxx" /> + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_summary_layout.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_summary_layout.xml index f3e2382a3f..380c8e772b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_summary_layout.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_summary_layout.xml @@ -1,32 +1,10 @@ - + android:background="@drawable/bg_status_overview" + android:padding="@dimen/dp_60" + tools:ignore="MissingDefaultResource" /> - - - - - \ No newline at end of file