[6.2.0]司机端消息盒子列表增加FM信息Title

2023-11-08 20:09:45 +08:00
parent 03060239c7
commit 7f834b1ff7
2 changed files with 97 additions and 20 deletions
--- 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
@@ -45,9 +45,10 @@ class DriverMsgBoxListView @JvmOverloads constructor(
        initView()
    }
    private val TAG =  "DriverMsgBoxListView"
-    private var noticeList: ArrayList<MsgBoxBean> ?= null
-    private var ipcReportList: ArrayList<MsgBoxBean> ?= null
-    private var badCaseList: ArrayList<MsgBoxBean> ?= null
+    private var noticeList: ArrayList<MsgBoxBean> ?= null //通知消息列表
+    private var fmList: ArrayList<MsgBoxBean> ?= null //FM信息消息列表
+    private var ipcReportList: ArrayList<MsgBoxBean> ?= null //车辆系统信息消息列表
+    private var badCaseList: ArrayList<MsgBoxBean> ?= null//录包消息列表
    private var driverMsgBoxListAdapter: DriverMsgBoxListAdapter ?=null
    private var linearLayoutManager: LinearLayoutManager ?= null

@@ -71,9 +72,11 @@ class DriverMsgBoxListView @JvmOverloads constructor(
        //通知
        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
            MsgBoxConfig.setUserRecord(0)
@@ -86,15 +89,36 @@ 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
+            MsgBoxConfig.setUserRecord(1)
+            if(fmList == null){
+                rvMsgBoxList.visibility = View.GONE
+            }else{
+                driverMsgBoxListAdapter?.setData(fmList!!)
+                rvMsgBoxList.visibility = View.VISIBLE
+                rvMsgBoxList.scrollToPosition(0)
+            }
+        }
        //车辆系统信息
        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
-            MsgBoxConfig.setUserRecord(1)
+            MsgBoxConfig.setUserRecord(2)
            if(ipcReportList == null){
                rvMsgBoxList.visibility = View.GONE
            }else{
@@ -107,12 +131,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
-            MsgBoxConfig.setUserRecord(2)
+            MsgBoxConfig.setUserRecord(3)
            if(badCaseList == null){
                rvMsgBoxList.visibility = View.GONE
            }else{
@@ -127,11 +153,14 @@ class DriverMsgBoxListView @JvmOverloads constructor(
    fun notifyData(){
        //获取当前Tab选择
        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
                if(noticeList==null){
@@ -142,11 +171,32 @@ class DriverMsgBoxListView @JvmOverloads constructor(
                    rvMsgBoxList.scrollToPosition(0)
                }
            }
-            1 ->{
+            //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
+                if(fmList == null){
+                    rvMsgBoxList.visibility = View.GONE
+                }else{
+                    driverMsgBoxListAdapter?.setData(fmList!!)
+                    rvMsgBoxList.visibility = View.VISIBLE
+                    rvMsgBoxList.scrollToPosition(0)
+                }
+            }
+            //车辆系统信息消息
+            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
                if(ipcReportList == null){
@@ -157,11 +207,14 @@ class DriverMsgBoxListView @JvmOverloads constructor(
                    rvMsgBoxList.scrollToPosition(0)
                }
            }
-            2 ->{
+            //录包消息
+            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
                if(badCaseList == null){
--- 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
@@ -8,11 +8,11 @@

    <TextView
        android:id="@+id/tvMsgNotice"
-        android:layout_width="288dp"
-        android:layout_height="90dp"
+        android:layout_width="@dimen/dp_216"
+        android:layout_height="@dimen/dp_90"
        android:text="通知"
        android:textColor="@color/msg_box_title_color"
-        android:textSize="38dp"
+        android:textSize="@dimen/sp_38"
        app:layout_constraintTop_toTopOf="parent"
        app:layout_constraintLeft_toLeftOf="parent"
        android:gravity="center"
@@ -29,15 +29,39 @@
        />

    <TextView
-        android:id="@+id/tvMsgIpcReport"
-        android:layout_width="288dp"
-        android:layout_height="90dp"
-        android:text="车辆系统信息"
+        android:id="@+id/tvMsgFm"
+        android:layout_width="@dimen/dp_216"
+        android:layout_height="@dimen/dp_90"
+        android:text="FM信息"
        android:textColor="#FFFFFFFF"
-        android:textSize="38dp"
+        android:textSize="@dimen/sp_38"
        android:gravity="center"
        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:textColor="#FFFFFFFF"
+        android:textSize="@dimen/sp_38"
+        android:gravity="center"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toRightOf="@id/tvMsgFm"
        app:layout_constraintRight_toLeftOf="@id/tvMsgBadCase"
        />

@@ -54,11 +78,11 @@

    <TextView
        android:id="@+id/tvMsgBadCase"
-        android:layout_width="288dp"
-        android:layout_height="90dp"
+        android:layout_width="@dimen/dp_216"
+        android:layout_height="@dimen/dp_90"
        android:text="录包"
        android:textColor="#FFFFFFFF"
-        android:textSize="38dp"
+        android:textSize="@dimen/sp_38"
        android:gravity="center"
        app:layout_constraintTop_toTopOf="parent"
        app:layout_constraintRight_toRightOf="parent"
@@ -78,10 +102,10 @@
    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/rvMsgBoxList"
        android:layout_width="match_parent"
-        android:layout_height="0dp"
+        android:layout_height="@dimen/dp_0"
        app:layout_constraintTop_toBottomOf="@id/tvMsgIpcReport"
        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="@dimen/dp_20"
        app:layout_constraintLeft_toLeftOf="parent"
        app:layout_constraintRight_toRightOf="parent"
        />