diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt
index ca4e1d1adb..3027795e8b 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt
@@ -6,8 +6,8 @@ import android.util.AttributeSet
import android.view.LayoutInflater
import android.view.View
import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.ContextCompat
import androidx.recyclerview.widget.LinearLayoutManager
-import com.mogo.eagle.core.data.config.FunctionBuildConfig
import com.mogo.eagle.core.data.enums.DataSourceType
import com.mogo.eagle.core.data.msgbox.MsgBoxBean
import com.mogo.eagle.core.data.msgbox.MsgCategory
@@ -21,7 +21,6 @@ import com.mogo.eagle.core.function.call.order.CallerOrderListenerManager
import com.mogo.eagle.core.function.hmi.R
import com.mogo.eagle.core.function.hmi.ui.msgbox.adapter.DriverMsgBoxListAdapter
import com.mogo.eagle.core.function.msgbox.MsgBoxConfig
-import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.mogo.eagle.core.utilcode.util.UiThreadHandler
import kotlinx.android.synthetic.main.layout_driver_msg_box_list.view.*
import org.greenrobot.eventbus.EventBus
@@ -71,14 +70,14 @@ class DriverMsgBoxListView @JvmOverloads constructor(
badCaseList = badCaseList?.let { ArrayList(it.reversed()) }
//通知
tvMsgNotice.setOnClickListener {
- tvMsgNotice.setTextColor(resources.getColor(R.color.msg_box_title_color))
- tvMsgFm.setTextColor(resources.getColor(R.color.color_FFFFFF))
- tvMsgIpcReport.setTextColor(resources.getColor(R.color.color_FFFFFF))
- tvMsgBadCase.setTextColor(resources.getColor(R.color.color_FFFFFF))
- viewNoticeDivider.visibility = View.VISIBLE
- viewFmDivider.visibility = View.GONE
- viewIpcReportDivider.visibility = View.GONE
- viewBadCaseDivider.visibility = View.GONE
+ tvMsgNotice.setTextColor(ContextCompat.getColor(context, R.color.msg_box_title_color))
+ tvMsgFm.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
+ tvMsgIpcReport.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
+ tvMsgBadCase.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
+ tvMsgNotice.setBackgroundResource(R.drawable.bg_msg_box_title_selected)
+ tvMsgFm.background = null
+ tvMsgIpcReport.background = null
+ tvMsgBadCase.background = null
MsgBoxConfig.setUserRecord(0)
if(noticeList==null){
rvMsgBoxList.visibility = View.GONE
@@ -91,14 +90,14 @@ class DriverMsgBoxListView @JvmOverloads constructor(
}
//FM信息
tvMsgFm.setOnClickListener {
- tvMsgNotice.setTextColor(resources.getColor(R.color.color_FFFFFF))
- tvMsgFm.setTextColor(resources.getColor(R.color.msg_box_title_color))
- tvMsgIpcReport.setTextColor(resources.getColor(R.color.color_FFFFFF))
- tvMsgBadCase.setTextColor(resources.getColor(R.color.color_FFFFFF))
- viewNoticeDivider.visibility = View.GONE
- viewFmDivider.visibility = View.VISIBLE
- viewIpcReportDivider.visibility = View.GONE
- viewBadCaseDivider.visibility = View.GONE
+ tvMsgNotice.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
+ tvMsgFm.setTextColor(ContextCompat.getColor(context, R.color.msg_box_title_color))
+ tvMsgIpcReport.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
+ tvMsgBadCase.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
+ tvMsgNotice.background = null
+ tvMsgFm.setBackgroundResource(R.drawable.bg_msg_box_title_selected)
+ tvMsgIpcReport.background = null
+ tvMsgBadCase.background = null
MsgBoxConfig.setUserRecord(1)
if(fmList == null){
rvMsgBoxList.visibility = View.GONE
@@ -110,14 +109,14 @@ class DriverMsgBoxListView @JvmOverloads constructor(
}
//车辆系统信息
tvMsgIpcReport.setOnClickListener {
- tvMsgNotice.setTextColor(resources.getColor(R.color.color_FFFFFF))
- tvMsgFm.setTextColor(resources.getColor(R.color.color_FFFFFF))
- tvMsgIpcReport.setTextColor(resources.getColor(R.color.msg_box_title_color))
- tvMsgBadCase.setTextColor(resources.getColor(R.color.color_FFFFFF))
- viewNoticeDivider.visibility = View.GONE
- viewFmDivider.visibility = View.GONE
- viewIpcReportDivider.visibility = View.VISIBLE
- viewBadCaseDivider.visibility = View.GONE
+ tvMsgNotice.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
+ tvMsgFm.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
+ tvMsgIpcReport.setTextColor(ContextCompat.getColor(context, R.color.msg_box_title_color))
+ tvMsgBadCase.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
+ tvMsgNotice.background = null
+ tvMsgFm.background = null
+ tvMsgIpcReport.setBackgroundResource(R.drawable.bg_msg_box_title_selected)
+ tvMsgBadCase.background = null
MsgBoxConfig.setUserRecord(2)
if(ipcReportList == null){
rvMsgBoxList.visibility = View.GONE
@@ -130,14 +129,14 @@ class DriverMsgBoxListView @JvmOverloads constructor(
}
//录包
tvMsgBadCase.setOnClickListener {
- tvMsgNotice.setTextColor(resources.getColor(R.color.color_FFFFFF))
- tvMsgFm.setTextColor(resources.getColor(R.color.color_FFFFFF))
- tvMsgIpcReport.setTextColor(resources.getColor(R.color.color_FFFFFF))
- tvMsgBadCase.setTextColor(resources.getColor(R.color.msg_box_title_color))
- viewNoticeDivider.visibility = View.GONE
- viewFmDivider.visibility = View.GONE
- viewIpcReportDivider.visibility = View.GONE
- viewBadCaseDivider.visibility = View.VISIBLE
+ tvMsgNotice.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
+ tvMsgFm.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
+ tvMsgIpcReport.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
+ tvMsgBadCase.setTextColor(ContextCompat.getColor(context, R.color.msg_box_title_color))
+ tvMsgNotice.background = null
+ tvMsgFm.background = null
+ tvMsgIpcReport.background = null
+ tvMsgBadCase.setBackgroundResource(R.drawable.bg_msg_box_title_selected)
MsgBoxConfig.setUserRecord(3)
if(badCaseList == null){
rvMsgBoxList.visibility = View.GONE
@@ -155,14 +154,14 @@ class DriverMsgBoxListView @JvmOverloads constructor(
when(MsgBoxConfig.getUserRecord()){
//通知消息
0 ->{
- tvMsgNotice.setTextColor(resources.getColor(R.color.msg_box_title_color))
- tvMsgFm.setTextColor(resources.getColor(R.color.color_FFFFFF))
- tvMsgIpcReport.setTextColor(resources.getColor(R.color.color_FFFFFF))
- tvMsgBadCase.setTextColor(resources.getColor(R.color.color_FFFFFF))
- viewNoticeDivider.visibility = View.VISIBLE
- viewFmDivider.visibility = View.GONE
- viewIpcReportDivider.visibility = View.GONE
- viewBadCaseDivider.visibility = View.GONE
+ tvMsgNotice.setTextColor(ContextCompat.getColor(context, R.color.msg_box_title_color))
+ tvMsgFm.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
+ tvMsgIpcReport.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
+ tvMsgBadCase.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
+ tvMsgNotice.setBackgroundResource(R.drawable.bg_msg_box_title_selected)
+ tvMsgFm.background = null
+ tvMsgIpcReport.background = null
+ tvMsgBadCase.background = null
if(noticeList==null){
rvMsgBoxList.visibility = View.GONE
}else{
@@ -173,14 +172,14 @@ class DriverMsgBoxListView @JvmOverloads constructor(
}
//FM消息
1->{
- tvMsgNotice.setTextColor(resources.getColor(R.color.color_FFFFFF))
- tvMsgFm.setTextColor(resources.getColor(R.color.msg_box_title_color))
- tvMsgIpcReport.setTextColor(resources.getColor(R.color.color_FFFFFF))
- tvMsgBadCase.setTextColor(resources.getColor(R.color.color_FFFFFF))
- viewNoticeDivider.visibility = View.GONE
- viewFmDivider.visibility = View.VISIBLE
- viewIpcReportDivider.visibility = View.GONE
- viewBadCaseDivider.visibility = View.GONE
+ tvMsgNotice.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
+ tvMsgFm.setTextColor(ContextCompat.getColor(context, R.color.msg_box_title_color))
+ tvMsgIpcReport.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
+ tvMsgBadCase.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
+ tvMsgNotice.background = null
+ tvMsgFm.setBackgroundResource(R.drawable.bg_msg_box_title_selected)
+ tvMsgIpcReport.background = null
+ tvMsgBadCase.background = null
if(fmList == null){
rvMsgBoxList.visibility = View.GONE
}else{
@@ -191,14 +190,14 @@ class DriverMsgBoxListView @JvmOverloads constructor(
}
//车辆系统信息消息
2 ->{
- tvMsgNotice.setTextColor(resources.getColor(R.color.color_FFFFFF))
- tvMsgFm.setTextColor(resources.getColor(R.color.color_FFFFFF))
- tvMsgIpcReport.setTextColor(resources.getColor(R.color.msg_box_title_color))
- tvMsgBadCase.setTextColor(resources.getColor(R.color.color_FFFFFF))
- viewNoticeDivider.visibility = View.GONE
- viewFmDivider.visibility = View.GONE
- viewIpcReportDivider.visibility = View.VISIBLE
- viewBadCaseDivider.visibility = View.GONE
+ tvMsgNotice.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
+ tvMsgFm.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
+ tvMsgIpcReport.setTextColor(ContextCompat.getColor(context, R.color.msg_box_title_color))
+ tvMsgBadCase.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
+ tvMsgNotice.background = null
+ tvMsgFm.background = null
+ tvMsgIpcReport.setBackgroundResource(R.drawable.bg_msg_box_title_selected)
+ tvMsgBadCase.background = null
if(ipcReportList == null){
rvMsgBoxList.visibility = View.GONE
}else{
@@ -209,14 +208,14 @@ class DriverMsgBoxListView @JvmOverloads constructor(
}
//录包消息
3 ->{
- tvMsgNotice.setTextColor(resources.getColor(R.color.color_FFFFFF))
- tvMsgFm.setTextColor(resources.getColor(R.color.color_FFFFFF))
- tvMsgIpcReport.setTextColor(resources.getColor(R.color.color_FFFFFF))
- tvMsgBadCase.setTextColor(resources.getColor(R.color.msg_box_title_color))
- viewNoticeDivider.visibility = View.GONE
- viewFmDivider.visibility = View.GONE
- viewIpcReportDivider.visibility = View.GONE
- viewBadCaseDivider.visibility = View.VISIBLE
+ tvMsgNotice.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
+ tvMsgFm.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
+ tvMsgIpcReport.setTextColor(ContextCompat.getColor(context, R.color.color_FFFFFF))
+ tvMsgBadCase.setTextColor(ContextCompat.getColor(context, R.color.msg_box_title_color))
+ tvMsgNotice.background = null
+ tvMsgFm.background = null
+ tvMsgIpcReport.background = null
+ tvMsgBadCase.setBackgroundResource(R.drawable.bg_msg_box_title_selected)
if(badCaseList == null){
rvMsgBoxList.visibility = View.GONE
}else{
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_msg_box_title_selected.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_msg_box_title_selected.png
new file mode 100644
index 0000000000..3e55aedf30
Binary files /dev/null and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_msg_box_title_selected.png differ
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_msg_bad_case.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_msg_bad_case.png
index ac98617e0f..49d7f59293 100644
Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_msg_bad_case.png and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_msg_bad_case.png differ
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_bad_case.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_bad_case.xml
index af88b8a41b..839a7adef1 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_bad_case.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_bad_case.xml
@@ -1,28 +1,24 @@
+ android:focusable="true">
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_driver_msg_box_list.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_driver_msg_box_list.xml
index 82cc0ab41b..39a207eca3 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_driver_msg_box_list.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_driver_msg_box_list.xml
@@ -1,103 +1,70 @@
-
-
+
-
-
-
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml
index 2132872531..4e1f31876e 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml
@@ -10,7 +10,7 @@
#3B4577
#256BFF
- #FF1BB7FF
+ #FF2EACFF
#6200EE
#3700B3
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 85ef34f995..d20568e1bf 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
@@ -173,4 +173,17 @@
主驾
副驾
后排
+
+
+ 通知
+ FM信息
+ 系统信息
+ 录包
+ 录包图标
+ 录包提醒
+ 查看
+ 系统信息图标
+ 收起
+ 展开
+