粉丝团UI优化

app/src/main/java/com/yizhuan/erban/avroom/fragment/SingleRoomFragment.kt

@@ -113,6 +113,7 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
         }
     }
 
+    @SuppressLint("SetTextI18n")
     private fun updateFansTeamInfo(initInfo: FansTeamInitInfo) {
         var clickListener: View.OnClickListener? = null
         if (!AvRoomDataManager.get().isRoomOwner && !initInfo.isAnchorFans && initInfo.hasFansTeamCurrentRoom) {
@@ -134,7 +135,8 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
                 }
             } else {
                 if (initInfo.isAnchorFans) {
-                    gameBinding.tvFansTeamOpt.text = "粉丝LV.(${initInfo.fansLevelSeq})"
+                    gameBinding.tvFansTeamOpt.text =
+                        "粉丝LV.${if (initInfo.fansLevelSeq == 0) 1 else initInfo.fansLevelSeq}"
                     clickListener = View.OnClickListener {
                         FansTeamJoinedActivity.start(requireContext())
                     }
@@ -189,7 +191,7 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
                     updateFansTeamInfo(
                         FansTeamInitInfo(
                             it.count,
-                            currFansTeamInitInfo?.fansLevelSeq ?: 0,
+                            currFansTeamInitInfo?.fansLevelSeq ?: 1,
                             roomEvent.event != RoomEvent.FANS_TEAM_OPEN_FAILED,
                             if (AuthModel.get().currentUid == it.uid) {
                                 roomEvent.event == RoomEvent.FANS_TEAM_JOIN

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

@@ -1,6 +1,9 @@
 package com.yizhuan.erban.fansteam
 
+import android.graphics.Color
 import android.widget.ImageView
+import android.widget.TextView
+import androidx.core.graphics.toColorInt
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.BaseViewHolder
 import com.yizhuan.erban.R
@@ -14,8 +17,17 @@ class FansTeamTaskAdapter :
 
         helper.setText(R.id.tv_task_title, item.taskName)
             .setText(R.id.tv_task_desc, item.taskDesc)
-            .setText(R.id.tv_task_status,"${item.awardVal}/${item.totalNum}")
 
+        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.setBackgroundResource(R.drawable.shape_f4f4f4_radius_4dp)
+            tvTaskStatus.setTextColor("#FF999999".toColorInt())
+            "${item.awardVal}/${item.totalNum}"
+        }
         helper.getView<ImageView>(R.id.iv_task_logo).load(item.icon)
     }
 }

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

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 定义轨道的背景 -->
+    <item android:id="@android:id/background">
+        <shape android:shape="rectangle">
+            <solid android:color="#FFF4F4F4" />
+            <corners android:radius="@dimen/dp_10" />
+        </shape>
+    </item>
+    <!-- 定义轨道上已完成部分的样式 -->
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape android:shape="rectangle">
+                <gradient
+                    android:angle="180"
+                    android:endColor="#FFFF49A3"
+                    android:startColor="#FFFF2B4C" />
+                <corners android:radius="@dimen/dp_10" />
+            </shape>
+        </clip>
+    </item>
+</layer-list>

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

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

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

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

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

@@ -169,7 +169,7 @@
             android:layout_marginEnd="24dp"
             android:max="100"
             android:progress="50"
-            android:progressDrawable="@drawable/pk_score_pb"
+            android:progressDrawable="@drawable/fans_team_bg_pb"
             app:layout_constraintBottom_toBottomOf="@id/iv_me_avatar"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@id/tv_value"

app/src/module_mini_world/res/layout/fragment_single_room.xml

@@ -59,7 +59,8 @@
             <FrameLayout
                 android:id="@+id/fl_fans_team_join_tip"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:visibility="gone">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -91,9 +92,9 @@
                 android:background="@drawable/bg_fans_team_entrance"
                 android:drawableEnd="@drawable/fans_team_ic_room_love"
                 android:drawablePadding="5dp"
+                android:gravity="center"
                 android:paddingStart="8dp"
                 android:paddingEnd="8dp"
-                android:gravity="center"
                 android:text="该主播暂未开通粉丝团"
                 android:textColor="@color/white"
                 android:textSize="10sp"