个播PK:UI对稿

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

@@ -78,7 +78,12 @@ class SingleRoomPKBoardView @JvmOverloads constructor(
 
         binding.pbScore.progress = ((roomPkBean?.cPercent ?: 0.5f) * 100).toInt()
         val layoutParams = binding.svgaHot.layoutParams as ConstraintLayout.LayoutParams
-        layoutParams.horizontalBias = roomPkBean?.cPercent ?: 0.5f
+        val percent = roomPkBean?.cPercent ?: 0.5f
+        layoutParams.horizontalBias = when {
+            percent < 0.02f -> 0.02f
+            percent > 0.98f -> 0.98f
+            else -> percent
+        }
         binding.svgaHot.layoutParams = layoutParams
 
         binding.tvScoreLeft.text = "${roomPkBean?.cAmount ?: 0}"

app/src/main/java/com/yizhuan/erban/avroom/singleroompk/SingleRoomPkFinishDialog.kt

@@ -66,7 +66,7 @@ class SingleRoomPkFinishDialog : BaseDialog<DialogSingleRoomPkFinishBinding>() {
             binding.groupRank3.isVisible = false
         }
 
-        Observable.intervalRange(0, 5, 0, 1, TimeUnit.SECONDS)
+        Observable.intervalRange(0, 6, 0, 1, TimeUnit.SECONDS)
             .compose(bindToLifecycle())
             .observeOn(AndroidSchedulers.mainThread())
             .doOnComplete { dismissAllowingStateLoss() }

app/src/main/java/com/yizhuan/erban/avroom/widget/RoomEffectView.java

@@ -883,7 +883,7 @@ public class RoomEffectView extends FrameLayout {
         ((TextView) rootView.findViewById(R.id.tv_nick)).setText(StringExtensionKt.subAndReplaceDot(roomPkBean.getNick(), 6));
         ((TextView) rootView.findViewById(R.id.tv_desc)).setText(roomPkBean.getDesc());
         ImageLoadUtils.loadImage(getContext(), roomPkBean.getAvatar(), rootView.findViewById(R.id.iv_avatar));
-        rootView.findViewById(R.id.tv_go_room).setOnClickListener(v -> AVRoomActivity.start(getContext(), roomPkBean.getUid()));
+        rootView.setOnClickListener(v -> AVRoomActivity.start(getContext(), roomPkBean.getUid()));
         binding.flSingleRoomRankNotify.addView(rootView);
         animationLuckyGift = AnimationUtils.loadAnimation(mContext, R.anim.anim_box_notify);
         rootView.startAnimation(animationLuckyGift);

app/src/main/java/com/yizhuan/erban/fansteam/FansTeamJoinActivity.kt

@@ -15,6 +15,7 @@ import com.yizhuan.xchat_android_core.UriProvider
 import com.yizhuan.xchat_android_core.gift.GiftModel
 import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
 import com.yizhuan.xchat_android_core.utils.net.handleBeanData
+import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
 import com.yizhuan.xchat_android_core.utils.toast
 
 class FansTeamJoinActivity : BaseViewBindingActivity<ActivityFansTeamJoinBinding>() {
@@ -53,7 +54,7 @@ class FansTeamJoinActivity : BaseViewBindingActivity<ActivityFansTeamJoinBinding
         fansTeamViewModel.fansTeamJoinInfoLiveData.observe(this) {
             it?.let {
                 binding.ivAvatar.load(it.anchorAvatar)
-                binding.tvFansTeamName.text = it.anchorNick
+                binding.tvFansTeamName.text = it.anchorNick.subAndReplaceDot(7) + "的粉丝团"
                 binding.tvFansTeamFansNum.text = "${it.teamNum}人"
                 binding.ivRank0.load(it.avatarList.getOrNull(0))
                 binding.ivRank1.load(it.avatarList.getOrNull(1))

app/src/main/java/com/yizhuan/erban/fansteam/FansTeamJoinedActivity.kt

@@ -30,6 +30,7 @@ import com.yizhuan.xchat_android_core.home.bean.VisitorInfo
 import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
 import com.yizhuan.xchat_android_core.module_hall.hall.HallModel
 import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminInfo
+import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
 import com.yizhuan.xchat_android_core.utils.toast
 
 class FansTeamJoinedActivity : BaseViewBindingActivity<ActivityFansTeamJoinedBinding>() {
@@ -77,7 +78,7 @@ class FansTeamJoinedActivity : BaseViewBindingActivity<ActivityFansTeamJoinedBin
         fansTeamViewModel.fansTeamJoinedInfoLiveData.observe(this) {
             it?.let {
                 binding.ivAvatar.load(it.anchorAvatar)
-                binding.tvFansTeamName.text = it.anchorNick + "的粉丝团"
+                binding.tvFansTeamName.text = it.anchorNick.subAndReplaceDot(7) + "的粉丝团"
                 binding.tvFansTeamFansNum.text = "${it.teamNum}人"
 
                 binding.ivMeAvatar.load(it.memberAvatar)

app/src/main/java/com/yizhuan/erban/fansteam/FansTeamTaskAdapter.kt

@@ -19,13 +19,13 @@ class FansTeamTaskAdapter :
             .setText(R.id.tv_task_desc, item.taskDesc)
 
         val tvTaskStatus = helper.getView<TextView>(R.id.tv_task_status)
-        tvTaskStatus.text = if (item.isFinished) {
-            tvTaskStatus.setBackgroundResource(R.drawable.shape_ff4e7f_radius_4dp)
-            tvTaskStatus.setTextColor(Color.WHITE)
-            "已完成"
-        } else {
+        tvTaskStatus.text = if (item.isFinished || item.awardVal == 0) {
             tvTaskStatus.setBackgroundResource(R.drawable.shape_f4f4f4_radius_4dp)
             tvTaskStatus.setTextColor("#FF999999".toColorInt())
+            if (item.isFinished) "已完成" else "${item.awardVal}/${item.totalNum}"
+        } else {
+            tvTaskStatus.setBackgroundResource(R.drawable.shape_ff4e7f_radius_4dp)
+            tvTaskStatus.setTextColor(Color.WHITE)
             "${item.awardVal}/${item.totalNum}"
         }
         helper.getView<ImageView>(R.id.iv_task_logo).load(item.icon)

app/src/main/res/drawable/shape_white_alpha_66.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">
+    <corners android:radius="20dp" />
+    <solid android:color="#66FFFFFF" />
+</shape>

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

@@ -58,6 +58,7 @@
             android:id="@+id/recycler_view"
             android:layout_width="match_parent"
             android:layout_height="0dp"
+            android:layout_marginTop="10dp"
             android:clipToPadding="false"
             android:paddingBottom="83dp"
             app:layout_constraintBottom_toBottomOf="parent"

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

@@ -27,17 +27,16 @@
 
         <TextView
             android:id="@+id/tv_close_time"
-            android:layout_width="32dp"
-            android:layout_height="16dp"
+            android:layout_width="35dp"
+            android:layout_height="26dp"
             android:layout_marginEnd="10dp"
-            android:background="@drawable/common_single_room_pk_btn_bg"
+            android:background="@drawable/shape_white_alpha_66"
             android:gravity="center"
             android:includeFontPadding="false"
             android:textColor="@color/white"
             android:textSize="13sp"
-            app:layout_constraintBottom_toBottomOf="@id/tv_title"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/tv_title"
+            app:layout_constraintTop_toTopOf="parent"
             tools:text="09" />
 
         <TextView

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

@@ -42,16 +42,6 @@
         tools:src="@drawable/default_avatar"
         tools:visibility="visible" />
 
-    <ImageView
-        android:id="@+id/iv_pk_result"
-        android:layout_width="66dp"
-        android:layout_height="48dp"
-        android:layout_marginBottom="10dp"
-        app:layout_constraintBottom_toBottomOf="@id/svga_head_wear"
-        app:layout_constraintEnd_toEndOf="@id/avatar"
-        app:layout_constraintStart_toStartOf="@id/avatar"
-        tools:src="@drawable/single_room_pk_ic_result_win" />
-
     <ImageView
         android:id="@+id/up_image"
         android:layout_width="90dp"
@@ -107,6 +97,16 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <ImageView
+        android:id="@+id/iv_pk_result"
+        android:layout_width="66dp"
+        android:layout_height="48dp"
+        android:layout_marginBottom="10dp"
+        app:layout_constraintBottom_toBottomOf="@id/svga_head_wear"
+        app:layout_constraintEnd_toEndOf="@id/avatar"
+        app:layout_constraintStart_toStartOf="@id/avatar"
+        tools:src="@drawable/single_room_pk_ic_result_win" />
+
     <ImageView
         android:id="@+id/mute_image"
         android:layout_width="15dp"
@@ -150,7 +150,7 @@
 
         <ImageView
             android:id="@+id/iv_attention"
-            android:layout_width="50dp"
+            android:layout_width="30dp"
             android:layout_height="20dp"
             android:layout_marginStart="4dp"
             android:src="@drawable/single_room_pk_bg_attention"

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

@@ -87,7 +87,7 @@
 
         <ImageView
             android:id="@+id/iv_find_him"
-            android:layout_width="50dp"
+            android:layout_width="30dp"
             android:layout_height="20dp"
             android:layout_marginStart="4dp"
             android:src="@drawable/single_room_pk_bg_find_him"
@@ -245,18 +245,18 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="12dp"
-            android:layout_marginBottom="3dp"
             app:layout_constraintBottom_toBottomOf="@id/bg_pk_board"
-            app:layout_constraintStart_toStartOf="@id/bg_pk_board" />
+            app:layout_constraintStart_toStartOf="@id/bg_pk_board"
+            app:layout_constraintTop_toBottomOf="@id/pb_score" />
 
         <com.yizhuan.erban.avroom.singleroompk.SingleRoomPKRankListView
             android:id="@+id/view_rank_list_contribute_right"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="12dp"
-            android:layout_marginBottom="3dp"
             app:layout_constraintBottom_toBottomOf="@id/bg_pk_board"
-            app:layout_constraintEnd_toEndOf="@id/bg_pk_board" />
+            app:layout_constraintEnd_toEndOf="@id/bg_pk_board"
+            app:layout_constraintTop_toBottomOf="@id/pb_score" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 

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

@@ -34,14 +34,14 @@
             android:id="@+id/tv_value_1"
             android:layout_width="wrap_content"
             android:layout_height="10dp"
-            android:layout_gravity="bottom"
+            android:layout_gravity="bottom|center_horizontal"
             android:layout_marginTop="28dp"
             android:fontFamily="sans-serif"
             android:gravity="center"
             android:includeFontPadding="false"
             android:textColor="@color/white"
             android:textSize="9dp"
-            tools:text="311.08w" />
+            tools:text="3" />
 
     </FrameLayout>
 
@@ -63,7 +63,7 @@
             android:id="@+id/tv_value_2"
             android:layout_width="wrap_content"
             android:layout_height="10dp"
-            android:layout_gravity="bottom"
+            android:layout_gravity="bottom|center_horizontal"
             android:layout_marginTop="28dp"
             android:gravity="center"
             android:includeFontPadding="false"
@@ -91,7 +91,7 @@
             android:id="@+id/tv_value_3"
             android:layout_width="wrap_content"
             android:layout_height="10dp"
-            android:layout_gravity="bottom"
+            android:layout_gravity="bottom|center_horizontal"
             android:layout_marginTop="28dp"
             android:gravity="center"
             android:includeFontPadding="false"

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

@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:layout_gravity="center_horizontal"
     android:background="@drawable/single_room_bg_rank_notice"
-    android:gravity="center_vertical"
+    android:gravity="center"
     android:orientation="horizontal"
     android:paddingTop="4dp"
     tools:layout_height="60dp">
@@ -14,7 +14,6 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="65dp"
         android:includeFontPadding="false"
         android:text="恭喜"
         android:textColor="@color/white"
@@ -57,11 +56,4 @@
         android:textColor="#FFFFFC4C"
         android:textSize="13dp" />
 
-    <ImageView
-        android:id="@+id/tv_go_room"
-        android:layout_width="44dp"
-        android:layout_height="20dp"
-        android:layout_marginStart="10dp"
-        android:background="@drawable/single_room_bg_rank_notice_btn" />
-
 </LinearLayout>

core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRTCEngineAdapter.java

@@ -1152,11 +1152,6 @@ public class TRTCEngineAdapter extends BaseAdapterImpl {
         if (!enableAudioFlag) {
             return -1;
         }
-        if (muted) {
-            trtcCloud.stopLocalAudio();
-        } else {
-            trtcCloud.startLocalAudio();
-        }
         trtcCloud.muteLocalAudio(muted);
         return 0;
     }