yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local

Browse Source
This commit is contained in:
donghongyu-pc
2024-10-28 10:38:28 +08:00
parent edc52a2399 a0c9a5a234
commit b7d91c92a6
10 changed files with 56 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/coldstart/ColdStartNodeAdapter.kt
View File

@@ -33,7 +33,7 @@ class ColdStartNodeAdapter : RecyclerView.Adapter<ColdStartNodeAdapter.NodeInfoH
if("启动成功" == node.status || "启动中…" == node.status){
holder.tvNodeStatus.setTextColor(Color.parseColor("#B2FFFFFF"))
}else{
holder.tvNodeStatus.setTextColor(Color.parseColor("#FFCD3D"))
holder.tvNodeStatus.setTextColor(Color.parseColor("#FF4E41"))
}
}
}

4
core/function-impl/mogo-core-function-devatools/src/main/res/layout/item_node_status.xml
View File

@@ -2,6 +2,8 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/tvNodeStatus"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:textSize="@dimen/sp_32"
>
</TextView>

9
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/MsgBoxTabView.kt
View File

@@ -154,7 +154,7 @@ class MsgBoxTabView @JvmOverloads constructor(
}
fun notifyData(){
private fun notifyData(){
//获取当前Tab选择
when(MsgBoxConfig.getUserRecord()){
//通知消息
@@ -341,4 +341,11 @@ class MsgBoxTabView @JvmOverloads constructor(
isShowSummary = inOrder
}
override fun onVisibilityChanged(changedView: View, visibility: Int) {
super.onVisibilityChanged(changedView, visibility)
if(visibility == View.VISIBLE){
notifyData()
}
}
}

32
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt
View File

@@ -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("<font color=\"#FFCD3D\">${nodeDetail}</font>")
// }else{
// nodeStatusSb.append("<font color=\"#B2FFFFFF\">${nodeDetail}</font>")
// }
// nodeStatusSb.append("<br>")
// }
// 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())
// }
}
}
}

BIN
core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_cold_start_now.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 26 KiB

BIN
core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_cold_start_now.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 569 B

4
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_tab.xml
View File

@@ -35,7 +35,9 @@
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/tabSwitchCarInfo"
/>
<com.mogo.eagle.core.function.hmi.bone.tab.FaultReasonView
android:id="@+id/faultReasonView"

42
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_cold_start.xml
View File

@@ -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"
/>
<TextView
@@ -124,37 +124,47 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvNodeList"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_0"
android:layout_height="@dimen/dp_550"
app:layout_constraintTop_toBottomOf="@id/tvColdStartContent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@id/tvColdStartContent"
android:layout_marginTop="@dimen/dp_26"
/>
<TextView
android:id="@+id/tvColdStartNow"
android:layout_width="@dimen/dp_351"
android:layout_height="@dimen/dp_99"
android:background="@drawable/bg_cold_start_now"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:layout_marginEnd="@dimen/dp_191"
android:layout_marginBottom="@dimen/dp_183"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="@id/tvSystemStartupTitle"
app:layout_constraintTop_toBottomOf="@id/rvNodeList"
android:text="@string/cold_start_now"
android:textSize="@dimen/sp_36"
android:textSize="@dimen/sp_40"
android:textColor="@color/white"
android:gravity="center"
android:layout_marginTop="@dimen/dp_154"
/>
<ImageView
android:id="@+id/ivColdStartNow"
android:layout_width="@dimen/dp_18"
android:layout_height="@dimen/dp_34"
app:layout_constraintTop_toTopOf="@id/tvColdStartNow"
app:layout_constraintBottom_toBottomOf="@id/tvColdStartNow"
app:layout_constraintLeft_toRightOf="@id/tvColdStartNow"
android:src="@drawable/icon_cold_start_now"
android:layout_marginStart="@dimen/dp_15"
android:contentDescription="@string/cold_start_now"
android:layout_marginTop="@dimen/dp_4"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvColdStartNow"
app:layout_constraintStart_toStartOf="@id/tvColdStartNow"
android:text="@string/cold_start_now_tip"
android:textSize="@dimen/sp_28"
android:textColor="#82FFFFFF"
android:layout_marginEnd="@dimen/dp_191"
android:layout_marginBottom="@dimen/dp_116"
android:layout_marginTop="@dimen/dp_16"
/>

1
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_msg_box_tab.xml
View File

@@ -90,7 +90,6 @@
android:layout_marginTop="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_66"
android:layout_marginEnd="@dimen/dp_66"
android:layout_marginBottom="@dimen/dp_216"
/>
</androidx.constraintlayout.widget.ConstraintLayout>

5
core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml
View File

@@ -227,14 +227,15 @@
<string name="cold_start_fail_content">系统启动异常，建议上报问题，可尝试重启车辆</string>
<string name="cold_start_title_tel_wait">等待连接域控</string>
<string name="cold_start_title_tel_exception">连接域控异常</string>
<string name="cold_start_title_tel_exception">连接域控异常，持续重试中</string>
<string name="cold_start_title_ssm_wait">等待SSM信息</string>
<string name="cold_start_title_ssm_exception">与SSM通信异常</string>
<string name="cold_start_title_sys_wait">等待系统启动</string>
<string name="cold_start_title_sys_success">系统启动成功，即将进入主页</string>
<string name="cold_start_title_sys_exception">系统启动异常</string>
<string name="cold_start_list_mask">冷启动列表遮罩</string>
<string name="cold_start_now">立即用车</string>
<string name="cold_start_now_tip">启动未完成时，可能会导致自动驾驶等功能无法使用</string>
<string name="cold_start_now_tip">跳过流程或启动失败，均可能会导致自动驾驶等功能无法使用</string>
</resources>