feat：完成跨房PK-UI改版

app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKBoardView.kt

@@ -8,7 +8,7 @@ import android.util.AttributeSet
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
-import android.widget.FrameLayout
+import android.view.ViewGroup
 import android.widget.PopupWindow
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.isVisible
@@ -29,6 +29,7 @@ import com.chwl.core.utils.CurrentTimeUtils
 import com.chwl.core.utils.extension.subAndReplaceDot
 import com.chwl.library.rxbus.RxBus
 import com.chwl.library.utils.CommonUtils
+import com.chwl.library.utils.ResUtil
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
@@ -45,7 +46,13 @@ class RoomPKBoardView @JvmOverloads constructor(
     private var roomPkBean: RoomPkBean? = null
 
     init {
-        addView(binding.root, LayoutParams(ScreenUtil.dip2px(339f), ScreenUtil.dip2px(233f)))
+        addView(
+            binding.root,
+            LayoutParams(
+                context.resources.getDimensionPixelOffset(R.dimen.dp_309),
+                ViewGroup.LayoutParams.WRAP_CONTENT
+            )
+        )
         //注意这里需要先改变Style,再订阅数据
         binding.viewRankListCharmLeft.showCharmStyle()
         binding.viewRankListCharmRight.showCharmStyle()
@@ -54,16 +61,16 @@ class RoomPKBoardView @JvmOverloads constructor(
             if (CommonUtils.isFastDoubleClick(1000)) return@setOnClickListener
             binding.groupRank.isVisible = !binding.groupRank.isVisible
             if (binding.groupRank.isVisible) {
-                binding.clRoot.setBackgroundResource(R.drawable.bg_room_pk_board)
+                binding.ivBg.setImageResource(R.drawable.room_pk_bg_full)
-                binding.clRoot.updateLayoutParams<FrameLayout.LayoutParams> {
+                binding.ivBg.updateLayoutParams<ConstraintLayout.LayoutParams> {
-                    width = ScreenUtil.dip2px(339f)
+                    width = ViewGroup.LayoutParams.MATCH_PARENT
-                    height = ScreenUtil.dip2px(233f)
+                    height = context.resources.getDimensionPixelOffset(R.dimen.dp_285)
                 }
             } else {
-                binding.clRoot.setBackgroundResource(R.drawable.bg_room_pk_board_small)
+                binding.ivBg.setImageResource(R.drawable.room_pk_bg_small)
-                binding.clRoot.updateLayoutParams<FrameLayout.LayoutParams> {
+                binding.ivBg.updateLayoutParams<ConstraintLayout.LayoutParams> {
-                    width = ScreenUtil.dip2px(339f)
+                    width = ViewGroup.LayoutParams.MATCH_PARENT
-                    height = ScreenUtil.dip2px(137f)
+                    height = context.resources.getDimensionPixelOffset(R.dimen.dp_130)
                 }
             }
             binding.ivDetails.animate().rotationBy(180f).start()
@@ -122,11 +129,17 @@ class RoomPKBoardView @JvmOverloads constructor(
         )
         binding.viewRankListCharmRight.updateData(roomPkBean?.arRank)
         binding.viewRankListContributeRight.updateData(roomPkBean?.asRank)
-
         binding.pbScore.progress = ((roomPkBean?.cPercent ?: 0.5f) * 100).toInt()
-        val layoutParams = binding.svgaHot.layoutParams as ConstraintLayout.LayoutParams
+        binding.pbScore.post {
-        layoutParams.horizontalBias = roomPkBean?.cPercent ?: 0.5f
+            val progress = binding.pbScore.width * (roomPkBean?.cPercent ?: 0.5f)
-        binding.svgaHot.layoutParams = layoutParams
+            var bias =
+                (progress - binding.svgaHot.width / 2f) / (binding.pbScore.width - binding.svgaHot.width)
+            val layoutParams = binding.svgaHot.layoutParams as ConstraintLayout.LayoutParams
+            bias = 1f.coerceAtMost(bias)
+            bias = 0f.coerceAtLeast(bias)
+            layoutParams.horizontalBias = bias
+            binding.svgaHot.layoutParams = layoutParams
+        }
 
         binding.tvScoreLeft.text = "${roomPkBean?.cAmount ?: 0}"
         binding.tvScoreRight.text = "${roomPkBean?.aAmount ?: 0}"
@@ -134,13 +147,18 @@ class RoomPKBoardView @JvmOverloads constructor(
         disposable = Observable.interval(1, TimeUnit.SECONDS)
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe { _ ->
-                binding.tvTime.text = roomPkBean?.endTime?.let {
+                roomPkBean?.endTime?.let {
                     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) "#ffffff" else "#ffffff"))
-                    binding.tvTime.isVisible = remainTime > 0
+                    if (remainTime > 0) {
-                    binding.tvEndHint.isVisible = remainTime <= 0
+                        binding.tvTime.text = TimeUtil.secToTime(remainTime)
-                    TimeUtil.secToTime(remainTime)
+                    } else {
-                } ?: "00:00"
+                        binding.tvTime.text =
+                            ResUtil.getString(R.string.layout_layout_room_pk_board_view_02)
+                    }
+                } ?: let {
+                    binding.tvTime.text = "00:00"
+                }
             }
     }
 
@@ -150,7 +168,11 @@ class RoomPKBoardView @JvmOverloads constructor(
             contentView =
                 LayoutInflater.from(context).inflate(R.layout.layout_room_pk_help_view, null)
             helpPopupWindow =
-                PopupWindow(contentView, ScreenUtil.dip2px(244f), ScreenUtil.dip2px(177f))
+                PopupWindow(
+                    contentView,
+                    resources.getDimensionPixelOffset(R.dimen.dp_209),
+                    ViewGroup.LayoutParams.WRAP_CONTENT
+                )
             helpPopupWindow.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
             helpPopupWindow.isOutsideTouchable = true
             helpPopupWindow.isFocusable = true
@@ -158,10 +180,10 @@ class RoomPKBoardView @JvmOverloads constructor(
 
         try {
             helpPopupWindow.showAsDropDown(
-                binding.viewHelpAnchor,
+                binding.ivHelp,
                 0,
-                0,
+                ScreenUtil.dip2px(7f),
-                Gravity.START or Gravity.BOTTOM
+                Gravity.END or Gravity.BOTTOM
             )
         } catch (e: Exception) {
             e.printStackTrace()

app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKRankListView.kt

@@ -5,6 +5,8 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.FrameLayout
 import androidx.core.view.isGone
+import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
 import com.chwl.app.R
 import com.chwl.app.databinding.LayoutRoomPkRankListViewBinding
 import com.chwl.app.ui.utils.ImageLoadUtils
@@ -19,7 +21,6 @@ class RoomPKRankListView @JvmOverloads constructor(
     private val binding = LayoutRoomPkRankListViewBinding.inflate(LayoutInflater.from(context))
     private val tvValues = arrayOf(binding.tvValue1, binding.tvValue2, binding.tvValue3)
     private val ivAvatars = arrayOf(binding.ivAvatar1, binding.ivAvatar2, binding.ivAvatar3)
-    private var defaultAvatarRes = R.drawable.bg_room_pk_rank_contribute_default
 
     init {
         addView(binding.root)
@@ -36,13 +37,9 @@ class RoomPKRankListView @JvmOverloads constructor(
         binding.tvValue1.setBackgroundResource(R.drawable.bg_room_pk_charm)
         binding.tvValue2.setBackgroundResource(R.drawable.bg_room_pk_charm)
         binding.tvValue3.setBackgroundResource(R.drawable.bg_room_pk_charm)
-        binding.viewBg1.setBackgroundResource(R.drawable.bg_room_pk_rank_charm1)
+        binding.ivAvatarSeat1.setImageResource(R.drawable.room_pk_ic_seat_charm)
-        binding.viewBg2.setBackgroundResource(R.drawable.bg_room_pk_rank_charm2)
+        binding.ivAvatarSeat2.setImageResource(R.drawable.room_pk_ic_seat_charm)
-        binding.viewBg3.setBackgroundResource(R.drawable.bg_room_pk_rank_charm2)
+        binding.ivAvatarSeat3.setImageResource(R.drawable.room_pk_ic_seat_charm)
-        binding.ivAvatar1.setImageResource(R.drawable.bg_room_pk_rank_charm_default)
-        binding.ivAvatar2.setImageResource(R.drawable.bg_room_pk_rank_charm_default)
-        binding.ivAvatar3.setImageResource(R.drawable.bg_room_pk_rank_charm_default)
-        defaultAvatarRes = R.drawable.bg_room_pk_rank_charm_default
     }
 
     fun updateData(data: List<RoomPkBean.RankBean>?) {
@@ -50,12 +47,16 @@ class RoomPKRankListView @JvmOverloads constructor(
             val rankBean = data?.getOrNull(i)
             tvValues[i].text = rankBean?.amount ?: "0"
             tvValues[i].isGone = "0" == tvValues[i].text
-            ImageLoadUtils.loadImage(
+            if (rankBean?.avatar.isNullOrEmpty()) {
-                context,
+                ivAvatars[i].isInvisible = true
-                rankBean?.avatar,
+            } else {
-                ivAvatars[i],
+                ivAvatars[i].isVisible = true
-                if (rankBean?.avatar.isNullOrEmpty()) defaultAvatarRes else R.drawable.default_avatar
+                ImageLoadUtils.loadImage(
-            )
+                    context,
+                    rankBean?.avatar,
+                    ivAvatars[i], R.drawable.default_avatar
+                )
+            }
             ivAvatars[i].tag = rankBean?.uid
         }
     }

app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkFinishDialog.kt

@@ -3,7 +3,6 @@ package com.chwl.app.avroom.anotherroompk
 import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.WindowManager
-import androidx.core.view.isVisible
 import com.chwl.app.R
 import com.chwl.app.base.BaseDialog
 import com.chwl.app.databinding.DialogRoomPkFinishBinding
@@ -30,10 +29,8 @@ class RoomPkFinishDialog : BaseDialog<DialogRoomPkFinishBinding>() {
 
     @SuppressLint("CheckResult", "SetTextI18n")
     override fun init() {
-        binding?.ivClose?.setOnClickListener { dismissAllowingStateLoss() }
         binding?.tvTitleRed?.text = roomPkBean.cTitle.subAndReplaceDot(7)
         binding?.tvValueRed?.text = "${roomPkBean.cAmount}"
-        binding?.ivRedWin?.isVisible = roomPkBean.cUid == roomPkBean.winUid && roomPkBean.winUid != 0L
         ImageLoadUtils.loadImage(
             context,
             roomPkBean.cAvatar,
@@ -43,8 +40,6 @@ class RoomPkFinishDialog : BaseDialog<DialogRoomPkFinishBinding>() {
 
         binding?.tvTitleBlue?.text = roomPkBean.aTitle.subAndReplaceDot(7)
         binding?.tvValueBlue?.text = "${roomPkBean.aAmount}"
-        binding?.ivBlueWin?.isVisible =
-            roomPkBean.cUid != roomPkBean.winUid && roomPkBean.winUid != 0L
         ImageLoadUtils.loadImage(
             context,
             roomPkBean.aAvatar,
@@ -53,7 +48,7 @@ class RoomPkFinishDialog : BaseDialog<DialogRoomPkFinishBinding>() {
         )
 
         roomPkBean.csRank.getOrNull(0)?.let {
-            binding?.tvNickContribute?.text = it.nick.subAndReplaceDot(7)
+            binding?.tvNickContribute?.text = it.nick.subAndReplaceDot(15)
             binding?.tvValueContribute?.text =
                 context?.getString(R.string.layout_dialog_room_pk_finish_07, it.amount.toString())
                     ?: ""
@@ -66,7 +61,7 @@ class RoomPkFinishDialog : BaseDialog<DialogRoomPkFinishBinding>() {
         }
 
         roomPkBean.crRank.getOrNull(0)?.let {
-            binding?.tvNickCharm?.text = it.nick.subAndReplaceDot(7)
+            binding?.tvNickCharm?.text = it.nick.subAndReplaceDot(15)
             binding?.tvValueCharm?.text =
                 context?.getString(R.string.layout_activity_jewel_09, it.amount?.toString()) ?: ""
             ImageLoadUtils.loadImage(
@@ -79,25 +74,13 @@ class RoomPkFinishDialog : BaseDialog<DialogRoomPkFinishBinding>() {
 
         when (roomPkBean.winUid) {
             0L -> {
-                binding?.viewBg?.setBackgroundResource(R.drawable.bg_719cea_radius_10)
+                binding?.ivStatus?.setImageResource(R.drawable.room_pk_result_draw)
-                binding?.clRoot?.setBackgroundResource(R.drawable.bg_room_pk_finish_deuce)
-                binding?.viewContribute?.setBackgroundResource(R.drawable.bg_room_pk_finish_rank_deuce)
-                binding?.viewCharm?.setBackgroundResource(R.drawable.bg_room_pk_finish_rank_deuce)
-                binding?.ivClose?.setImageResource(R.drawable.ic_room_pk_finish_close_deuce)
             }
             roomPkBean.cUid -> {
-                binding?.viewBg?.setBackgroundResource(R.drawable.bg_edbf89_radius_10)
+                binding?.ivStatus?.setImageResource(R.drawable.room_pk_result_win)
-                binding?.clRoot?.setBackgroundResource(R.drawable.bg_room_pk_finish_win)
-                binding?.viewContribute?.setBackgroundResource(R.drawable.bg_room_pk_finish_rank_win)
-                binding?.viewCharm?.setBackgroundResource(R.drawable.bg_room_pk_finish_rank_win)
-                binding?.ivClose?.setImageResource(R.drawable.ic_room_pk_finish_close_win)
             }
             else -> {
-                binding?.viewBg?.setBackgroundResource(R.drawable.bg_bfabf6_radius_10)
+                binding?.ivStatus?.setImageResource(R.drawable.room_pk_result_fail)
-                binding?.clRoot?.setBackgroundResource(R.drawable.bg_room_pk_finish_failed)
-                binding?.viewContribute?.setBackgroundResource(R.drawable.bg_room_pk_finish_rank_failed)
-                binding?.viewCharm?.setBackgroundResource(R.drawable.bg_room_pk_finish_rank_failed)
-                binding?.ivClose?.setImageResource(R.drawable.ic_room_pk_finish_close_failed)
             }
         }
 

app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPkReceivedDialog.kt

@@ -9,7 +9,6 @@ import com.chwl.app.databinding.DialogRoomPkReceivedBinding
 import com.chwl.core.im.custom.bean.RoomPkBean
 import com.chwl.core.manager.AvRoomDataManager
 import com.chwl.core.room.anotherroompk.RoomPKModel
-import com.chwl.core.utils.extension.ifNotNullOrEmpty
 import com.chwl.core.utils.extension.subAndReplaceDot
 import com.chwl.core.utils.extension.toast
 import io.reactivex.Observable
@@ -37,12 +36,20 @@ class RoomPkReceivedDialog : BaseDialog<DialogRoomPkReceivedBinding>() {
 
     @SuppressLint("CheckResult")
     override fun init() {
-        binding?.tvNick?.text = pkBean.inviteRoomTitle.subAndReplaceDot(7)
+        binding?.tvNick?.text = pkBean.inviteRoomTitle.subAndReplaceDot(15)
         binding?.tvTime?.text = "${pkBean.pkDuration}${getString(R.string.layout_activity_room_pk_create_010)}"
-        pkBean.pkDesc.ifNotNullOrEmpty {
+        val height: Int
-            binding?.tvDescTitle?.isVisible = true
+        if (pkBean.pkDesc.isNullOrEmpty()) {
-            binding?.tvDesc?.isVisible = true
+            binding?.groupDesc?.isVisible = false
-            binding?.tvDesc?.text = it
+            height = resources.getDimensionPixelOffset(R.dimen.dp_192)
+        } else {
+            binding?.tvDesc?.text = pkBean.pkDesc
+            binding?.groupDesc?.isVisible = true
+            height = resources.getDimensionPixelOffset(R.dimen.dp_211)
+        }
+        binding?.layoutContent?.let {
+            it.layoutParams.height = height
+            it.requestLayout()
         }
         disposable = Observable.intervalRange(0, 10, 0, 1, TimeUnit.SECONDS)
             .compose(bindToLifecycle())

app/src/main/res/drawable/bg_room_pk_charm.xml

@@ -2,9 +2,9 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <gradient
-        android:angle="180"
+        android:angle="90"
-        android:endColor="#FFFF5FC1"
+        android:endColor="#FAFF80FE"
-        android:startColor="#FFFA81FF"
+        android:startColor="#FAFF0DD4"
         android:type="linear"
         android:useLevel="true" />
 

app/src/main/res/drawable/bg_room_pk_contribute.xml

@@ -2,11 +2,11 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <gradient
-        android:angle="180"
+        android:angle="90"
-        android:endColor="#FFFF9813"
+        android:endColor="#FAFFE480"
-        android:startColor="#FFFFB22B"
+        android:startColor="#FAFF8E0D"
         android:type="linear"
         android:useLevel="true" />
 
-    <corners android:radius="10dp" />
+    <corners android:radius="@dimen/dp_4" />
 </shape>

app/src/main/res/drawable/room_pk_received_bg_time.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="#19FFFFFF" />
+    <corners android:radius="@dimen/dp_8" />
+    <stroke
+        android:width="@dimen/dp_0_5"
+        android:color="#66FFF7C0" />
+</shape>

app/src/main/res/drawable/room_room_pk_bg_board_pb.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 定义轨道的背景 -->
+    <item android:id="@android:id/background">
+        <bitmap android:src="@drawable/room_pk_bg_pb_blue"/>
+    </item>
+    <!-- 定义轨道上已完成部分的样式 -->
+    <item android:id="@android:id/progress">
+        <bitmap android:src="@drawable/room_pk_bg_pb_red"/>
+    </item>
+</layer-list>

app/src/main/res/drawable/shape_cc140b25_11dp.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="#CC140B25" />
+    <corners android:radius="@dimen/dp_11" />
+</shape>

app/src/main/res/drawable/shape_g_66e6e6e6_66f3f5fa_19_lr.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:radius="19dp" />
+    <gradient
+        android:angle="0"
+        android:endColor="#66F3F5FA"
+        android:startColor="#66E6E6E6" />
+</shape>

app/src/main/res/layout/dialog_room_pk_finish.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -8,257 +8,239 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cl_root"
-        android:layout_width="320dp"
+        android:layout_width="@dimen/dp_309"
-        android:layout_height="453dp"
+        android:layout_height="0dp"
         android:layout_gravity="center"
-        android:background="@drawable/bg_room_pk_finish_win"
+        android:layout_marginTop="@dimen/dp_49"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        app:layout_constraintDimensionRatio="309:363"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.chwl.app.view.AutoMirroredImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="fitXY"
+            android:src="@drawable/room_pk_result_bg" />
 
         <ImageView
-            android:id="@+id/iv_close"
+            android:layout_width="@dimen/dp_118"
-            android:layout_width="wrap_content"
+            android:layout_height="@dimen/dp_93"
-            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_92"
-            android:layout_marginTop="3dp"
+            android:src="@drawable/room_pk_result_vs"
-            android:layout_marginEnd="3dp"
-            android:src="@drawable/ic_room_pk_finish_close_win"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <View
-            android:id="@+id/view_bg"
-            android:layout_width="290dp"
-            android:layout_height="310dp"
-            android:layout_marginBottom="24dp"
-            android:background="@drawable/bg_edbf89_radius_10"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <View
-            android:id="@+id/view_bg_red"
-            android:layout_width="151dp"
-            android:layout_height="135dp"
-            android:layout_marginStart="6dp"
-            android:layout_marginTop="12dp"
-            android:background="@drawable/bg_room_pk_finish_team_red"
-            app:layout_constraintStart_toStartOf="@id/view_bg"
-            app:layout_constraintTop_toTopOf="@id/view_bg" />
-
         <ImageView
-            android:id="@+id/iv_red_win"
+            android:id="@+id/iv_avatar_border_red"
-            android:layout_width="wrap_content"
+            android:layout_width="@dimen/dp_68"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/dp_68"
-            android:layout_marginStart="12dp"
+            android:layout_marginStart="@dimen/dp_12"
-            android:visibility="gone"
+            android:layout_marginTop="@dimen/dp_88"
-            android:src="@drawable/ic_room_pk_finish_win"
+            android:src="@drawable/room_pk_result_avatar_border_red"
-            app:layout_constraintStart_toStartOf="@id/view_bg_red"
+            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/view_bg_red" />
+            app:layout_constraintTop_toTopOf="parent" />
 
-        <com.chwl.app.common.widget.CircleImageView
+        <com.google.android.material.imageview.ShapeableImageView
             android:id="@+id/iv_avatar_red"
-            android:layout_width="60dp"
+            android:layout_width="@dimen/dp_62"
-            android:layout_height="60dp"
+            android:layout_height="@dimen/dp_62"
-            android:layout_marginStart="41dp"
-            android:layout_marginTop="21dp"
             android:src="@drawable/default_avatar"
-            app:cborder_color="@color/white"
+            app:layout_constraintBottom_toBottomOf="@id/iv_avatar_border_red"
-            app:cborder_width="1dp"
+            app:layout_constraintEnd_toEndOf="@id/iv_avatar_border_red"
-            app:layout_constraintStart_toStartOf="@id/view_bg_red"
+            app:layout_constraintStart_toStartOf="@id/iv_avatar_border_red"
-            app:layout_constraintTop_toTopOf="@id/view_bg_red" />
+            app:layout_constraintTop_toTopOf="@id/iv_avatar_border_red"
+            app:shapeAppearance="@style/shape_circle" />
 
         <TextView
             android:id="@+id/tv_title_red"
-            android:layout_width="wrap_content"
+            android:layout_width="@dimen/dp_70"
             android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
+            android:layout_marginTop="@dimen/dp_7"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:maxLines="1"
             android:text="@string/layout_dialog_room_pk_finish_01"
             android:textColor="@color/white"
-            android:textSize="12sp"
+            android:textSize="@dimen/dp_12"
             app:layout_constraintEnd_toEndOf="@id/iv_avatar_red"
             app:layout_constraintStart_toStartOf="@id/iv_avatar_red"
-            app:layout_constraintTop_toBottomOf="@id/iv_avatar_red" />
+            app:layout_constraintTop_toBottomOf="@id/iv_avatar_border_red" />
 
         <TextView
             android:id="@+id/tv_value_red"
-            android:layout_width="wrap_content"
+            android:layout_width="@dimen/dp_70"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
+            android:layout_marginTop="@dimen/dp_2"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:maxLines="1"
             android:text="20000000"
             android:textColor="@color/white"
-            android:textSize="14sp"
+            android:textSize="@dimen/dp_12"
+            app:autoSizeMaxTextSize="@dimen/dp_12"
+            app:autoSizeMinTextSize="@dimen/dp_6"
+            app:autoSizeStepGranularity="1px"
+            app:autoSizeTextType="uniform"
             app:layout_constraintEnd_toEndOf="@id/iv_avatar_red"
             app:layout_constraintStart_toStartOf="@id/iv_avatar_red"
             app:layout_constraintTop_toBottomOf="@id/tv_title_red" />
 
-        <View
-            android:id="@+id/view_bg_blue"
-            android:layout_width="151dp"
-            android:layout_height="135dp"
-            android:layout_marginTop="18dp"
-            android:layout_marginEnd="6dp"
-            android:background="@drawable/bg_room_pk_finish_team_blue"
-            app:layout_constraintEnd_toEndOf="@id/view_bg"
-            app:layout_constraintTop_toTopOf="@id/view_bg" />
-
         <ImageView
-            android:id="@+id/iv_blue_win"
+            android:id="@+id/iv_avatar_border_blue"
-            android:layout_width="wrap_content"
+            android:layout_width="@dimen/dp_68"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/dp_68"
-            android:layout_marginEnd="12dp"
+            android:layout_marginEnd="@dimen/dp_12"
-            android:visibility="gone"
+            android:src="@drawable/room_pk_result_avatar_border_blue"
-            android:src="@drawable/ic_room_pk_finish_win"
+            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintEnd_toEndOf="@id/view_bg_blue"
+            app:layout_constraintTop_toTopOf="@id/iv_avatar_border_red" />
-            app:layout_constraintTop_toTopOf="@id/view_bg_blue" />
 
-        <com.chwl.app.common.widget.CircleImageView
+        <com.google.android.material.imageview.ShapeableImageView
             android:id="@+id/iv_avatar_blue"
-            android:layout_width="60dp"
+            android:layout_width="@dimen/dp_62"
-            android:layout_height="60dp"
+            android:layout_height="@dimen/dp_62"
-            android:layout_marginTop="21dp"
-            android:layout_marginEnd="41dp"
             android:src="@drawable/default_avatar"
-            app:cborder_color="@color/white"
+            app:layout_constraintBottom_toBottomOf="@id/iv_avatar_border_blue"
-            app:cborder_width="1dp"
+            app:layout_constraintEnd_toEndOf="@id/iv_avatar_border_blue"
-            app:layout_constraintEnd_toEndOf="@id/view_bg_blue"
+            app:layout_constraintStart_toStartOf="@id/iv_avatar_border_blue"
-            app:layout_constraintTop_toTopOf="@id/view_bg_blue" />
+            app:layout_constraintTop_toTopOf="@id/iv_avatar_border_blue"
+            app:shapeAppearance="@style/shape_circle" />
 
         <TextView
             android:id="@+id/tv_title_blue"
-            android:layout_width="wrap_content"
+            android:layout_width="@dimen/dp_70"
             android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:maxLines="1"
             android:text="@string/layout_dialog_room_pk_finish_02"
             android:textColor="@color/white"
-            android:textSize="12sp"
+            android:textSize="@dimen/dp_12"
             app:layout_constraintEnd_toEndOf="@id/iv_avatar_blue"
             app:layout_constraintStart_toStartOf="@id/iv_avatar_blue"
-            app:layout_constraintTop_toBottomOf="@id/iv_avatar_blue" />
+            app:layout_constraintTop_toTopOf="@id/tv_title_red" />
 
         <TextView
             android:id="@+id/tv_value_blue"
-            android:layout_width="wrap_content"
+            android:layout_width="@dimen/dp_70"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:maxLines="1"
             android:text="20000000"
             android:textColor="@color/white"
-            android:textSize="14sp"
+            android:textSize="@dimen/dp_12"
+            app:autoSizeMaxTextSize="@dimen/dp_12"
+            app:autoSizeMinTextSize="@dimen/dp_6"
+            app:autoSizeStepGranularity="1px"
+            app:autoSizeTextType="uniform"
             app:layout_constraintEnd_toEndOf="@id/iv_avatar_blue"
             app:layout_constraintStart_toStartOf="@id/iv_avatar_blue"
-            app:layout_constraintTop_toBottomOf="@id/tv_title_blue" />
+            app:layout_constraintTop_toTopOf="@id/tv_value_red" />
-
-        <View
-            android:layout_width="70dp"
-            android:layout_height="49dp"
-            android:background="@drawable/ic_room_pk_logo"
-            app:layout_constraintBottom_toBottomOf="@id/view_bg_blue"
-            app:layout_constraintEnd_toEndOf="@id/view_bg"
-            app:layout_constraintStart_toStartOf="@id/view_bg"
-            app:layout_constraintTop_toTopOf="@id/view_bg_red" />
-
-        <View
-            android:id="@+id/view_contribute"
-            android:layout_width="0dp"
-            android:layout_height="64dp"
-            android:layout_marginTop="16dp"
-            android:background="@drawable/bg_room_pk_finish_rank_win"
-            app:layout_constraintEnd_toEndOf="@id/view_bg"
-            app:layout_constraintStart_toStartOf="@id/view_bg"
-            app:layout_constraintTop_toBottomOf="@id/view_bg_red" />
 
         <com.chwl.app.common.widget.CircleImageView
             android:id="@+id/iv_avatar_contribute"
-            android:layout_width="42dp"
+            android:layout_width="@dimen/dp_36"
-            android:layout_height="42dp"
+            android:layout_height="@dimen/dp_36"
-            android:layout_marginBottom="2dp"
+            android:layout_marginBottom="@dimen/dp_4"
             android:src="@drawable/default_avatar"
             app:layout_constraintBottom_toBottomOf="@id/bg_avatar_contribute"
             app:layout_constraintEnd_toEndOf="@id/bg_avatar_contribute"
             app:layout_constraintStart_toStartOf="@id/bg_avatar_contribute" />
 
-        <View
+        <ImageView
             android:id="@+id/bg_avatar_contribute"
-            android:layout_width="44dp"
+            android:layout_width="@dimen/dp_71"
-            android:layout_height="53dp"
+            android:layout_height="@dimen/dp_54"
-            android:layout_marginStart="70dp"
+            android:layout_marginStart="@dimen/dp_9"
-            android:layout_marginTop="5dp"
+            android:layout_marginBottom="@dimen/dp_98"
-            android:background="@drawable/ic_room_pk_finish_contribute"
+            android:src="@drawable/room_pk_result_avatar_border_wealth"
-            app:layout_constraintStart_toStartOf="@id/view_bg"
+            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toTopOf="@id/view_contribute" />
+            app:layout_constraintStart_toStartOf="parent" />
 
         <TextView
             android:id="@+id/tv_nick_contribute"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="7dp"
+            android:layout_marginStart="@dimen/dp_21"
+            android:includeFontPadding="false"
+            android:maxLines="1"
             android:textColor="@color/white"
-            android:textSize="14sp"
+            android:textSize="@dimen/dp_9"
+            app:layout_constraintBottom_toTopOf="@id/tv_value_contribute"
             app:layout_constraintStart_toEndOf="@id/iv_avatar_contribute"
             app:layout_constraintTop_toTopOf="@id/iv_avatar_contribute"
+            app:layout_constraintVertical_chainStyle="packed"
             tools:text="@string/layout_dialog_room_pk_finish_03" />
 
         <TextView
             android:id="@+id/tv_value_contribute"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginTop="@dimen/dp_6"
+            android:includeFontPadding="false"
             android:textColor="@color/white"
-            android:textSize="13sp"
+            android:textSize="@dimen/dp_9"
+            app:layout_constraintBottom_toBottomOf="@id/iv_avatar_contribute"
             app:layout_constraintStart_toStartOf="@id/tv_nick_contribute"
             app:layout_constraintTop_toBottomOf="@id/tv_nick_contribute"
             tools:text="@string/layout_dialog_room_pk_finish_04" />
 
-        <View
-            android:id="@+id/view_charm"
-            android:layout_width="0dp"
-            android:layout_height="64dp"
-            android:layout_marginTop="10dp"
-            android:background="@drawable/bg_room_pk_finish_rank_win"
-            app:layout_constraintEnd_toEndOf="@id/view_bg"
-            app:layout_constraintStart_toStartOf="@id/view_bg"
-            app:layout_constraintTop_toBottomOf="@id/view_contribute" />
-
         <com.chwl.app.common.widget.CircleImageView
             android:id="@+id/iv_avatar_charm"
-            android:layout_width="42dp"
+            android:layout_width="@dimen/dp_36"
-            android:layout_height="42dp"
+            android:layout_height="@dimen/dp_36"
-            android:layout_marginBottom="2dp"
+            android:layout_marginBottom="@dimen/dp_4"
             android:src="@drawable/default_avatar"
             app:layout_constraintBottom_toBottomOf="@id/bg_avatar_charm"
             app:layout_constraintEnd_toEndOf="@id/bg_avatar_charm"
             app:layout_constraintStart_toStartOf="@id/bg_avatar_charm" />
 
-        <View
+        <ImageView
             android:id="@+id/bg_avatar_charm"
-            android:layout_width="44dp"
+            android:layout_width="@dimen/dp_71"
-            android:layout_height="53dp"
+            android:layout_height="@dimen/dp_54"
-            android:layout_marginStart="70dp"
+            android:layout_marginBottom="@dimen/dp_26"
-            android:layout_marginTop="5dp"
+            android:src="@drawable/room_pk_result_avatar_border_charm"
-            android:background="@drawable/ic_room_pk_finish_charm"
+            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="@id/view_bg"
+            app:layout_constraintStart_toStartOf="@id/bg_avatar_contribute" />
-            app:layout_constraintTop_toTopOf="@id/view_charm" />
 
         <TextView
             android:id="@+id/tv_nick_charm"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="7dp"
+            android:includeFontPadding="false"
+            android:maxLines="1"
             android:textColor="@color/white"
-            android:textSize="14sp"
+            android:textSize="@dimen/dp_9"
-            app:layout_constraintStart_toEndOf="@id/iv_avatar_charm"
+            app:layout_constraintBottom_toTopOf="@id/tv_value_charm"
+            app:layout_constraintStart_toStartOf="@id/tv_nick_contribute"
             app:layout_constraintTop_toTopOf="@id/iv_avatar_charm"
+            app:layout_constraintVertical_chainStyle="packed"
             tools:text="@string/layout_dialog_room_pk_finish_05" />
 
         <TextView
             android:id="@+id/tv_value_charm"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="3dp"
+            android:layout_marginTop="@dimen/dp_6"
+            android:includeFontPadding="false"
             android:textColor="@color/white"
-            android:textSize="13sp"
+            android:textSize="@dimen/dp_9"
+            app:layout_constraintBottom_toBottomOf="@id/iv_avatar_charm"
             app:layout_constraintStart_toStartOf="@id/tv_nick_charm"
             app:layout_constraintTop_toBottomOf="@id/tv_nick_charm"
             tools:text="@string/layout_dialog_room_pk_finish_06" />
 
-
     </androidx.constraintlayout.widget.ConstraintLayout>
-</FrameLayout>
+
+    <ImageView
+        android:id="@+id/iv_status"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_125"
+        android:src="@drawable/room_pk_result_win"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/dialog_room_pk_force_finish.xml

@@ -8,136 +8,156 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cl_root"
-        android:layout_width="281dp"
+        android:layout_width="@dimen/dp_290"
-        android:layout_height="208dp"
+        android:layout_height="@dimen/dp_211"
         android:layout_gravity="center"
-        android:background="@drawable/bg_room_pk_force_finish"
         android:orientation="vertical">
 
+        <com.chwl.app.view.AutoMirroredImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="fitXY"
+            android:src="@drawable/room_pk_force_result_bg" />
+
+        <ImageView
+            android:layout_width="@dimen/dp_118"
+            android:layout_height="@dimen/dp_93"
+            android:layout_marginTop="@dimen/dp_73"
+            android:src="@drawable/room_pk_result_vs"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
+            android:layout_marginTop="@dimen/dp_26"
+            android:includeFontPadding="false"
             android:text="@string/layout_dialog_room_pk_force_finish_01"
             android:textColor="@color/white"
-            android:textSize="18sp"
+            android:textSize="@dimen/dp_16"
+            android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
             android:id="@+id/iv_close"
-            android:layout_width="wrap_content"
+            android:layout_width="@dimen/dp_17"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/dp_17"
-            android:layout_marginTop="18dp"
+            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginEnd="18dp"
+            android:layout_marginEnd="@dimen/dp_10"
-            android:src="@drawable/ic_room_pk_force_finish_close"
+            android:src="@drawable/room_pk_force_result_ic_close"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-
+        <ImageView
-        <View
+            android:id="@+id/iv_avatar_border_red"
-            android:id="@+id/view_bg_red"
+            android:layout_width="@dimen/dp_68"
-            android:layout_width="133dp"
+            android:layout_height="@dimen/dp_68"
-            android:layout_height="119dp"
+            android:layout_marginStart="@dimen/dp_12"
-            android:layout_marginStart="18dp"
+            android:layout_marginTop="@dimen/dp_70"
-            android:layout_marginTop="55dp"
+            android:src="@drawable/room_pk_result_avatar_border_red"
-            android:background="@drawable/bg_room_pk_force_finish_team_red"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-
+        <com.google.android.material.imageview.ShapeableImageView
-        <com.chwl.app.common.widget.CircleImageView
             android:id="@+id/iv_avatar_red"
-            android:layout_width="52dp"
+            android:layout_width="@dimen/dp_62"
-            android:layout_height="52dp"
+            android:layout_height="@dimen/dp_62"
-            android:layout_marginStart="37dp"
-            android:layout_marginTop="20dp"
             android:src="@drawable/default_avatar"
-            app:cborder_color="@color/white"
+            app:layout_constraintBottom_toBottomOf="@id/iv_avatar_border_red"
-            app:cborder_width="1dp"
+            app:layout_constraintEnd_toEndOf="@id/iv_avatar_border_red"
-            app:layout_constraintStart_toStartOf="@id/view_bg_red"
+            app:layout_constraintStart_toStartOf="@id/iv_avatar_border_red"
-            app:layout_constraintTop_toTopOf="@id/view_bg_red" />
+            app:layout_constraintTop_toTopOf="@id/iv_avatar_border_red"
+            app:shapeAppearance="@style/shape_circle" />
 
         <TextView
             android:id="@+id/tv_title_red"
-            android:layout_width="wrap_content"
+            android:layout_width="@dimen/dp_70"
             android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
+            android:layout_marginTop="@dimen/dp_7"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:maxLines="1"
+            android:text="@string/layout_dialog_room_pk_finish_01"
             android:textColor="@color/white"
-            android:textSize="10sp"
+            android:textSize="@dimen/dp_12"
             app:layout_constraintEnd_toEndOf="@id/iv_avatar_red"
             app:layout_constraintStart_toStartOf="@id/iv_avatar_red"
-            app:layout_constraintTop_toBottomOf="@id/iv_avatar_red"
+            app:layout_constraintTop_toBottomOf="@id/iv_avatar_border_red" />
-            tools:text="@string/layout_dialog_room_pk_force_finish_02" />
 
         <TextView
             android:id="@+id/tv_value_red"
-            android:layout_width="wrap_content"
+            android:layout_width="@dimen/dp_70"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
+            android:layout_marginTop="@dimen/dp_2"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:maxLines="1"
+            android:text="20000000"
             android:textColor="@color/white"
-            android:textSize="12sp"
+            android:textSize="@dimen/dp_12"
+            app:autoSizeMaxTextSize="@dimen/dp_12"
+            app:autoSizeMinTextSize="@dimen/dp_6"
+            app:autoSizeStepGranularity="1px"
+            app:autoSizeTextType="uniform"
             app:layout_constraintEnd_toEndOf="@id/iv_avatar_red"
             app:layout_constraintStart_toStartOf="@id/iv_avatar_red"
-            app:layout_constraintTop_toBottomOf="@id/tv_title_red"
+            app:layout_constraintTop_toBottomOf="@id/tv_title_red" />
-            tools:text="20000000" />
 
-        <View
+        <ImageView
-            android:id="@+id/view_bg_blue"
+            android:id="@+id/iv_avatar_border_blue"
-            android:layout_width="133dp"
+            android:layout_width="@dimen/dp_68"
-            android:layout_height="119dp"
+            android:layout_height="@dimen/dp_68"
-            android:layout_marginTop="62dp"
+            android:layout_marginEnd="@dimen/dp_12"
-            android:layout_marginEnd="18dp"
+            android:src="@drawable/room_pk_result_avatar_border_blue"
-            android:background="@drawable/bg_room_pk_force_finish_team_blue"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="@id/iv_avatar_border_red" />
 
-        <com.chwl.app.common.widget.CircleImageView
+        <com.google.android.material.imageview.ShapeableImageView
             android:id="@+id/iv_avatar_blue"
-            android:layout_width="52dp"
+            android:layout_width="@dimen/dp_62"
-            android:layout_height="52dp"
+            android:layout_height="@dimen/dp_62"
-            android:layout_marginTop="20dp"
-            android:layout_marginEnd="37dp"
             android:src="@drawable/default_avatar"
-            app:cborder_color="@color/white"
+            app:layout_constraintBottom_toBottomOf="@id/iv_avatar_border_blue"
-            app:cborder_width="1dp"
+            app:layout_constraintEnd_toEndOf="@id/iv_avatar_border_blue"
-            app:layout_constraintEnd_toEndOf="@id/view_bg_blue"
+            app:layout_constraintStart_toStartOf="@id/iv_avatar_border_blue"
-            app:layout_constraintTop_toTopOf="@id/view_bg_blue" />
+            app:layout_constraintTop_toTopOf="@id/iv_avatar_border_blue"
+            app:shapeAppearance="@style/shape_circle" />
 
         <TextView
             android:id="@+id/tv_title_blue"
-            android:layout_width="wrap_content"
+            android:layout_width="@dimen/dp_70"
             android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:maxLines="1"
+            android:text="@string/layout_dialog_room_pk_finish_02"
             android:textColor="@color/white"
-            android:textSize="10sp"
+            android:textSize="@dimen/dp_12"
             app:layout_constraintEnd_toEndOf="@id/iv_avatar_blue"
             app:layout_constraintStart_toStartOf="@id/iv_avatar_blue"
-            app:layout_constraintTop_toBottomOf="@id/iv_avatar_blue"
+            app:layout_constraintTop_toTopOf="@id/tv_title_red" />
-            tools:text="@string/layout_dialog_room_pk_force_finish_03" />
 
         <TextView
             android:id="@+id/tv_value_blue"
-            android:layout_width="wrap_content"
+            android:layout_width="@dimen/dp_70"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:maxLines="1"
+            android:text="20000000"
             android:textColor="@color/white"
-            android:textSize="12sp"
+            android:textSize="@dimen/dp_12"
+            app:autoSizeMaxTextSize="@dimen/dp_12"
+            app:autoSizeMinTextSize="@dimen/dp_6"
+            app:autoSizeStepGranularity="1px"
+            app:autoSizeTextType="uniform"
             app:layout_constraintEnd_toEndOf="@id/iv_avatar_blue"
             app:layout_constraintStart_toStartOf="@id/iv_avatar_blue"
-            app:layout_constraintTop_toBottomOf="@id/tv_title_blue"
+            app:layout_constraintTop_toTopOf="@id/tv_value_red" />
-            tools:text="20000000" />
-
-        <View
-            android:layout_width="62dp"
-            android:layout_height="43dp"
-            android:background="@drawable/ic_room_pk_logo"
-            app:layout_constraintBottom_toBottomOf="@id/view_bg_blue"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/view_bg_red" />
-
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </FrameLayout>

app/src/main/res/layout/dialog_room_pk_received.xml

@@ -7,34 +7,36 @@
     android:layout_gravity="center">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="280.5dp"
+        android:id="@+id/layout_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/dp_290"
+        android:layout_height="@dimen/dp_211"
         android:layout_gravity="center"
-        android:background="@drawable/bg_room_pk_received_dialog"
+        android:background="@drawable/room_pk_received_bg">
-        android:orientation="vertical">
 
         <TextView
             android:id="@+id/tv_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="18dp"
+            android:layout_marginTop="@dimen/dp_27"
+            android:includeFontPadding="false"
             android:text="@string/layout_dialog_room_pk_received_01"
             android:textColor="@color/white"
-            android:textSize="18sp"
+            android:textSize="@dimen/dp_16"
+            android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/tv_close_time"
-            android:layout_width="32dp"
+            android:layout_width="@dimen/dp_40"
-            android:layout_height="16dp"
+            android:layout_height="@dimen/dp_17"
-            android:layout_marginEnd="16dp"
+            android:layout_marginEnd="@dimen/dp_34"
-            android:background="@drawable/bg_room_pk_received_time"
+            android:background="@drawable/room_pk_received_bg_time"
             android:gravity="center"
             android:includeFontPadding="false"
-            android:textColor="#fffff600"
+            android:textColor="#FFF7C0"
-            android:textSize="13sp"
+            android:textSize="@dimen/dp_11"
             app:layout_constraintBottom_toBottomOf="@id/tv_title"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/tv_title"
@@ -44,104 +46,160 @@
             android:id="@+id/tv_nick_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
+            android:layout_marginStart="@dimen/dp_27"
-            android:layout_marginTop="20dp"
+            android:layout_marginTop="@dimen/dp_22"
+            android:includeFontPadding="false"
             android:text="@string/layout_dialog_room_pk_received_02"
             android:textColor="#ffffffff"
-            android:textSize="14sp"
+            android:textSize="@dimen/dp_14"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_title" />
 
-        <TextView
-            android:id="@+id/tv_nick"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="15dp"
-            android:textColor="#ffe8e035"
-            android:textSize="16sp"
-            app:layout_constraintBottom_toBottomOf="@id/tv_nick_title"
-            app:layout_constraintStart_toEndOf="@id/tv_nick_title"
-            app:layout_constraintTop_toTopOf="@id/tv_nick_title"
-            tools:text="@string/layout_dialog_room_pk_received_03" />
-
         <TextView
             android:id="@+id/tv_time_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
+            android:layout_marginTop="@dimen/dp_8"
-            android:layout_marginTop="20dp"
+            android:includeFontPadding="false"
             android:text="@string/layout_dialog_room_pk_received_04"
             android:textColor="#ffffffff"
-            android:textSize="14sp"
+            android:textSize="@dimen/dp_14"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintStart_toStartOf="@id/tv_nick_title"
             app:layout_constraintTop_toBottomOf="@id/tv_nick_title" />
 
-        <TextView
-            android:id="@+id/tv_time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="15dp"
-            android:textColor="#ffe8e035"
-            android:textSize="16sp"
-            app:layout_constraintBottom_toBottomOf="@id/tv_time_title"
-            app:layout_constraintStart_toEndOf="@id/tv_time_title"
-            app:layout_constraintTop_toTopOf="@id/tv_time_title"
-            tools:text="@string/layout_dialog_room_pk_received_05" />
-
         <TextView
             android:id="@+id/tv_desc_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
+            android:layout_marginTop="@dimen/dp_8"
-            android:layout_marginTop="20dp"
+            android:includeFontPadding="false"
             android:text="@string/layout_dialog_room_pk_received_06"
             android:textColor="#ffffffff"
-            android:textSize="14sp"
+            android:textSize="@dimen/dp_14"
-            android:visibility="gone"
+            app:layout_constraintStart_toStartOf="@id/tv_nick_title"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_time_title"/>
-            app:layout_constraintTop_toBottomOf="@id/tv_time_title" />
+
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/group_desc"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="visible"
+            app:constraint_referenced_ids="tv_desc_title,tv_desc_title_divide,tv_desc" />
+
+        <androidx.constraintlayout.widget.Barrier
+            android:id="@+id/barrier_title_end"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:barrierDirection="end"
+            app:constraint_referenced_ids="tv_nick_title,tv_time_title,tv_desc_title" />
+
+        <TextView
+            android:id="@+id/tv_nick_title_divide"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_2"
+            android:text=":"
+            android:textColor="#ffffffff"
+            android:textSize="@dimen/dp_14"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@id/tv_nick_title"
+            app:layout_constraintStart_toEndOf="@id/barrier_title_end"
+            app:layout_constraintTop_toTopOf="@id/tv_nick_title" />
+
+        <TextView
+            android:id="@+id/tv_time_title_divide"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=":"
+            android:textColor="#ffffffff"
+            android:textSize="@dimen/dp_14"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@id/tv_time_title"
+            app:layout_constraintStart_toStartOf="@id/tv_nick_title_divide"
+            app:layout_constraintTop_toTopOf="@id/tv_time_title" />
+
+        <TextView
+            android:id="@+id/tv_desc_title_divide"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=":"
+            android:textColor="#ffffffff"
+            android:textSize="@dimen/dp_14"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@id/tv_desc_title"
+            app:layout_constraintStart_toStartOf="@id/tv_nick_title_divide"
+            app:layout_constraintTop_toTopOf="@id/tv_desc_title" />
+
+        <TextView
+            android:id="@+id/tv_nick"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="@dimen/dp_15"
+            android:maxLines="1"
+            android:textColor="#FFF7C0"
+            android:textSize="@dimen/dp_14"
+            android:textStyle="bold"
+            app:autoSizeMaxTextSize="@dimen/dp_14"
+            app:autoSizeMinTextSize="@dimen/dp_8"
+            app:autoSizeStepGranularity="1px"
+            app:autoSizeTextType="uniform"
+            app:layout_constraintBottom_toBottomOf="@id/tv_nick_title"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/barrier_title_end"
+            app:layout_constraintTop_toTopOf="@id/tv_nick_title"
+            tools:text="@string/layout_dialog_room_pk_received_03" />
+
+        <TextView
+            android:id="@+id/tv_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="#FFF7C0"
+            android:textSize="@dimen/dp_12"
+            app:layout_constraintBottom_toBottomOf="@id/tv_time_title"
+            app:layout_constraintStart_toStartOf="@id/tv_nick"
+            app:layout_constraintTop_toTopOf="@id/tv_time_title"
+            tools:text="@string/layout_dialog_room_pk_received_05" />
 
         <TextView
             android:id="@+id/tv_desc"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="15dp"
+            android:textColor="#FFF7C0"
-            android:textColor="#ffe8e035"
+            android:textSize="@dimen/dp_12"
-            android:textSize="16sp"
-            android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="@id/tv_desc_title"
-            app:layout_constraintStart_toEndOf="@id/tv_desc_title"
+            app:layout_constraintStart_toStartOf="@id/tv_nick"
             app:layout_constraintTop_toTopOf="@id/tv_desc_title"
-            tools:text="@string/layout_dialog_room_pk_received_07" />
+            tools:text="@string/layout_dialog_room_pk_received_07"/>
 
         <TextView
             android:id="@+id/tv_refuse"
-            android:layout_width="110dp"
+            android:layout_width="@dimen/dp_108"
-            android:layout_height="35dp"
+            android:layout_height="@dimen/dp_38"
-            android:layout_marginStart="16dp"
+            android:layout_marginStart="@dimen/dp_28"
-            android:layout_marginTop="25dp"
+            android:layout_marginBottom="@dimen/dp_30"
-            android:layout_marginBottom="16dp"
+            android:background="@drawable/shape_g_66e6e6e6_66f3f5fa_19_lr"
-            android:background="@drawable/base_shape_negative_30dp"
             android:gravity="center"
             android:includeFontPadding="false"
             android:text="@string/layout_dialog_room_pk_received_08"
-            android:textColor="@color/base_color_negative_text"
+            android:textColor="@color/white"
-            android:textSize="12sp"
+            android:textSize="@dimen/dp_16"
+            android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
-            app:layout_constraintTop_toBottomOf="@id/tv_desc_title" />
 
         <TextView
             android:id="@+id/tv_received"
-            android:layout_width="110dp"
+            android:layout_width="@dimen/dp_108"
-            android:layout_height="35dp"
+            android:layout_height="@dimen/dp_38"
-            android:layout_marginEnd="16dp"
+            android:layout_marginEnd="@dimen/dp_28"
-            android:background="@drawable/base_shape_positive_30dp"
+            android:background="@drawable/base_shape_positive_19dp"
             android:gravity="center"
             android:includeFontPadding="false"
             android:text="@string/layout_dialog_room_pk_received_09"
-            android:textColor="@color/base_color_positive_text"
+            android:textColor="@color/white"
-            android:textSize="12sp"
+            android:textSize="@dimen/dp_16"
+            android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/tv_refuse" />
 

app/src/main/res/layout/layout_room_pk_board_view.xml

@@ -1,283 +1,324 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout>
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="339dp"
-    android:layout_height="233dp">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/cl_root"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_width="339dp"
+        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_height="233dp"
+        android:id="@+id/layout_content"
-        android:background="@drawable/bg_room_pk_board"
+        android:layout_width="@dimen/dp_309"
-        android:orientation="horizontal"
+        android:layout_height="wrap_content"
-        tools:contentDescription="@string/layout_layout_room_pk_board_view_01">
+        android:layout_gravity="center">
+
+        <com.chwl.app.view.AutoMirroredImageView
+            android:id="@+id/iv_bg"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_285"
+            android:layout_marginTop="@dimen/dp_9"
+            android:scaleType="fitXY"
+            android:src="@drawable/room_pk_bg_full"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ProgressBar
+            android:id="@+id/pb_score"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="@dimen/dp_217"
+            android:layout_height="@dimen/dp_15"
+            android:max="100"
+            android:progress="50"
+            android:progressDrawable="@drawable/room_room_pk_bg_board_pb"
+            app:layout_constraintBottom_toBottomOf="@id/iv_avatar_left"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@id/iv_avatar_left" />
+
+        <com.chwl.app.view.AutoMirroredImageView
+            android:id="@+id/iv_action_left"
+            android:layout_width="@dimen/dp_71"
+            android:layout_height="@dimen/dp_14"
+            android:layout_marginStart="@dimen/dp_39"
+            android:src="@drawable/room_pk_bg_action_left"
+            app:layout_constraintBottom_toTopOf="@id/pb_score"
+            app:layout_constraintStart_toStartOf="parent" />
 
         <TextView
-            android:id="@+id/tv_time"
+            android:id="@+id/tv_send_gift"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
-            android:layout_marginTop="6dp"
+            android:gravity="center"
             android:includeFontPadding="false"
-            android:text="00:00"
+            android:paddingHorizontal="@dimen/dp_6"
-            android:textColor="#fffff600"
+            android:text="@string/layout_layout_room_pk_board_view_05"
-            android:textSize="16dp"
+            android:textColor="#FFFABD"
-            app:layout_constraintEnd_toEndOf="parent"
+            android:textSize="@dimen/dp_12"
-            app:layout_constraintHorizontal_bias="0.69"
+            app:autoSizeMaxTextSize="@dimen/dp_12"
-            app:layout_constraintStart_toStartOf="parent"
+            app:autoSizeMinTextSize="@dimen/dp_6"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:autoSizeStepGranularity="1px"
+            app:autoSizeTextType="uniform"
+            app:layout_constraintBottom_toBottomOf="@id/iv_action_left"
+            app:layout_constraintEnd_toEndOf="@id/iv_action_left"
+            app:layout_constraintStart_toStartOf="@id/iv_action_left"
+            app:layout_constraintTop_toTopOf="@id/iv_action_left" />
+
+        <com.chwl.app.view.AutoMirroredImageView
+            android:id="@+id/iv_action_right"
+            android:layout_width="@dimen/dp_71"
+            android:layout_height="@dimen/dp_14"
+            android:layout_marginEnd="@dimen/dp_39"
+            android:src="@drawable/room_pk_bg_action_right"
+            app:layout_constraintBottom_toTopOf="@id/pb_score"
+            app:layout_constraintEnd_toEndOf="parent" />
 
         <TextView
-            android:id="@+id/tv_end_hint"
+            android:id="@+id/tv_go_another_room"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
-            android:layout_marginTop="8dp"
+            android:gravity="center"
             android:includeFontPadding="false"
-            android:text="@string/layout_layout_room_pk_board_view_02"
+            android:paddingHorizontal="@dimen/dp_6"
-            android:textColor="#fffff600"
+            android:text="@string/layout_layout_room_pk_board_view_06"
-            android:textSize="11dp"
+            android:textColor="@color/white"
-            android:visibility="gone"
+            android:textSize="@dimen/dp_12"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:autoSizeMaxTextSize="@dimen/dp_12"
-            app:layout_constraintHorizontal_bias="0.72"
+            app:autoSizeMinTextSize="@dimen/dp_6"
-            app:layout_constraintStart_toStartOf="parent"
+            app:autoSizeStepGranularity="1px"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:autoSizeTextType="uniform"
+            app:layout_constraintBottom_toBottomOf="@id/iv_action_right"
+            app:layout_constraintEnd_toEndOf="@id/iv_action_right"
+            app:layout_constraintStart_toStartOf="@id/iv_action_right"
+            app:layout_constraintTop_toTopOf="@id/iv_action_right" />
 
-        <View
+        <com.google.android.material.imageview.ShapeableImageView
-            android:id="@+id/view_help_anchor"
+            android:id="@+id/iv_avatar_left"
-            android:layout_width="1dp"
+            android:layout_width="@dimen/dp_43"
-            android:layout_height="1dp"
+            android:layout_height="@dimen/dp_43"
-            android:layout_marginStart="72dp"
+            android:layout_marginStart="@dimen/dp_10"
-            android:layout_marginTop="33dp"
+            android:layout_marginTop="@dimen/dp_56"
+            android:src="@drawable/default_avatar"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="@id/iv_bg"
+            app:shapeAppearance="@style/shape_circle" />
 
         <ImageView
-            android:id="@+id/iv_help"
+            android:id="@+id/iv_avatar_border_left"
-            android:layout_width="wrap_content"
+            android:layout_width="@dimen/dp_45"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/dp_45"
-            android:layout_marginTop="6dp"
+            app:layout_constraintBottom_toBottomOf="@id/iv_avatar_left"
-            android:src="@drawable/ic_room_pk_board_help"
+            app:layout_constraintEnd_toEndOf="@id/iv_avatar_left"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@id/iv_avatar_left"
-            app:layout_constraintHorizontal_bias="0.45"
+            app:layout_constraintTop_toTopOf="@id/iv_avatar_left" />
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/tv_room_name_left"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="12dp"
+            android:layout_marginStart="@dimen/dp_9"
-            android:layout_marginTop="40dp"
+            android:layout_marginTop="@dimen/dp_34"
+            android:ellipsize="end"
+            android:includeFontPadding="false"
+            android:maxWidth="@dimen/dp_120"
             android:textColor="@color/white"
-            android:textSize="14dp"
+            android:textSize="@dimen/dp_12"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toTopOf="@id/iv_bg"
-            tools:text="@string/layout_layout_room_pk_board_view_03" />
+            tools:text="Name" />
+
+        <com.google.android.material.imageview.ShapeableImageView
+            android:id="@+id/iv_avatar_right"
+            android:layout_width="@dimen/dp_43"
+            android:layout_height="@dimen/dp_43"
+            android:layout_marginEnd="@dimen/dp_10"
+            android:src="@drawable/default_avatar"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/iv_avatar_left"
+            app:shapeAppearance="@style/shape_circle" />
+
+        <ImageView
+            android:id="@+id/iv_avatar_border_right"
+            android:layout_width="@dimen/dp_45"
+            android:layout_height="@dimen/dp_45"
+            app:layout_constraintBottom_toBottomOf="@id/iv_avatar_right"
+            app:layout_constraintEnd_toEndOf="@id/iv_avatar_right"
+            app:layout_constraintStart_toStartOf="@id/iv_avatar_right"
+            app:layout_constraintTop_toTopOf="@id/iv_avatar_right" />
 
         <TextView
             android:id="@+id/tv_room_name_right"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="40dp"
+            android:layout_marginEnd="@dimen/dp_9"
-            android:layout_marginEnd="12dp"
+            android:ellipsize="end"
+            android:includeFontPadding="false"
+            android:maxWidth="@dimen/dp_120"
             android:textColor="@color/white"
-            android:textSize="14dp"
+            android:textSize="@dimen/dp_12"
+            app:layout_constraintBottom_toBottomOf="@id/tv_room_name_left"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toTopOf="@id/tv_room_name_left"
-            tools:text="@string/layout_layout_room_pk_board_view_04" />
+            tools:text="Name" />
 
-        <com.chwl.app.common.widget.CircleImageView
+        <ImageView
-            android:id="@+id/iv_avatar_left"
+            android:id="@+id/iv_help"
-            android:layout_width="44dp"
+            android:layout_width="@dimen/dp_16"
-            android:layout_height="44dp"
+            android:layout_height="@dimen/dp_16"
-            android:layout_marginStart="30dp"
+            android:layout_marginTop="@dimen/dp_11"
-            android:layout_marginTop="10dp"
+            android:layout_marginEnd="@dimen/dp_13"
-            android:src="@drawable/default_avatar"
+            android:src="@drawable/room_pk_ic_help"
-            app:cborder_color="#FFFF4D73"
-            app:cborder_width="1dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_room_name_left" />
-
-        <com.chwl.app.common.widget.CircleImageView
-            android:id="@+id/iv_avatar_right"
-            android:layout_width="44dp"
-            android:layout_height="44dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="30dp"
-            android:src="@drawable/default_avatar"
-            app:cborder_color="#FF45C0FF"
-            app:cborder_width="1dp"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_room_name_right" />
+            app:layout_constraintTop_toTopOf="@id/iv_bg" />
-
-        <TextView
-            android:id="@+id/tv_send_gift"
-            android:layout_width="50dp"
-            android:layout_height="18dp"
-            android:layout_marginStart="8dp"
-            android:background="@drawable/bg_room_pk_send_gift"
-            android:gravity="center"
-            android:includeFontPadding="false"
-            android:text="@string/layout_layout_room_pk_board_view_05"
-            android:textColor="#ffffffff"
-            android:textSize="12dp"
-            app:layout_constraintStart_toEndOf="@id/iv_avatar_left"
-            app:layout_constraintTop_toTopOf="@id/iv_avatar_left" />
-
-        <TextView
-            android:id="@+id/tv_go_another_room"
-            android:layout_width="50dp"
-            android:layout_height="18dp"
-            android:layout_marginEnd="8dp"
-            android:background="@drawable/bg_room_pk_go_another_room"
-            android:gravity="center"
-            android:includeFontPadding="false"
-            android:text="@string/layout_layout_room_pk_board_view_06"
-            android:textColor="#ffffffff"
-            android:textSize="12dp"
-            app:layout_constraintEnd_toStartOf="@id/iv_avatar_right"
-            app:layout_constraintTop_toTopOf="@id/iv_avatar_right" />
-
-        <ProgressBar
-            android:id="@+id/pb_score"
-            style="?android:attr/progressBarStyleHorizontal"
-            android:layout_width="0dp"
-            android:layout_height="12dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
-            android:max="100"
-            android:progress="50"
-            android:progressDrawable="@drawable/bg_room_pk_board_pb"
-            app:layout_constraintBottom_toBottomOf="@id/iv_avatar_left"
-            app:layout_constraintEnd_toStartOf="@id/iv_avatar_right"
-            app:layout_constraintStart_toEndOf="@id/iv_avatar_left" />
-
-        <com.opensource.svgaplayer.SVGAImageView
-            android:id="@+id/svga_hot"
-            android:layout_width="18dp"
-            android:layout_height="27dp"
-            android:layout_marginBottom="18dp"
-            app:autoPlay="true"
-            app:layout_constraintBottom_toBottomOf="@id/iv_details"
-            app:layout_constraintEnd_toStartOf="@id/iv_avatar_right"
-            app:layout_constraintHorizontal_bias="0"
-            app:layout_constraintStart_toEndOf="@id/iv_avatar_left"
-            app:source="svga/room_pk_pb_indicator.svga" />
 
         <TextView
             android:id="@+id/tv_score_left"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="5dp"
+            android:maxLines="1"
-            android:fontFamily="sans-serif"
+            android:text="0"
-            android:includeFontPadding="false"
             android:textColor="@color/white"
-            android:textSize="9dp"
+            android:textSize="@dimen/dp_12"
-            app:layout_constraintBottom_toBottomOf="@id/pb_score"
+            app:layout_constraintBottom_toBottomOf="@id/iv_avatar_border_left"
-            app:layout_constraintStart_toStartOf="@id/pb_score"
+            app:layout_constraintStart_toEndOf="@id/iv_avatar_border_left"
-            app:layout_constraintTop_toTopOf="@id/pb_score"
+            app:layout_constraintTop_toBottomOf="@id/pb_score" />
-            tools:text="123456" />
 
         <TextView
             android:id="@+id/tv_score_right"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="5dp"
+            android:maxLines="1"
-            android:fontFamily="sans-serif"
+            android:text="0"
-            android:includeFontPadding="false"
             android:textColor="@color/white"
-            android:textSize="9dp"
+            android:textSize="@dimen/dp_12"
+            app:layout_constraintBottom_toBottomOf="@id/tv_score_left"
+            app:layout_constraintEnd_toStartOf="@id/iv_avatar_border_right"
+            app:layout_constraintTop_toTopOf="@id/tv_score_left" />
+
+        <ImageView
+            android:id="@+id/iv_vs"
+            android:layout_width="@dimen/dp_39"
+            android:layout_height="@dimen/dp_20"
+            android:layout_marginBottom="0.5dp"
+            android:src="@drawable/room_pk_ic_vs"
+            app:layout_constraintBottom_toTopOf="@id/pb_score"
+            app:layout_constraintEnd_toEndOf="@id/pb_score"
+            app:layout_constraintStart_toStartOf="@id/pb_score" />
+
+        <com.opensource.svgaplayer.SVGAImageView
+            android:id="@+id/svga_hot"
+            android:layout_width="@dimen/dp_24"
+            android:layout_height="@dimen/dp_35"
+            android:src="@drawable/room_pk_ic_hot"
             app:layout_constraintBottom_toBottomOf="@id/pb_score"
             app:layout_constraintEnd_toEndOf="@id/pb_score"
-            app:layout_constraintTop_toTopOf="@id/pb_score"
+            app:layout_constraintHorizontal_bias="0.5"
-            tools:text="123456" />
+            app:layout_constraintStart_toStartOf="@id/pb_score"
-
+            app:layout_constraintTop_toTopOf="@id/pb_score" />
 
         <ImageView
             android:id="@+id/iv_details"
-            android:layout_width="30dp"
+            android:layout_width="@dimen/dp_28"
-            android:layout_height="20dp"
+            android:layout_height="@dimen/dp_20"
-            android:scaleType="center"
+            android:layout_marginTop="@dimen/dp_17"
-            android:src="@drawable/ic_room_pk_top"
+            android:padding="@dimen/dp_5"
+            android:src="@drawable/room_pk_ic_details"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/pb_score" />
 
+        <ImageView
+            android:id="@+id/iv_top"
+            android:layout_width="@dimen/dp_180"
+            android:layout_height="0dp"
+            android:src="@drawable/room_pk_bg_top"
+            app:layout_constraintDimensionRatio="180:32.5"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/iv_top_pk"
+            android:layout_width="@dimen/dp_30"
+            android:layout_height="wrap_content"
+            android:src="@drawable/room_pk_ic_pk"
+            app:layout_constraintBottom_toBottomOf="@id/iv_top"
+            app:layout_constraintEnd_toStartOf="@id/tv_time"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintStart_toStartOf="@id/iv_top"
+            app:layout_constraintTop_toTopOf="@id/iv_top" />
+
         <TextView
-            android:id="@+id/tv_contribute_title"
+            android:id="@+id/tv_time"
-            android:layout_width="53dp"
+            android:layout_width="wrap_content"
-            android:layout_height="22dp"
+            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="@dimen/dp_3"
-            android:background="@drawable/bg_room_pk_contribute_text"
-            android:gravity="center"
             android:includeFontPadding="false"
-            android:text="@string/layout_layout_room_pk_board_view_07"
             android:textColor="@color/white"
-            android:textSize="14dp"
+            android:textSize="@dimen/dp_14"
-            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="@id/iv_top"
+            app:layout_constraintEnd_toEndOf="@id/iv_top"
+            app:layout_constraintStart_toEndOf="@id/iv_top_pk"
+            app:layout_constraintTop_toTopOf="@id/iv_top"
+            tools:text="00:00" />
+
+        <ImageView
+            android:id="@+id/iv_charm_title"
+            android:layout_width="@dimen/dp_145"
+            android:layout_height="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_7"
+            android:src="@drawable/room_pk_ic_text_charm"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/iv_details" />
 
-        <TextView
-            android:id="@+id/tv_charm_title"
-            android:layout_width="53dp"
-            android:layout_height="22dp"
-            android:layout_marginTop="24dp"
-            android:background="@drawable/bg_room_pk_charm_text"
-            android:gravity="center"
-            android:includeFontPadding="false"
-            android:text="@string/layout_layout_room_pk_board_view_08"
-            android:textColor="@color/white"
-            android:textSize="14dp"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_contribute_title" />
-
-
-        <com.chwl.app.avroom.anotherroompk.RoomPKRankListView
-            android:id="@+id/view_rank_list_contribute_left"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="@id/tv_contribute_title"
-            app:layout_constraintEnd_toStartOf="@id/tv_contribute_title"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/tv_contribute_title" />
-
         <com.chwl.app.avroom.anotherroompk.RoomPKRankListView
             android:id="@+id/view_rank_list_charm_left"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="@id/tv_charm_title"
+            android:layout_marginStart="@dimen/dp_18"
-            app:layout_constraintEnd_toStartOf="@id/tv_charm_title"
+            android:layout_marginTop="@dimen/dp_10"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/tv_charm_title" />
+            app:layout_constraintTop_toBottomOf="@id/iv_charm_title" />
-
-        <com.chwl.app.avroom.anotherroompk.RoomPKRankListView
-            android:id="@+id/view_rank_list_contribute_right"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="@id/tv_contribute_title"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tv_contribute_title"
-            app:layout_constraintTop_toTopOf="@id/tv_contribute_title" />
 
         <com.chwl.app.avroom.anotherroompk.RoomPKRankListView
             android:id="@+id/view_rank_list_charm_right"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="@id/tv_charm_title"
+            android:layout_marginEnd="@dimen/dp_18"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tv_charm_title"
+            app:layout_constraintTop_toTopOf="@id/view_rank_list_charm_left" />
-            app:layout_constraintTop_toTopOf="@id/tv_charm_title" />
+
+
+        <ImageView
+            android:id="@+id/iv_contribute_title"
+            android:layout_width="@dimen/dp_145"
+            android:layout_height="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_12"
+            android:src="@drawable/room_pk_ic_text_wealth"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/view_rank_list_charm_left" />
+
+        <com.chwl.app.avroom.anotherroompk.RoomPKRankListView
+            android:id="@+id/view_rank_list_contribute_left"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_18"
+            android:layout_marginTop="@dimen/dp_10"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/iv_contribute_title" />
+
+
+        <com.chwl.app.avroom.anotherroompk.RoomPKRankListView
+            android:id="@+id/view_rank_list_contribute_right"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/dp_18"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/view_rank_list_contribute_left" />
 
         <androidx.constraintlayout.widget.Group
             android:id="@+id/group_rank"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:constraint_referenced_ids="view_rank_list_charm_right,view_rank_list_contribute_right,view_rank_list_charm_left,view_rank_list_contribute_left,tv_charm_title,tv_contribute_title" />
+            app:constraint_referenced_ids="view_rank_list_charm_right,view_rank_list_contribute_right,view_rank_list_charm_left,view_rank_list_contribute_left,iv_charm_title,iv_contribute_title" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</FrameLayout>
+</layout>

app/src/main/res/layout/layout_room_pk_help_view.xml

@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="244dp"
+    android:layout_width="@dimen/dp_209"
-    android:layout_height="177dp"
+    android:layout_height="wrap_content"
-    android:background="@drawable/bg_room_pk_help"
+    android:background="@drawable/shape_cc140b25_11dp"
     android:orientation="horizontal"
     tools:contentDescription="@string/layout_layout_room_pk_help_view_01">
 
     <TextView
-        android:layout_width="wrap_content"
+        android:layout_marginVertical="@dimen/dp_10"
+        android:layout_marginHorizontal="@dimen/dp_8"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
-        android:layout_marginTop="24dp"
-        android:layout_marginEnd="10dp"
         android:text="@string/room_pk_help"
-        android:textColor="@color/white"
+        android:textColor="#FFFFFF"
-        android:textSize="12sp" />
+        android:textSize="@dimen/dp_12" />
 </FrameLayout>

app/src/main/res/layout/layout_room_pk_rank_list_view.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -7,105 +8,120 @@
     tools:contentDescription="@string/layout_layout_room_pk_rank_list_view_01">
 
     <FrameLayout
-        android:layout_width="wrap_content"
+        android:layout_width="@dimen/dp_32"
-        android:layout_height="wrap_content">
+        android:layout_height="@dimen/dp_32">
 
-        <com.chwl.app.common.widget.CircleImageView
+        <ImageView
+            android:id="@+id/iv_avatar_seat_1"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="@drawable/room_pk_ic_seat_wealth" />
+
+        <com.google.android.material.imageview.ShapeableImageView
             android:id="@+id/iv_avatar_1"
-            android:layout_width="32dp"
+            android:layout_width="match_parent"
-            android:layout_height="32dp"
+            android:layout_height="match_parent"
-            android:layout_gravity="bottom"
+            android:layout_margin="@dimen/dp_0_5"
-            android:layout_marginBottom="2dp"
+            app:shapeAppearance="@style/shape_circle" />
-            android:src="@drawable/bg_room_pk_rank_contribute_default" />
-
-        <View
-            android:id="@+id/view_bg_1"
-            android:layout_width="32dp"
-            android:layout_height="38dp"
-            android:layout_gravity="bottom"
-            android:layout_marginBottom="2dp"
-            android:background="@drawable/bg_room_pk_rank_contribute1" />
 
         <TextView
             android:id="@+id/tv_value_1"
-            android:layout_width="32dp"
+            android:layout_width="match_parent"
-            android:layout_height="10dp"
+            android:layout_height="@dimen/dp_8"
             android:layout_gravity="bottom"
             android:background="@drawable/bg_room_pk_contribute"
             android:gravity="center"
             android:includeFontPadding="false"
+            android:maxLines="1"
             android:textColor="@color/white"
-            android:textSize="9dp"
+            android:textSize="@dimen/dp_9"
-            tools:text="11w" />
+            android:visibility="gone"
+            app:autoSizeMaxTextSize="@dimen/dp_9"
+            app:autoSizeMinTextSize="@dimen/dp_5"
+            app:autoSizeStepGranularity="1px"
+            app:autoSizeTextType="uniform"
+            tools:text="11w"
+            tools:visibility="visible" />
 
     </FrameLayout>
 
     <FrameLayout
-        android:layout_width="wrap_content"
+        android:layout_width="@dimen/dp_32"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/dp_32"
-        android:layout_gravity="bottom"
+        android:layout_marginStart="@dimen/dp_14">
-        android:layout_marginStart="10dp">
 
-        <com.chwl.app.common.widget.CircleImageView
+        <ImageView
+            android:id="@+id/iv_avatar_seat_2"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="@drawable/room_pk_ic_seat_wealth" />
+
+        <com.google.android.material.imageview.ShapeableImageView
             android:id="@+id/iv_avatar_2"
-            android:layout_width="32dp"
+            android:layout_width="match_parent"
-            android:layout_height="32dp"
+            android:layout_height="match_parent"
-            android:layout_marginBottom="2dp"
+            android:layout_margin="@dimen/dp_0_5"
-            android:src="@drawable/bg_room_pk_rank_contribute_default" />
+            app:shapeAppearance="@style/shape_circle" />
-
-        <View
-            android:id="@+id/view_bg_2"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:layout_marginBottom="2dp"
-            android:background="@drawable/bg_room_pk_rank_contribute2" />
 
         <TextView
             android:id="@+id/tv_value_2"
-            android:layout_width="32dp"
+            android:layout_width="match_parent"
-            android:layout_height="10dp"
+            android:layout_height="@dimen/dp_8"
             android:layout_gravity="bottom"
             android:background="@drawable/bg_room_pk_contribute"
             android:gravity="center"
             android:includeFontPadding="false"
+            android:maxLines="1"
             android:textColor="@color/white"
-            android:textSize="9dp"
+            android:textSize="@dimen/dp_9"
-            tools:text="11w" />
+            android:visibility="gone"
+            app:autoSizeMaxTextSize="@dimen/dp_9"
+            app:autoSizeMinTextSize="@dimen/dp_5"
+            app:autoSizeStepGranularity="1px"
+            app:autoSizeTextType="uniform"
+            tools:text="11w"
+            tools:visibility="visible" />
 
     </FrameLayout>
 
     <FrameLayout
-        android:layout_width="wrap_content"
+        android:layout_width="@dimen/dp_32"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/dp_32"
-        android:layout_gravity="bottom"
+        android:layout_marginStart="@dimen/dp_14">
-        android:layout_marginStart="10dp">
 
-        <com.chwl.app.common.widget.CircleImageView
+        <ImageView
+            android:id="@+id/iv_avatar_seat_3"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:src="@drawable/room_pk_ic_seat_wealth" />
+
+        <com.google.android.material.imageview.ShapeableImageView
             android:id="@+id/iv_avatar_3"
-            android:layout_width="32dp"
+            android:layout_width="match_parent"
-            android:layout_height="32dp"
+            android:layout_height="match_parent"
-            android:layout_marginBottom="2dp"
+            android:layout_margin="@dimen/dp_0_5"
-            android:src="@drawable/bg_room_pk_rank_contribute_default" />
+            app:shapeAppearance="@style/shape_circle" />
-
-        <View
-            android:id="@+id/view_bg_3"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:layout_marginBottom="2dp"
-            android:background="@drawable/bg_room_pk_rank_contribute2" />
 
         <TextView
             android:id="@+id/tv_value_3"
-            android:layout_width="32dp"
+            android:layout_width="match_parent"
-            android:layout_height="10dp"
+            android:layout_height="@dimen/dp_8"
             android:layout_gravity="bottom"
             android:background="@drawable/bg_room_pk_contribute"
             android:gravity="center"
             android:includeFontPadding="false"
+            android:maxLines="1"
             android:textColor="@color/white"
-            android:textSize="9dp"
+            android:textSize="@dimen/dp_9"
-            tools:text="11w" />
+            android:visibility="gone"
+            app:autoSizeMaxTextSize="@dimen/dp_9"
+            app:autoSizeMinTextSize="@dimen/dp_5"
+            app:autoSizeStepGranularity="1px"
+            app:autoSizeTextType="uniform"
+            tools:text="11w"
+            tools:visibility="visible" />
 
     </FrameLayout>
 
+
 </LinearLayout>

modules/module_base/src/main/res/drawable/base_shape_positive_19dp.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient android:startColor="#70E9FF" android:centerColor="#AE87FF" android:endColor="#FF5CE1"/>
+    <corners android:radius="19dp" />
+</shape>