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 3027795e8b..ca4e1d1adb 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,6 +21,7 @@ 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
@@ -70,14 +71,14 @@ class DriverMsgBoxListView @JvmOverloads constructor(
badCaseList = badCaseList?.let { ArrayList(it.reversed()) }
//通知
tvMsgNotice.setOnClickListener {
- 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
+ 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
MsgBoxConfig.setUserRecord(0)
if(noticeList==null){
rvMsgBoxList.visibility = View.GONE
@@ -90,14 +91,14 @@ class DriverMsgBoxListView @JvmOverloads constructor(
}
//FM信息
tvMsgFm.setOnClickListener {
- 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
+ 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
MsgBoxConfig.setUserRecord(1)
if(fmList == null){
rvMsgBoxList.visibility = View.GONE
@@ -109,14 +110,14 @@ class DriverMsgBoxListView @JvmOverloads constructor(
}
//车辆系统信息
tvMsgIpcReport.setOnClickListener {
- 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
+ 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
MsgBoxConfig.setUserRecord(2)
if(ipcReportList == null){
rvMsgBoxList.visibility = View.GONE
@@ -129,14 +130,14 @@ class DriverMsgBoxListView @JvmOverloads constructor(
}
//录包
tvMsgBadCase.setOnClickListener {
- 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)
+ 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
MsgBoxConfig.setUserRecord(3)
if(badCaseList == null){
rvMsgBoxList.visibility = View.GONE
@@ -154,14 +155,14 @@ class DriverMsgBoxListView @JvmOverloads constructor(
when(MsgBoxConfig.getUserRecord()){
//通知消息
0 ->{
- 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
+ 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
if(noticeList==null){
rvMsgBoxList.visibility = View.GONE
}else{
@@ -172,14 +173,14 @@ class DriverMsgBoxListView @JvmOverloads constructor(
}
//FM消息
1->{
- 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
+ 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
if(fmList == null){
rvMsgBoxList.visibility = View.GONE
}else{
@@ -190,14 +191,14 @@ class DriverMsgBoxListView @JvmOverloads constructor(
}
//车辆系统信息消息
2 ->{
- 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
+ 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
if(ipcReportList == null){
rvMsgBoxList.visibility = View.GONE
}else{
@@ -208,14 +209,14 @@ class DriverMsgBoxListView @JvmOverloads constructor(
}
//录包消息
3 ->{
- 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)
+ 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
if(badCaseList == null){
rvMsgBoxList.visibility = View.GONE
}else{
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 839a7adef1..61a3f72a1d 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,24 +1,28 @@
+ >
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_tab_bad_case.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_tab_bad_case.xml
new file mode 100644
index 0000000000..839a7adef1
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_tab_bad_case.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 39a207eca3..204776a7be 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,70 +1,103 @@
+
+
+
+
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_msg_box_tab.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_msg_box_tab.xml
index 39a207eca3..76fae3d457 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_msg_box_tab.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_msg_box_tab.xml
@@ -11,13 +11,14 @@
android:layout_width="@dimen/dp_154"
android:layout_height="@dimen/dp_113"
android:text="@string/msg_box_title_notice"
- android:textColor="@color/msg_box_title_color"
+ android:textColor="@color/msg_box_tab_title_color"
android:textSize="@dimen/sp_40"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
android:layout_marginStart="@dimen/dp_26"
android:paddingTop="@dimen/dp_38"
android:gravity="center_horizontal"
+ android:background="@drawable/bg_msg_box_title_selected"
/>
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 4e1f31876e..4aa138a031 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,8 @@
#3B4577
#256BFF
- #FF2EACFF
+ #FF1BB7FF
+ #FF2EACFF
#6200EE
#3700B3