diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/coldstart/ColdStartNodeAdapter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/coldstart/ColdStartNodeAdapter.kt index ebdb04e21c..67a02881ea 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/coldstart/ColdStartNodeAdapter.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/coldstart/ColdStartNodeAdapter.kt @@ -33,7 +33,7 @@ class ColdStartNodeAdapter : RecyclerView.Adapter + android:layout_height="wrap_content" + android:textSize="@dimen/sp_32" + > \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt index dd8a4584e4..4bfa3359a3 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt @@ -27,6 +27,7 @@ import com.zhjt.mogo.adas.data.AdasConstants import com.zhjt.mogo_core_function_devatools.coldstart.ColdStartAnalyticsManager import com.zhjt.mogo_core_function_devatools.coldstart.ColdStartConfig import com.zhjt.mogo_core_function_devatools.coldstart.ColdStartNodeAdapter +import kotlinx.android.synthetic.main.view_cold_start.view.ivColdStartNow import kotlinx.android.synthetic.main.view_cold_start.view.ivColdStartStatus import kotlinx.android.synthetic.main.view_cold_start.view.ivIpcConnectStatus import kotlinx.android.synthetic.main.view_cold_start.view.ivSsmConnectStatus @@ -102,6 +103,14 @@ class ColdStartView @JvmOverloads constructor( //保存点击时间 ColdStartConfig.setColdStartNowState(System.currentTimeMillis()) } + ivColdStartNow.setOnClickListener{ + hideColdStartView() + //立即用车埋点统计 + ColdStartAnalyticsManager.coldStartStepAnalytics(ColdStartAnalyticsManager.coldStartNow,reason) + //保存点击时间 + ColdStartConfig.setColdStartNowState(System.currentTimeMillis()) + } + } override fun onAttachedToWindow() { @@ -277,8 +286,9 @@ class ColdStartView @JvmOverloads constructor( ColdStartConfig.setColdStartSuccessTime(System.currentTimeMillis()) } tvColdStartContent.text = getColdStartEventStatus(it.eventStatus) + nodeList.clear() it.nodeList.forEach {node-> - if(node.status == SsmInfo.NodeStatus.NODE_FINISH){ + if(node.status == SsmInfo.NodeStatus.NODE_TIMEOUT || node.status == SsmInfo.NodeStatus.NODE_FAILED){ val nodeInfo = ColdStartNodeInfo(node.nodeName,node.eventCode,getColdStartNodeStatus(node.status),node.desc) nodeList.add(nodeInfo) } @@ -290,31 +300,13 @@ class ColdStartView @JvmOverloads constructor( } } it.nodeList.forEach {node-> - if(node.status == SsmInfo.NodeStatus.NODE_TIMEOUT || node.status == SsmInfo.NodeStatus.NODE_FAILED){ + if(node.status == SsmInfo.NodeStatus.NODE_FINISH){ val nodeInfo = ColdStartNodeInfo(node.nodeName,node.eventCode,getColdStartNodeStatus(node.status),node.desc) nodeList.add(nodeInfo) } } coldStartNodeAdapter?.setData(nodeList) - -// nodeStatusSb.clear() -// it.nodeList.forEach {node-> -// Log.i(TAG,"node nodeName="+node.nodeName+"node status="+node.status) -// -// val nodeDetail = node.nodeName+ " " + getColdStartNodeStatus(node.status) -// if(node.status == SsmInfo.NodeStatus.NODE_FAILED || node.status ==SsmInfo.NodeStatus.NODE_TIMEOUT){ -// nodeStatusSb.append("${nodeDetail}") -// }else{ -// nodeStatusSb.append("${nodeDetail}") -// } -// nodeStatusSb.append("
") -// } -// tvColdStartNodeState.text = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { -// Html.fromHtml(nodeStatusSb.toString(), Html.FROM_HTML_MODE_LEGACY) -// } else { -// Html.fromHtml(nodeStatusSb.toString()) -// } } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_cold_start_now.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_cold_start_now.png deleted file mode 100644 index 44dfd6ee78..0000000000 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_cold_start_now.png and /dev/null differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_cold_start_now.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_cold_start_now.png new file mode 100644 index 0000000000..511da8f0e2 Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_cold_start_now.png differ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_cold_start.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_cold_start.xml index 452831fe2e..f3342afb73 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_cold_start.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_cold_start.xml @@ -14,7 +14,7 @@ android:textSize="@dimen/sp_70" app:layout_constraintTop_toTopOf="parent" app:layout_constraintLeft_toLeftOf="parent" - android:layout_marginTop="@dimen/dp_432" + android:layout_marginTop="@dimen/dp_300" android:layout_marginStart="@dimen/dp_261" android:text="@string/cold_start_title_tel_wait" /> @@ -26,7 +26,7 @@ app:layout_constraintTop_toBottomOf="@id/tvSystemStartupTitle" app:layout_constraintLeft_toLeftOf="@id/tvSystemStartupTitle" android:contentDescription="@string/ipc_connect_icon" - android:layout_marginTop="@dimen/dp_89" + android:layout_marginTop="@dimen/dp_50" /> + + diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml index 2b2587dd2d..7ed0580a39 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml @@ -227,14 +227,15 @@ 系统启动异常,建议上报问题,可尝试重启车辆 等待连接域控 - 连接域控异常 + 连接域控异常,持续重试中 等待SSM信息 与SSM通信异常 等待系统启动 系统启动成功,即将进入主页 系统启动异常 + 冷启动列表遮罩 立即用车 - 启动未完成时,可能会导致自动驾驶等功能无法使用 + 跳过流程或启动失败,均可能会导致自动驾驶等功能无法使用