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 bdbb2573f6..2106591153 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 @@ -45,9 +45,10 @@ class DriverMsgBoxListView @JvmOverloads constructor( initView() } private val TAG = "DriverMsgBoxListView" - private var noticeList: ArrayList ?= null - private var ipcReportList: ArrayList ?= null - private var badCaseList: ArrayList ?= null + private var noticeList: ArrayList ?= null //通知消息列表 + private var fmList: ArrayList ?= null //FM信息消息列表 + private var ipcReportList: ArrayList ?= null //车辆系统信息消息列表 + private var badCaseList: ArrayList ?= 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){ 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 aa8bb90aaa..82cc0ab41b 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 @@ -8,11 +8,11 @@ + + + + @@ -54,11 +78,11 @@