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

Merge branch 'dev_robotaxi-d_241112_6.8.1_dev' into dev_robotaxi-d_241210_6.9.0

Browse Source
This commit is contained in:
xuxinchao
2024-12-10 19:49:58 +08:00
parent 3bcf5da8cc 393f9fb978
commit 1ce31e2032
40 changed files with 1498 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt
View File

@@ -29,6 +29,7 @@ import com.mogo.eagle.core.data.constants.MogoServicePaths.PATH_FRAGMENT_HMI
import com.mogo.eagle.core.data.deva.bindingcar.IPCUpgradeStateInfo
import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_RTS
import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.V2I
import com.mogo.eagle.core.data.deva.ota.OtaUpgradeInfo
import com.mogo.eagle.core.data.enums.EventTypeEnumNew
import com.mogo.eagle.core.data.enums.WarningDirectionEnum
import com.mogo.eagle.core.data.map.Infrastructure
@@ -58,6 +59,9 @@ import com.mogo.eagle.core.function.hmi.ui.setting.StatusView
import com.mogo.eagle.core.function.hmi.ui.setting.ToolsView.Companion.toolsView
import com.mogo.eagle.core.function.hmi.ui.tools.AdUpgradeDialog
import com.mogo.eagle.core.function.hmi.ui.tools.ModifyBindingCarDialog
import com.mogo.eagle.core.function.hmi.ui.tools.OTADownloadStatusDialog
import com.mogo.eagle.core.function.hmi.ui.tools.OTAUpgradeDialog
import com.mogo.eagle.core.function.hmi.ui.tools.OTAUpgradeTipView
import com.mogo.eagle.core.function.hmi.ui.tools.ToBindingCarDialog
import com.mogo.eagle.core.function.hmi.ui.tools.UpgradeAppDialog
import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog
@@ -659,4 +663,59 @@ class MoGoHmiProvider : IMoGoHmiProvider {
CallerHmiViewControlListenerManager.invokeColdStartProcessView()
}
var otaUpgradeDialog: OTAUpgradeDialog ?= null
var otaDownloadStatusDialog: OTADownloadStatusDialog ?= null
var otaUpgradeTipView: OTAUpgradeTipView ?= null
/**
* 展示OTA升级弹窗
*/
override fun showOTAUpgradeDialog() {
ThreadUtils.runOnUiThread{
context?.let {
if(otaUpgradeDialog == null){
otaUpgradeDialog = OTAUpgradeDialog(it)
}
if(otaUpgradeDialog?.isShowing == false){
otaUpgradeDialog?.show()
}
}
}
}
/**
* 展示OTA升级下载状态弹窗
*/
override fun showOTADownloadStatusDialog(list: List<OtaUpgradeInfo>) {
ThreadUtils.runOnUiThread{
if(otaDownloadStatusDialog?.isShowing == true){
return@runOnUiThread
}
context?.let {
if(otaDownloadStatusDialog == null){
otaDownloadStatusDialog = OTADownloadStatusDialog(it)
}
otaDownloadStatusDialog?.notifyDownloadStatus(list)
}
}
}
/**
* 展示OTA升级提示
* @param visible 设置是否可见
*/
override fun showOTAUpgradeTipView(visible: Boolean) {
ThreadUtils.runOnUiThread{
if(otaUpgradeDialog?.isShowing == true){
return@runOnUiThread
}
if(otaUpgradeTipView == null){
context?.let {
otaUpgradeTipView = OTAUpgradeTipView(it)
}
}
otaUpgradeTipView?.setDisplayStatus(visible)
}
}
}

46
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OTADownloadStatusDialog.kt Normal file
View File

@@ -0,0 +1,46 @@
package com.mogo.eagle.core.function.hmi.ui.tools
import android.content.Context
import androidx.lifecycle.LifecycleObserver
import androidx.recyclerview.widget.LinearLayoutManager
import com.mogo.eagle.core.data.deva.ota.OtaUpgradeInfo
import com.mogo.eagle.core.function.hmi.R
import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog
import com.mogo.eagle.core.function.hmi.ui.tools.adapter.OTADownloadStatusAdapter
import kotlinx.android.synthetic.main.dialog_ota_download_status.rvDownloadStatus
/**
* OTA升级下载状态对话框
*/
class OTADownloadStatusDialog(context: Context) :
BaseFloatDialog(context,TAG), LifecycleObserver {
companion object {
private const val TAG = "OTADownloadStatusDialog"
}
private var otaDownloadStatusAdapter: OTADownloadStatusAdapter ?= null
init{
setContentView(R.layout.dialog_ota_download_status)
setCanceledOnTouchOutside(false)
initView()
}
private fun initView(){
val linearLayoutManager = LinearLayoutManager(context)
linearLayoutManager.orientation = LinearLayoutManager.VERTICAL
otaDownloadStatusAdapter = OTADownloadStatusAdapter(context)
rvDownloadStatus.adapter = otaDownloadStatusAdapter
rvDownloadStatus.layoutManager = linearLayoutManager
}
fun notifyDownloadStatus(list: List<OtaUpgradeInfo>){
if(!this.isShowing){
show()
}
otaDownloadStatusAdapter?.setData(list)
}
}

88
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OTAUpgradeDialog.kt Normal file
View File

@@ -0,0 +1,88 @@
package com.mogo.eagle.core.function.hmi.ui.tools
import android.content.Context
import android.os.CountDownTimer
import android.widget.TextView
import androidx.lifecycle.LifecycleObserver
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
import com.mogo.eagle.core.function.hmi.R
import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog
import com.mogo.eagle.core.utilcode.util.ThreadUtils
import com.zhjt.mogo_core_function_devatools.ota.OTAUpgradeConfig
import kotlinx.android.synthetic.main.dialog_ota_upgrade.tv_upgrade_countdown
import kotlinx.android.synthetic.main.dialog_ota_upgrade.tv_upgrade_later
import kotlinx.android.synthetic.main.dialog_ota_upgrade.tv_upgrade_now
import system_master.SsmInfo
/**
* OTA升级对话框
*/
class OTAUpgradeDialog(context: Context) :
BaseFloatDialog(context,TAG), LifecycleObserver {
companion object {
private const val TAG = "OTAUpgradeDialog"
private const val UPGRADE_WAITING_TIME = 300000L //升级确认等待时间
private const val WAITING_TICK_TIME = 1000L //等待确认间隔时间
}
private var clickListener: ClickListener? = null
private var upgradeWaitingTimer: CountDownTimer ?= null //等待升级确认计时器
init{
setContentView(R.layout.dialog_ota_upgrade)
setCanceledOnTouchOutside(false)
initView()
}
private fun initView(){
//立即升级
tv_upgrade_now.setOnClickListener {
CallerAutoPilotControlManager.sendSsmFuncOtaDownloadResponse(OTAUpgradeConfig.otaToken,SsmInfo.IfUpgrade.IMMEDIATELY)
dismiss()
}
//稍后升级
tv_upgrade_later.setOnClickListener {
CallerAutoPilotControlManager.sendSsmFuncOtaDownloadResponse(OTAUpgradeConfig.otaToken,SsmInfo.IfUpgrade.DELAY)
dismiss()
}
upgradeWaitingTimer = object: CountDownTimer(UPGRADE_WAITING_TIME,WAITING_TICK_TIME){
override fun onTick(millisUntilFinished: Long) {
ThreadUtils.runOnUiThread {
tv_upgrade_countdown.text = millisUntilFinished.toInt().toString()
}
}
override fun onFinish() {
//立即升级
CallerAutoPilotControlManager.sendSsmFuncOtaDownloadResponse(OTAUpgradeConfig.otaToken,SsmInfo.IfUpgrade.IMMEDIATELY)
ThreadUtils.runOnUiThread {
dismiss()
}
}
}
upgradeWaitingTimer?.start()
}
fun setClickListener(clickListener: ClickListener) {
this.clickListener = clickListener
}
interface ClickListener{
//立即升级
fun upgradeNow()
//稍后升级
fun upgradeLater()
}
override fun onAttachedToWindow() {
super.onAttachedToWindow()
}
override fun onDetachedFromWindow() {
super.onDetachedFromWindow()
upgradeWaitingTimer?.cancel()
}
}

57
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OTAUpgradeTipView.kt Normal file
View File

@@ -0,0 +1,57 @@
package com.mogo.eagle.core.function.hmi.ui.tools
import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import android.view.View
import androidx.constraintlayout.widget.ConstraintLayout
import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
import com.mogo.eagle.core.function.hmi.R
import kotlinx.android.synthetic.main.view_ota_upgrade_tip.view.btn_upgrade
/**
* OTA升级任务标记提示
*/
class OTAUpgradeTipView @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyleAttr: Int = 0
) : ConstraintLayout(context, attrs, defStyleAttr){
companion object {
private const val TAG = "OTAUpgradeTipView"
}
init {
LayoutInflater.from(context).inflate(R.layout.view_ota_upgrade_tip, this, true)
initView()
}
private fun initView(){
btn_upgrade.setOnClickListener {
//打开升级弹窗
CallerHmiManager.showOTAUpgradeDialog()
}
}
/**
* 设置视图是否可见
* @param visible 是否可见
*/
fun setDisplayStatus(visible: Boolean){
if(visible){
if(this@OTAUpgradeTipView.visibility == View.VISIBLE){
return
}else{
this@OTAUpgradeTipView.visibility = View.VISIBLE
}
}else{
if(this@OTAUpgradeTipView.visibility != View.VISIBLE){
return
}else{
this@OTAUpgradeTipView.visibility = View.GONE
}
}
}
}

63
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/adapter/OTADownloadStatusAdapter.kt Normal file
View File

@@ -0,0 +1,63 @@
package com.mogo.eagle.core.function.hmi.ui.tools.adapter
import android.content.Context
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.ProgressBar
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.mogo.eagle.core.data.deva.ota.OtaUpgradeInfo
import com.mogo.eagle.core.function.hmi.R
/**
* OTA升级下载状态适配器
*/
class OTADownloadStatusAdapter(private val context: Context): RecyclerView.Adapter<OTADownloadStatusAdapter.DownloadStatusHolder>() {
private var data: List<OtaUpgradeInfo> ?= null
fun setData(list: List<OtaUpgradeInfo>){
this.data = list
notifyDataSetChanged()
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DownloadStatusHolder {
val view = LayoutInflater.from(parent.context)
.inflate(R.layout.item_ota_download_status, parent, false)
return DownloadStatusHolder(view)
}
override fun onBindViewHolder(holder: DownloadStatusHolder, position: Int) {
data?.let {
val otaUpgradeInfo = it[position]
holder.pbDownloadProgress.progress = (otaUpgradeInfo.cur_size*100/otaUpgradeInfo.total_size).toInt()
// 0:默认(未开始), 1:下载中, 2:下载完成, 3:升级完成, 4:升级失败
holder.tvDownloadStatus.text = when (otaUpgradeInfo.status) {
1 -> {
"下载中"
}
2 -> {
"下载完成"
}
3 -> {
"升级完成"
}
4 -> {
"升级失败"
}
else -> {
"默认(未开始)"
}
}
}
}
override fun getItemCount() = data?.size ?: 0
class DownloadStatusHolder(itemView: View) : RecyclerView.ViewHolder(itemView){
var pbDownloadProgress: ProgressBar = itemView.findViewById(R.id.pbDownloadProgress)
var tvDownloadStatus: TextView = itemView.findViewById(R.id.tvDownloadStatus)
}
}

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

@@ -300,6 +300,14 @@ class ColdStartView @JvmOverloads constructor(
Log.i(TAG,"节点自上报冷启动状态="+it.eventStatus)
Log.i(TAG,"旧冷启动状态="+it.processStatus)
Log.i(TAG,"旧冷启动超时原因="+it.processTimeoutReason)
Log.i(TAG,"硬件故障Node数量="+it.hardwareNodeCount)
it.hardwareNodeList.forEach {startFlt->
Log.i(TAG,"硬件故障 startFlt.fltId="+ startFlt.fltId)
}
Log.i(TAG,"其他故障数量="+it.otherFltsCount)
it.otherFltsList.forEach {startFlt->
Log.i(TAG,"其他故障 startFlt.fltId="+startFlt.fltId)
}
ThreadUtils.runOnUiThread {
tvColdStartContent.text = getColdStartEventStatus(it.eventStatus)
if(it.eventStatus == SsmInfo.CSState.COLD_START_READY){
@@ -327,6 +335,12 @@ class ColdStartView @JvmOverloads constructor(
val nodeInfo = ColdStartNodeInfo(node.nodeName,node.eventCode,getColdStartNodeStatus(node.status),node.desc)
nodeList.add(nodeInfo)
}
Log.i(TAG,"nodeName="+node.nodeName+" status="+node.status+" desc="+node.desc+" eventCode="+node.eventCode)
Log.i(TAG,"node.haveFltCount="+node.haveFltCount)
node.haveFltList.forEach {str->
Log.i(TAG, "故障码=$str")
}
}
it.nodeList.forEach {node->
if(node.status == SsmInfo.NodeStatus.NODE_STARTING){

16
core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_ota_download_status.xml Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvDownloadStatus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
/>
</androidx.constraintlayout.widget.ConstraintLayout>

96
core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_ota_upgrade.xml Normal file
View File

@@ -0,0 +1,96 @@
<?xml version="1.0" encoding="utf-8"?>
<com.mogo.eagle.core.widget.RoundConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="@dimen/dp_900"
android:layout_height="@dimen/dp_620"
android:background="@drawable/bg_bone_dialog"
app:roundLayoutRadius="@dimen/dp_50"
>
<TextView
android:id="@+id/tv_upgrade_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:text="@string/application_upgrade"
android:textSize="56dp"
android:textColor="#FFFFFFFF"
android:layout_marginTop="50dp"
/>
<TextView
android:id="@+id/tv_upgrade_countdown"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="@id/tv_upgrade_title"
app:layout_constraintBottom_toBottomOf="@id/tv_upgrade_title"
app:layout_constraintRight_toRightOf="parent"
android:layout_marginEnd="@dimen/dp_50"
android:textSize="@dimen/sp_30"
android:textColor="@color/white"
/>
<TextView
android:id="@+id/tv_upgrade_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_upgrade_title"
android:text="@string/application_upgrade_confirm"
android:textColor="#FFFFFFFF"
android:textSize="43dp"
android:gravity="start"
android:layout_marginStart="50dp"
android:layout_marginEnd="50dp"
android:layout_marginTop="50dp"
/>
<TextView
android:id="@+id/tv_upgrade_tip"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_upgrade_content"
app:layout_constraintBottom_toTopOf="@id/view_horizontal_line"
android:text="@string/application_upgrade_tips"
android:textColor="#FFFF4B1F"
android:textSize="36dp"
android:layout_marginStart="50dp"
android:layout_marginEnd="50dp"
android:layout_marginTop="30dp"
/>
<TextView
android:id="@+id/tv_upgrade_now"
android:layout_width="@dimen/dp_356"
android:layout_height="@dimen/dp_120"
android:gravity="center"
android:text="@string/ota_upgrade_now"
android:background="@drawable/bg_dialog_btn"
android:textColor="@color/color_2EACFF"
android:textSize="@dimen/dp_40"
android:layout_marginStart="@dimen/dp_65"
android:layout_marginBottom="@dimen/dp_62"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" />
<TextView
android:id="@+id/tv_upgrade_later"
android:layout_width="@dimen/dp_356"
android:layout_height="@dimen/dp_120"
android:gravity="center"
android:text="@string/ota_upgrade_later"
android:textColor="@color/white"
android:textSize="@dimen/dp_40"
android:background="@drawable/bg_dialog_btn"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginEnd="@dimen/dp_65"
android:layout_marginBottom="@dimen/dp_62"
app:layout_constraintRight_toRightOf="parent"/>
</com.mogo.eagle.core.widget.RoundConstraintLayout>

9
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml
View File

@@ -141,6 +141,15 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.mogo.eagle.core.function.hmi.ui.tools.OTAUpgradeTipView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:layout_marginTop="@dimen/dp_39"
/>
<!-- 事件弹框 -->
<com.mogo.eagle.core.function.hmi.ui.v2n.RoadV2NEventWindowView
android:id="@+id/roadV2NEventWindowView"

13
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_ota_upgrade_tip.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<Button
android:id="@+id/btn_upgrade"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="OTA升级"
/>
</LinearLayout>

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

@@ -248,4 +248,8 @@
<string name="cold_start_process">冷启动进度条</string>
<!--OTA升级-->
<string name="ota_upgrade_now">立即升级</string>
<string name="ota_upgrade_later">稍后升级</string>
</resources>