diff --git a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKBoardView.kt b/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKBoardView.kt index 12a2bf9e4..0afab27d5 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKBoardView.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKBoardView.kt @@ -137,11 +137,9 @@ class RoomPKBoardView @JvmOverloads constructor( binding.tvTime.text = roomPkBean?.endTime?.let { val remainTime = (it - CurrentTimeUtils.getCurrentTime()).toInt() / 1000 binding.tvTime.setTextColor(Color.parseColor(if (remainTime <= 30) "#ff87a1" else "#fff600")) - if (remainTime <= 0) { - "PK结果计算中" - } else { - TimeUtil.secToTime(remainTime) - } + binding.tvTime.isVisible = remainTime > 0 + binding.tvEndHint.isVisible = remainTime <= 0 + TimeUtil.secToTime(remainTime) } ?: "00:00" } } diff --git a/app/src/main/res/layout/layout_room_pk_board_view.xml b/app/src/main/res/layout/layout_room_pk_board_view.xml index a7fbc43d1..46d9f2c5c 100644 --- a/app/src/main/res/layout/layout_room_pk_board_view.xml +++ b/app/src/main/res/layout/layout_room_pk_board_view.xml @@ -22,6 +22,21 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + +