From 82e8f993865518c08305f71aa968cbadedb960b3 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Fri, 27 Sep 2024 10:10:08 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.0]UI=E6=94=B9=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hmi/bone/tab/adapter/MsgBoxTabAdapter.kt | 6 ---- .../src/main/res/layout/item_tab_bad_case.xml | 2 +- .../src/main/res/layout/item_tab_fm.xml | 31 +++++++------------ .../main/res/layout/item_tab_ipc_report.xml | 28 +++++++---------- 4 files changed, 24 insertions(+), 43 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/adapter/MsgBoxTabAdapter.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/adapter/MsgBoxTabAdapter.kt index abfa103b25..9b840e0ed4 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/adapter/MsgBoxTabAdapter.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/adapter/MsgBoxTabAdapter.kt @@ -183,8 +183,6 @@ class MsgBoxTabAdapter(private val activity: Activity) : //时间显示 holder.tvFmTime.text = "时间：${fmInfoMsg.policyTime?.let { it1 -> TimeUtils.millis2String(it1) }}" - holder.tvFmTime.text = - fmInfoMsg.policyTime?.let { it1 -> TimeUtils.millis2String(it1,getHourMinFormat()) } //建议操作 if(fmInfoMsg.fmInfoList.isNullOrEmpty()){ //建议操作暂无 @@ -361,8 +359,6 @@ class MsgBoxTabAdapter(private val activity: Activity) : holder.tvReportTime.text = "时间：${TimeUtils.millis2String(it[position].timestamp)}" - holder.tvReportShowTime.text = - TimeUtils.millis2String(it[position].timestamp, getHourMinFormat()) var resultStr = "类型：" for (result in reportEntity.resultList) { resultStr = @@ -612,7 +608,6 @@ class MsgBoxTabAdapter(private val activity: Activity) : class FmInfoHolder(itemView: View) : RecyclerView.ViewHolder(itemView){ var ivFmImage: ImageView = itemView.findViewById(R.id.ivFmImage) //故障级别图标 var tvFmTitle: TextView = itemView.findViewById(R.id.tvFmTitle) //标题展示故障策略 - var tvFmShowTime: TextView = itemView.findViewById(R.id.tvFmShowTime) //展示时间 var tvFmShowStatus: TextView = itemView.findViewById(R.id.tvFmShowStatus) //折叠状态 var tvFmTime: TextView = itemView.findViewById(R.id.tvFmTime) //发生时间 var tvFmAction: TextView = itemView.findViewById(R.id.tvFmAction) //建议操作 @@ -630,7 +625,6 @@ class MsgBoxTabAdapter(private val activity: Activity) : var tvReportReason: TextView = itemView.findViewById(R.id.tvReportReason) var tvReportSrc: TextView = itemView.findViewById(R.id.tvReportSrc) var tvReportAction: TextView = itemView.findViewById(R.id.tvReportAction) - var tvReportShowTime: TextView = itemView.findViewById(R.id.tvReportShowTime) var tvReportShowStatus: TextView = itemView.findViewById(R.id.tvReportShowStatus) } 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 index 839a7adef1..ea54011cf0 100644 --- 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 @@ -1,7 +1,7 @@ - - - @@ -59,7 +51,7 @@ android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@id/tvFmTitle" app:layout_constraintLeft_toLeftOf="@id/tvFmTitle" - app:layout_constraintRight_toLeftOf="@id/tvFmShowTime" + app:layout_constraintRight_toRightOf="@id/tvFmShowStatus" android:textColor="#CCCCCC" android:textSize="@dimen/sp_32" /> @@ -71,7 +63,7 @@ android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@id/tvFmTime" app:layout_constraintLeft_toLeftOf="@id/tvFmTime" - app:layout_constraintRight_toLeftOf="@id/tvFmShowTime" + app:layout_constraintRight_toRightOf="@id/tvFmShowStatus" android:textColor="#CCCCCC" android:textSize="@dimen/sp_32" /> @@ -83,7 +75,7 @@ android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@id/tvFmAction" app:layout_constraintLeft_toLeftOf="@id/tvFmAction" - app:layout_constraintRight_toLeftOf="@id/tvFmShowTime" + app:layout_constraintRight_toRightOf="@id/tvFmShowStatus" android:textColor="#CCCCCC" android:textSize="@dimen/sp_32" android:visibility="gone" @@ -96,7 +88,7 @@ android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@id/tvFmFault" app:layout_constraintLeft_toLeftOf="@id/tvFmFault" - app:layout_constraintRight_toLeftOf="@id/tvFmShowTime" + app:layout_constraintRight_toRightOf="@id/tvFmShowStatus" android:textColor="#CCCCCC" android:textSize="@dimen/sp_32" android:visibility="gone" @@ -109,7 +101,8 @@ android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@id/tvFmReason" app:layout_constraintLeft_toLeftOf="@id/tvFmReason" - app:layout_constraintRight_toLeftOf="@id/tvFmShowTime" + app:layout_constraintRight_toRightOf="@id/tvFmShowStatus" + android:paddingBottom="@dimen/dp_30" android:textColor="#CCCCCC" android:textSize="@dimen/sp_32" android:visibility="gone" diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_tab_ipc_report.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_tab_ipc_report.xml index c665b26351..ba364ff59a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_tab_ipc_report.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_tab_ipc_report.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" app:layout_constraintTop_toTopOf="@id/ivReportImage" app:layout_constraintLeft_toRightOf="@id/ivReportImage" - app:layout_constraintRight_toLeftOf="@id/tvReportShowTime" + app:layout_constraintRight_toLeftOf="@id/tvReportShowStatus" android:textColor="@color/white" android:textSize="@dimen/sp_38" android:layout_marginStart="@dimen/dp_30" @@ -32,7 +32,7 @@ android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@id/tvReportLevel" app:layout_constraintLeft_toLeftOf="@id/tvReportLevel" - app:layout_constraintRight_toLeftOf="@id/tvReportShowTime" + app:layout_constraintRight_toRightOf="@id/tvReportShowStatus" android:textSize="@dimen/sp_32" android:textColor="#CCCCCC" /> @@ -43,7 +43,7 @@ android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@id/tvReportTime" app:layout_constraintLeft_toLeftOf="@id/tvReportTime" - app:layout_constraintRight_toLeftOf="@id/tvReportShowTime" + app:layout_constraintRight_toRightOf="@id/tvReportShowStatus" android:textSize="@dimen/sp_32" android:textColor="#CCCCCC" /> @@ -54,7 +54,7 @@ android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@id/tvReportType" app:layout_constraintLeft_toLeftOf="@id/tvReportType" - app:layout_constraintRight_toLeftOf="@id/tvReportShowTime" + app:layout_constraintRight_toRightOf="@id/tvReportShowStatus" android:textSize="@dimen/sp_32" android:textColor="#CCCCCC" android:visibility="gone" @@ -66,7 +66,7 @@ android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@id/tvReportReason" app:layout_constraintLeft_toLeftOf="@id/tvReportReason" - app:layout_constraintRight_toLeftOf="@id/tvReportShowTime" + app:layout_constraintRight_toRightOf="@id/tvReportShowStatus" android:textSize="@dimen/sp_32" android:textColor="#CCCCCC" android:visibility="gone" @@ -78,32 +78,26 @@ android:layout_height="wrap_content" app:layout_constraintTop_toBottomOf="@id/tvReportSrc" app:layout_constraintLeft_toLeftOf="@id/tvReportSrc" - app:layout_constraintRight_toLeftOf="@id/tvReportShowTime" + app:layout_constraintRight_toRightOf="@id/tvReportShowStatus" + android:paddingBottom="@dimen/dp_30" android:textSize="@dimen/sp_32" android:textColor="#CCCCCC" android:visibility="gone" /> - - \ No newline at end of file