From 07c4d8ce7b6f1ccb67fa6e6c881c6f3a9478e6fe Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Thu, 1 Dec 2022 18:10:50 +0800 Subject: [PATCH] =?UTF-8?q?[2.13.0]=E6=B6=88=E6=81=AF=E7=9B=92=E5=AD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt | 10 ++++++++++ .../ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt | 12 ++++++++++++ .../src/main/res/layout/item_msg_bubble_report.xml | 4 ++-- .../main/res/layout/layout_driver_msg_box_bubble.xml | 3 +++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt index 850ee0abee..132c596908 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt @@ -5,6 +5,7 @@ import android.content.Context import android.util.AttributeSet import android.util.Log import android.view.LayoutInflater +import android.view.View import android.widget.LinearLayout import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.view.marginTop @@ -52,6 +53,14 @@ class DriverMsgBoxBubbleView @JvmOverloads constructor( linearLayoutManager.stackFromEnd = true linearLayoutManager.reverseLayout = true driverMsgBoxBubbleAdapter = DriverMsgBoxBubbleAdapter(context as Activity) + driverMsgBoxBubbleAdapter?.setChangeListener(object : DriverMsgBoxBubbleAdapter.ChangeViewListener{ + override fun notifyView() { + if(dataList.isEmpty()){ + rvBubbleList.visibility = View.GONE + } + } + + }) rvBubbleList.adapter = driverMsgBoxBubbleAdapter rvBubbleList.layoutManager = linearLayoutManager } @@ -71,6 +80,7 @@ class DriverMsgBoxBubbleView @JvmOverloads constructor( //弹出被动录包弹窗 CallerDevaToolsManager.onReceiveBadCaseRecord(msgBoxBean,context as Activity,true) }else{ + rvBubbleList.visibility = View.VISIBLE dataList.add(msgBoxBean) driverMsgBoxBubbleAdapter?.setData(dataList) } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt index f38b50cf54..4a2796dfe6 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/adapter/DriverMsgBoxBubbleAdapter.kt @@ -36,6 +36,7 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A private val report: Int = 4 var countDownTimer: CountDownTimer?=null + private var changeViewListener: ChangeViewListener?=null fun setData(data: ArrayList){ this.data = data @@ -133,6 +134,7 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A override fun onFinish() { data?.remove(msgBoxBean) + changeViewListener?.notifyView() notifyDataSetChanged() // notifyItemRemoved(index) // notifyItemRangeChanged(index,recordTypeEntity.size-index) @@ -186,4 +188,14 @@ class DriverMsgBoxBubbleAdapter(private val activity: Activity) : RecyclerView.A var tvV2XContent: TextView = itemView.findViewById(R.id.tvV2XContent) } + fun setChangeListener(listener: ChangeViewListener){ + changeViewListener = listener + } + + interface ChangeViewListener{ + + fun notifyView() + + } + } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_report.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_report.xml index ef88df2f4e..51a11c2d5a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_report.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_report.xml @@ -42,7 +42,7 @@ android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@id/tvBubbleReportTitle" app:layout_constraintLeft_toLeftOf="@id/tvBubbleReportTitle" - android:layout_marginTop="20px" + android:layout_marginTop="10px" android:textColor="#B3FFFFFF" android:textSize="28px" /> @@ -53,7 +53,7 @@ android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@id/tvBubbleReportTime" app:layout_constraintLeft_toLeftOf="@id/tvBubbleReportTime" - android:layout_marginTop="15px" + android:layout_marginTop="10px" android:textColor="#B3FFFFFF" android:textSize="28px" /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_driver_msg_box_bubble.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_driver_msg_box_bubble.xml index d19a8b43e1..d2aca6cd46 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_driver_msg_box_bubble.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_driver_msg_box_bubble.xml @@ -10,6 +10,9 @@ android:id="@+id/rvBubbleList" android:layout_width="match_parent" android:layout_height="match_parent" + android:paddingTop="10px" + android:paddingBottom="10px" + android:visibility="gone" /> \ No newline at end of file