yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

个播PK:PK面板倒计时结束文案改为结果结束中

Browse Source
This commit is contained in:
huangjian
2022-04-20 17:30:30 +08:00
parent 4529722894
commit a2a6e674a0
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPKBoardView.kt
View File

@@ -96,9 +96,9 @@ class SingleRoomPKBoardView @JvmOverloads constructor(
binding.tvPk.text = "PK" binding.tvPk.text = "PK"
binding.tvTime.text = roomPkBean.endTime.let { binding.tvTime.text = roomPkBean.endTime.let {
val remainTime = (it - CurrentTimeUtils.getCurrentTime()).toInt() / 1000 val remainTime = (it - CurrentTimeUtils.getCurrentTime()).toInt() / 1000
binding.tvTime.setTextColor(Color.parseColor(if (remainTime <= 30) "#ff87a1" else "#fff600")) binding.tvTime.setTextColor(Color.parseColor(if (remainTime <= 30) "#ff87a1" else "#ffffff"))
TimeUtil.secToTime(remainTime) if (remainTime > 0) TimeUtil.secToTime(remainTime) else "结果结算中"
} ?: "00:00" } ?: "结果结算中"
} else { } else {
binding.tvPk.text = "惩罚时间" binding.tvPk.text = "惩罚时间"
binding.tvTime.text = roomPkBean?.penaltyEndTime?.let { binding.tvTime.text = roomPkBean?.penaltyEndTime?.let {

3
app/src/main/res/layout/layout_single_room_pk_notify.xml
View File

@@ -73,6 +73,7 @@
android:layout_marginStart="36dp" android:layout_marginStart="36dp"
android:layout_marginEnd="23dp" android:layout_marginEnd="23dp"
android:maxLines="2" android:maxLines="2"
android:gravity="center"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="10dp" android:textSize="10dp"
app:layout_constraintBottom_toBottomOf="@id/iv_avatar_right" app:layout_constraintBottom_toBottomOf="@id/iv_avatar_right"
@@ -86,7 +87,7 @@
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_marginEnd="14dp" android:layout_marginEnd="14dp"
android:layout_marginBottom="14dp" android:layout_marginBottom="8dp"
android:background="@drawable/single_room_pk_bg_notice_btn" android:background="@drawable/single_room_pk_bg_notice_btn"
android:gravity="center" android:gravity="center"
android:includeFontPadding="false" android:includeFontPadding="false"