diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/adapter/MsgBoxTabAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/adapter/MsgBoxTabAdapter.kt
index 2e05b3b7c7..8fcfcba871 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/adapter/MsgBoxTabAdapter.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/adapter/MsgBoxTabAdapter.kt
@@ -572,6 +572,11 @@ class MsgBoxTabAdapter(private val activity: Activity) :
holder.tvOTATitle.text = otaMsg.title
holder.tvOTAContent.text = otaMsg.des
holder.tvOTATime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat())
+ if(otaMsg.type == "成功"){
+ holder.ivOTAImage.setImageDrawable(getDrawable(R.drawable.icon_ota_msg_success))
+ }else{
+ holder.ivOTAImage.setImageDrawable(getDrawable(R.drawable.icon_ota_msg_fail))
+ }
}
}
}
@@ -737,6 +742,7 @@ class MsgBoxTabAdapter(private val activity: Activity) :
//OTA升级
class MsgBoxOTA(itemView: View) : RecyclerView.ViewHolder(itemView){
+ var ivOTAImage: ImageView = itemView.findViewById(R.id.ivOTAImage)
var tvOTATitle: TextView = itemView.findViewById(R.id.tvOTATitle)
var tvOTATime: TextView = itemView.findViewById(R.id.tvOTATime)
var tvOTAContent: TextView = itemView.findViewById(R.id.tvOTAContent)
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt
index b3114d14fd..2d48f7134e 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt
@@ -353,6 +353,11 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A
holder.tvOTATitle.text = otaMsg.title
holder.tvOTAContent.text = otaMsg.des
holder.tvOTATime.text = TimeUtils.millis2String(it[position].msgBoxBean.timestamp,getHourMinFormat())
+ if(otaMsg.type == "成功"){
+ holder.ivOTAImage.setImageDrawable(getDrawable(R.drawable.icon_ota_msg_success))
+ }else{
+ holder.ivOTAImage.setImageDrawable(getDrawable(R.drawable.icon_ota_msg_fail))
+ }
}
}
}
@@ -515,6 +520,7 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A
//OTA升级消息
class BubbleOTAHolder(itemView: View): RecyclerView.ViewHolder(itemView){
+ var ivOTAImage: ImageView = itemView.findViewById(R.id.ivOTAImage)
var tvOTATitle: TextView = itemView.findViewById(R.id.tvOTATitle)
var tvOTATime: TextView = itemView.findViewById(R.id.tvOTATime)
var tvOTAContent: TextView = itemView.findViewById(R.id.tvOTAContent)
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt
index 0bd8bd02e7..a70677b04d 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxListAdapter.kt
@@ -738,6 +738,11 @@ class DriverMsgBoxListAdapter(private val activity: Activity) :
holder.tvOTATitle.text = otaMsg.title
holder.tvOTAContent.text = otaMsg.des
holder.tvOTATime.text = TimeUtils.millis2String(it[position].timestamp,getHourMinFormat())
+ if(otaMsg.type == "成功"){
+ holder.ivOTAImage.setImageDrawable(getDrawable(R.drawable.icon_ota_msg_success))
+ }else{
+ holder.ivOTAImage.setImageDrawable(getDrawable(R.drawable.icon_ota_msg_fail))
+ }
}
}
}
@@ -922,6 +927,7 @@ class DriverMsgBoxListAdapter(private val activity: Activity) :
var tvOTATitle: TextView = itemView.findViewById(R.id.tvOTATitle)
var tvOTATime: TextView = itemView.findViewById(R.id.tvOTATime)
var tvOTAContent: TextView = itemView.findViewById(R.id.tvOTAContent)
+ var ivOTAImage: ImageView = itemView.findViewById(R.id.ivOTAImage)
}
}
\ 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/msgbox/adapter/MsgBoxToastAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MsgBoxToastAdapter.kt
index 27c9eea585..3a11acdf89 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MsgBoxToastAdapter.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/MsgBoxToastAdapter.kt
@@ -158,6 +158,11 @@ class MsgBoxToastAdapter(private val activity: Activity) : RecyclerView.Adapter<
val otaMsg = it[position].msgBoxBean.bean as OTAMsg
holder.tvOTATitle.text = otaMsg.title
holder.tvOTAContent.text = otaMsg.des
+ if(otaMsg.type == "成功"){
+ holder.ivOTAImage.setImageDrawable(getDrawable(R.drawable.icon_ota_msg_success))
+ }else{
+ holder.ivOTAImage.setImageDrawable(getDrawable(R.drawable.icon_ota_msg_fail))
+ }
}
}
//V2X消息
@@ -388,6 +393,7 @@ class MsgBoxToastAdapter(private val activity: Activity) : RecyclerView.Adapter<
class BubbleOTAHolder(itemView: View): RecyclerView.ViewHolder(itemView){
var tvOTATitle: TextView = itemView.findViewById(R.id.tvOTATitle)
var tvOTAContent: TextView = itemView.findViewById(R.id.tvOTAContent)
+ var ivOTAImage: ImageView = itemView.findViewById(R.id.ivOTAImage)
}
}
\ 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/tools/OTAUpgradeResultDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OTAUpgradeResultDialog.kt
index 6d59c2ba1a..dc34c1bdc2 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OTAUpgradeResultDialog.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/OTAUpgradeResultDialog.kt
@@ -49,7 +49,7 @@ class OTAUpgradeResultDialog(context: Context) :
MsgBoxBean(
MsgBoxType.OTA,
OTAMsg(
- "0", "车辆部署任务执行结果", "车辆部署任务执行成功,请重启车辆")
+ "成功", "车辆部署任务执行结果", "车辆部署任务执行成功,请重启车辆")
)
)
AIAssist.getInstance(context).speakTTSVoice("车辆部署任务执行成功,请重启车辆")
@@ -63,7 +63,7 @@ class OTAUpgradeResultDialog(context: Context) :
MsgBoxBean(
MsgBoxType.OTA,
OTAMsg(
- "0", "车辆部署任务执行结果", "车辆部署任务执行失败,建议上报问题")
+ "失败", "车辆部署任务执行结果", "车辆部署任务执行失败,建议上报问题")
)
)
AIAssist.getInstance(context).speakTTSVoice("车辆部署任务执行失败")
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_ota_msg_fail.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_ota_msg_fail.png
new file mode 100644
index 0000000000..6172f280dd
Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_ota_msg_fail.png differ
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_ota_msg_success.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_ota_msg_success.png
new file mode 100644
index 0000000000..61b83192a2
Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_ota_msg_success.png differ
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_ota.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_ota.xml
index 581bbe9e10..edfc19135d 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_ota.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_ota.xml
@@ -19,7 +19,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
android:layout_margin="25dp"
- android:src="@drawable/icon_nde"
+ android:src="@drawable/icon_ota_msg_success"
android:contentDescription="@string/ota_icon"
/>
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_ota.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_ota.xml
index 9305375750..07f724981a 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_ota.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_ota.xml
@@ -19,7 +19,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
android:layout_margin="25dp"
- android:src="@drawable/icon_nde"
+ android:src="@drawable/icon_ota_msg_success"
android:contentDescription="@string/ota_icon"
/>
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_toast_nde.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_toast_nde.xml
index 420454ab7e..c44a3b0348 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_toast_nde.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_toast_nde.xml
@@ -10,8 +10,8 @@
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_tab_nde.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_tab_nde.xml
index fdd976c7f6..201ca52d11 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_tab_nde.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_tab_nde.xml
@@ -7,11 +7,11 @@
@@ -20,9 +20,10 @@
android:id="@+id/tvNdeTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:layout_constraintTop_toTopOf="@id/ivNdeImage"
+ app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toRightOf="@id/ivNdeImage"
android:layout_marginStart="@dimen/dp_30"
+ android:layout_marginTop="@dimen/dp_30"
android:textSize="@dimen/sp_38"
android:textColor="@color/white"
android:textStyle="bold"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_tab_ota.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_tab_ota.xml
index af7433aee0..4fd9367079 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_tab_ota.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_tab_ota.xml
@@ -7,22 +7,23 @@