[6.7.0]消息盒子UI调整

This commit is contained in:
xuxinchao
2024-09-20 14:08:57 +08:00
parent cd12408c50
commit 879b3418e4
7 changed files with 133 additions and 155 deletions

View File

@@ -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{

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

View File

@@ -1,28 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<com.mogo.eagle.core.widget.RoundConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/layoutBadCase"
android:layout_width="804dp"
android:layout_height="160dp"
android:layout_width="@dimen/dp_773"
android:layout_height="@dimen/dp_180"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="#53000000"
app:roundLayoutRadius="24dp"
android:layout_gravity="center_horizontal"
android:layout_marginStart="30dp"
android:layout_marginEnd="30dp"
android:layout_marginTop="7dp"
android:layout_marginBottom="7dp"
android:clickable="true"
>
android:focusable="true">
<ImageView
android:id="@+id/ivBadCaseImage"
android:layout_width="110dp"
android:layout_height="110dp"
android:layout_width="@dimen/dp_120"
android:layout_height="@dimen/dp_120"
android:src="@drawable/icon_msg_bad_case"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
android:layout_marginStart="25dp"
android:contentDescription="@string/bad_case_icon"
android:layout_marginTop="@dimen/dp_30"
android:layout_marginBottom="@dimen/dp_30"
/>
<TextView
@@ -31,10 +27,10 @@
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="@id/ivBadCaseImage"
app:layout_constraintLeft_toRightOf="@id/ivBadCaseImage"
android:text="录包提醒"
android:textColor="#FFFFFFFF"
android:textSize="32dp"
android:layout_marginStart="25dp"
android:text="@string/bad_case_record_tip"
android:textColor="@color/white"
android:textSize="@dimen/sp_38"
android:layout_marginStart="@dimen/dp_30"
/>
<TextView
@@ -43,9 +39,9 @@
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="@id/ivBadCaseImage"
app:layout_constraintLeft_toRightOf="@id/ivBadCaseImage"
android:layout_marginStart="25dp"
android:textColor="#B3FFFFFF"
android:textSize="30dp"
android:layout_marginStart="@dimen/dp_30"
android:textColor="#CCCCCC"
android:textSize="@dimen/sp_32"
/>
<TextView
@@ -54,9 +50,9 @@
android:layout_height="wrap_content"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@id/tvRecordTip"
android:textColor="#80FFFFFF"
android:textSize="24dp"
android:layout_marginEnd="25dp"
app:layout_constraintBottom_toBottomOf="@id/tvRecordTip"
android:textColor="#999999"
android:textSize="@dimen/sp_32"
/>
<TextView
@@ -66,11 +62,13 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@id/tvBagRecordTime"
app:layout_constraintBottom_toBottomOf="@id/tvBagRecordTime"
android:paddingEnd="25dp"
android:paddingStart="20dp"
android:text="查看"
android:textColor="#FFFFFFFF"
android:textSize="30dp"
android:paddingStart="@dimen/dp_20"
android:paddingEnd="@dimen/dp_0"
android:paddingTop="@dimen/dp_10"
android:paddingBottom="@dimen/dp_10"
android:text="@string/bad_case_check"
android:textColor="#2EACFF"
android:textSize="@dimen/sp_32"
/>
</com.mogo.eagle.core.widget.RoundConstraintLayout>

View File

@@ -1,103 +1,70 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="864dp"
android:layout_height="746dp"
android:layout_width="@dimen/dp_880"
android:layout_height="@dimen/dp_997"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@drawable/bg_msg_box"
>
<TextView
android:id="@+id/tvMsgNotice"
android:layout_width="@dimen/dp_216"
android:layout_height="@dimen/dp_90"
android:text="通知"
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:textSize="@dimen/sp_38"
android:textSize="@dimen/sp_40"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
android:gravity="center"
/>
<View
android:id="@+id/viewNoticeDivider"
android:layout_width="62.7dp"
android:layout_height="5dp"
android:background="@drawable/bg_msg_box_divider"
app:layout_constraintLeft_toLeftOf="@id/tvMsgNotice"
app:layout_constraintRight_toRightOf="@id/tvMsgNotice"
app:layout_constraintBottom_toBottomOf="@id/tvMsgNotice"
android:layout_marginStart="@dimen/dp_26"
android:paddingTop="@dimen/dp_38"
android:gravity="center_horizontal"
/>
<TextView
android:id="@+id/tvMsgFm"
android:layout_width="@dimen/dp_216"
android:layout_height="@dimen/dp_90"
android:text="FM信息"
android:layout_width="@dimen/dp_154"
android:layout_height="@dimen/dp_113"
android:text="@string/msg_box_title_fm"
android:textColor="#FFFFFFFF"
android:textSize="@dimen/sp_38"
android:gravity="center"
android:textSize="@dimen/sp_40"
android:gravity="center_horizontal"
android:paddingTop="@dimen/dp_38"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toRightOf="@id/tvMsgNotice"
app:layout_constraintRight_toLeftOf="@id/tvMsgIpcReport"
/>
<View
android:id="@+id/viewFmDivider"
android:layout_width="62.7dp"
android:layout_height="5dp"
android:background="@drawable/bg_msg_box_divider"
app:layout_constraintLeft_toLeftOf="@id/tvMsgFm"
app:layout_constraintRight_toRightOf="@id/tvMsgFm"
app:layout_constraintBottom_toBottomOf="@id/tvMsgFm"
android:visibility="gone"
/>
<TextView
android:id="@+id/tvMsgIpcReport"
android:layout_width="@dimen/dp_216"
android:layout_height="@dimen/dp_90"
android:text="系统信息"
android:layout_width="@dimen/dp_154"
android:layout_height="@dimen/dp_113"
android:text="@string/msg_box_title_report"
android:textColor="#FFFFFFFF"
android:textSize="@dimen/sp_38"
android:gravity="center"
android:gravity="center_horizontal"
android:paddingTop="@dimen/dp_38"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toRightOf="@id/tvMsgFm"
app:layout_constraintRight_toLeftOf="@id/tvMsgBadCase"
/>
<View
android:id="@+id/viewIpcReportDivider"
android:layout_width="62.7dp"
android:layout_height="5dp"
android:background="@drawable/bg_msg_box_divider"
app:layout_constraintLeft_toLeftOf="@id/tvMsgIpcReport"
app:layout_constraintRight_toRightOf="@id/tvMsgIpcReport"
app:layout_constraintBottom_toBottomOf="@id/tvMsgIpcReport"
android:visibility="gone"
/>
<TextView
android:id="@+id/tvMsgBadCase"
android:layout_width="@dimen/dp_216"
android:layout_height="@dimen/dp_90"
android:text="录包"
android:layout_width="@dimen/dp_154"
android:layout_height="@dimen/dp_113"
android:text="@string/msg_box_title_bad_case"
android:textColor="#FFFFFFFF"
android:textSize="@dimen/sp_38"
android:gravity="center"
android:textSize="@dimen/sp_40"
android:gravity="center_horizontal"
android:paddingTop="@dimen/dp_38"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:layout_marginEnd="@dimen/dp_26"
/>
<View
android:id="@+id/viewBadCaseDivider"
android:layout_width="62.7dp"
android:layout_height="5dp"
android:background="@drawable/bg_msg_box_divider"
app:layout_constraintLeft_toLeftOf="@id/tvMsgBadCase"
app:layout_constraintRight_toRightOf="@id/tvMsgBadCase"
app:layout_constraintBottom_toBottomOf="@id/tvMsgBadCase"
android:visibility="gone"
/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvMsgBoxList"
@@ -108,6 +75,7 @@
android:layout_marginTop="@dimen/dp_20"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
/>
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -10,7 +10,7 @@
<color name="notice_dialog_back">#3B4577</color>
<color name="notice_video_progressbar_loading_color">#256BFF</color>
<color name="msg_box_title_color">#FF1BB7FF</color>
<color name="msg_box_title_color">#FF2EACFF</color>
<color name="colorPrimary">#6200EE</color>
<color name="colorPrimaryDark">#3700B3</color>

View File

@@ -173,4 +173,17 @@
<string name="hmi_main_driver">主驾</string>
<string name="hmi_co_driver">副驾</string>
<string name="hmi_rear_row">后排</string>
<!--消息盒子-->
<string name="msg_box_title_notice">通知</string>
<string name="msg_box_title_fm">FM信息</string>
<string name="msg_box_title_report">系统信息</string>
<string name="msg_box_title_bad_case">录包</string>
<string name="bad_case_icon">录包图标</string>
<string name="bad_case_record_tip">录包提醒</string>
<string name="bad_case_check">查看</string>
<string name="report_icon">系统信息图标</string>
<string name="report_retract">收起</string>
<string name="report_open">展开</string>
</resources>