moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:麦位号UI调整（NO.x）

Browse Source
This commit is contained in:
max
2024-05-17 11:29:28 +08:00
parent 812061a601
commit d3b3ce8be2
9 changed files with 74 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/com/chwl/app/avroom/adapter/BaseMicroViewAdapter.java
View File

@@ -139,8 +139,6 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
@Nullable
ImageView ivHeadWear;
@Nullable
TextView tvNumber;
@Nullable
ImageView ivCharmLevelTag;
@Nullable
@@ -158,7 +156,6 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
ivAvatar = itemView.findViewById(R.id.avatar);
ivHeadWear = itemView.findViewById(R.id.iv_head_wear);
tvNick = itemView.findViewById(R.id.nick);
tvNumber = itemView.findViewById(R.id.tv_number);
ivCharmLevelTag = itemView.findViewById(R.id.iv_charm_level_tag);
ivKickGuard = itemView.findViewById(R.id.iv_kick_guard);
@@ -277,31 +274,12 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
protected void setDefalutText(int index) {
tvNick.setTextColor(Color.WHITE);
tvNick.setText(ResUtil.getString(R.string.avroom_adapter_basemicroviewadapter_01));
if (tvNumber != null) {
tvNumber.setBackgroundResource(R.drawable.icon_bg_number_default);
tvNumber.setTextColor(Color.WHITE);
tvNumber.setText(String.valueOf(index + 1));
}
tvNick.setText("NO."+ (index + 1));
}
protected void setSelectText(int index, String nick, int gender) {
tvNick.setText(StringExtensionKt.subAndReplaceDot(StringUtil.removeBlanks(nick), 7));
tvNick.setTextColor(context.getResources().getColor(R.color.white));
if (tvNumber != null) {
if (AvRoomDataManager.get().isOpenPKMode()) { // pk模式不加性别背景
tvNumber.setBackgroundResource(R.drawable.icon_bg_number_default);
tvNumber.setTextColor(context.getResources().getColor(R.color.white));
} else {
tvNumber.setBackgroundResource(gender == 1 ? R.drawable.bg_number_male : R.drawable.bg_number_female);
tvNumber.setTextColor(context.getResources().getColor(R.color.white));
}
tvNumber.setText(String.valueOf(index + 1));
}
}
//优先使用MicMemberInfo里面的头饰

1
app/src/main/java/com/chwl/app/avroom/adapter/DatingMicroViewAdapter.kt
View File

@@ -222,7 +222,6 @@ class DatingMicroViewAdapter(context: Context?) : BaseMicroViewAdapter(context)
super.bind(info, position)
ivVipWear.isVisible = true
ivHeadWear?.isVisible = false
tvNumber?.isVisible = false
}
}

4
app/src/main/java/com/chwl/app/avroom/adapter/SingleAnchorMicroViewAdapter.kt
View File

@@ -72,14 +72,10 @@ class SingleAnchorMicroViewAdapter(context: Context?) : BaseMicroViewAdapter(con
}
}
super.bind(info, position)
tvNumber?.background = null
tvNumber?.text = ""
}
override fun setDefalutText(index: Int) {
tvNick.text = ""
tvNumber?.background = null
tvNumber?.text = ""
}
}

22
app/src/main/res/layout/item_micro_dating.xml
View File

@@ -186,17 +186,17 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/micro_layout">
<TextView
android:id="@+id/tv_number"
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_marginEnd="2dp"
android:background="@drawable/shape_circle_white33"
android:gravity="center"
android:includeFontPadding="false"
android:text="1"
android:textColor="@color/white"
android:textSize="9dp" />
<!-- <TextView-->
<!-- android:id="@+id/tv_number"-->
<!-- android:layout_width="10dp"-->
<!-- android:layout_height="10dp"-->
<!-- android:layout_marginEnd="2dp"-->
<!-- android:background="@drawable/shape_circle_white33"-->
<!-- android:gravity="center"-->
<!-- android:includeFontPadding="false"-->
<!-- android:text="1"-->
<!-- android:textColor="@color/white"-->
<!-- android:textSize="9dp" />-->
<TextView
android:id="@+id/nick"

30
app/src/main/res/layout/item_micro_dating_boss.xml
View File

@@ -203,21 +203,21 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/tv_number"
android:layout_width="13dp"
android:layout_height="13dp"
android:layout_marginEnd="5dp"
android:background="@drawable/shape_circle_white33"
android:gravity="center"
android:includeFontPadding="false"
android:text="1"
android:textColor="@color/white"
android:textSize="10sp"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:textColor="#000" />
<!-- <TextView-->
<!-- android:id="@+id/tv_number"-->
<!-- android:layout_width="13dp"-->
<!-- android:layout_height="13dp"-->
<!-- android:layout_marginEnd="5dp"-->
<!-- android:background="@drawable/shape_circle_white33"-->
<!-- android:gravity="center"-->
<!-- android:includeFontPadding="false"-->
<!-- android:text="1"-->
<!-- android:textColor="@color/white"-->
<!-- android:textSize="10sp"-->
<!-- android:visibility="gone"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent"-->
<!-- tools:textColor="#000" />-->
<LinearLayout
android:id="@+id/rl_nick"

22
app/src/main/res/layout/item_micro_game.xml
View File

@@ -152,17 +152,17 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/micro_layout">
<TextView
android:id="@+id/tv_number"
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_marginEnd="2dp"
android:background="@drawable/shape_circle_white33"
android:gravity="center"
android:includeFontPadding="false"
android:text="1"
android:textColor="@color/white"
android:textSize="9dp" />
<!-- <TextView-->
<!-- android:id="@+id/tv_number"-->
<!-- android:layout_width="10dp"-->
<!-- android:layout_height="10dp"-->
<!-- android:layout_marginEnd="2dp"-->
<!-- android:background="@drawable/shape_circle_white33"-->
<!-- android:gravity="center"-->
<!-- android:includeFontPadding="false"-->
<!-- android:text="1"-->
<!-- android:textColor="@color/white"-->
<!-- android:textSize="9dp" />-->
<TextView
android:id="@+id/nick"

22
app/src/main/res/layout/item_micro_game_mini.xml
View File

@@ -83,17 +83,17 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/micro_layout">
<TextView
android:id="@+id/tv_number"
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_marginEnd="2dp"
android:background="@drawable/shape_circle_white33"
android:gravity="center"
android:includeFontPadding="false"
android:text="1"
android:textColor="@color/white"
android:textSize="9dp" />
<!-- <TextView-->
<!-- android:id="@+id/tv_number"-->
<!-- android:layout_width="10dp"-->
<!-- android:layout_height="10dp"-->
<!-- android:layout_marginEnd="2dp"-->
<!-- android:background="@drawable/shape_circle_white33"-->
<!-- android:gravity="center"-->
<!-- android:includeFontPadding="false"-->
<!-- android:text="1"-->
<!-- android:textColor="@color/white"-->
<!-- android:textSize="9dp" />-->
<TextView
android:id="@+id/nick"

30
app/src/main/res/layout/item_micro_single_anchor_boss.xml
View File

@@ -140,21 +140,21 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/tv_number"
android:layout_width="13dp"
android:layout_height="13dp"
android:layout_marginEnd="5dp"
android:background="@drawable/shape_circle_white33"
android:gravity="center"
android:includeFontPadding="false"
android:text="1"
android:textColor="@color/white"
android:textSize="10sp"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:textColor="#000" />
<!-- <TextView-->
<!-- android:id="@+id/tv_number"-->
<!-- android:layout_width="13dp"-->
<!-- android:layout_height="13dp"-->
<!-- android:layout_marginEnd="5dp"-->
<!-- android:background="@drawable/shape_circle_white33"-->
<!-- android:gravity="center"-->
<!-- android:includeFontPadding="false"-->
<!-- android:text="1"-->
<!-- android:textColor="@color/white"-->
<!-- android:textSize="10sp"-->
<!-- android:visibility="gone"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent"-->
<!-- tools:textColor="#000" />-->
<View
android:id="@+id/line_nick_top"

20
app/src/main/res/layout/list_item_micro.xml
View File

@@ -124,16 +124,16 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_number"
android:layout_width="@dimen/dp_11"
android:layout_height="@dimen/dp_11"
android:background="@drawable/icon_bg_number_default"
android:gravity="center"
android:includeFontPadding="false"
android:textColor="@color/white"
android:textSize="@dimen/dp_7"
tools:text="1" />
<!-- <TextView-->
<!-- android:id="@+id/tv_number"-->
<!-- android:layout_width="@dimen/dp_11"-->
<!-- android:layout_height="@dimen/dp_11"-->
<!-- android:background="@drawable/icon_bg_number_default"-->
<!-- android:gravity="center"-->
<!-- android:includeFontPadding="false"-->
<!-- android:textColor="@color/white"-->
<!-- android:textSize="@dimen/dp_7"-->
<!-- tools:text="1" />-->
<TextView
android:id="@+id/nick"