yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_6.7.0' into dev_6.7.0

Browse Source
This commit is contained in:
Martin 2024-06-17 11:02:17 +08:00
commit 2b86927b5b
4 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
live/src/main/java/com/yunbao/live/adapter/PrankAdapter.java
View File

@ -71,7 +71,12 @@ public class PrankAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
if(viewHolder instanceof MyViewHolder){
MyViewHolder holder = (MyViewHolder) viewHolder;
holder.itemView.setOnClickListener(v-> onItemClickListener.onItemClick(v,data.getGift_id()));
int completedNum = data.getCompleted_num();
if (completedNum>99){
holder.prank_item_subscript.setText("99+");
}else {
holder.prank_item_subscript.setText(String.valueOf(data.getCompleted_num()));
}
holder.prank_item_prank_name.setText(data.getPrank_content());
holder.prank_item_gift_name.setText(WordUtil.isNewZh() ? data.getGift_name() : data.getGift_name_en());
holder.prank_item_now_progress.setText(String.valueOf(data.getSend_num()));

10
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@ -1717,13 +1717,19 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
}
if(prankAnisShow){
prankAdapter.showAnView(completedList,prankAnisShow);
prank_group_turntable.setText(WordUtil.isNewZh()?"整蠱進度":"progress");
prank_group_turntable.setText(R.string.prank_progress);
prank_group_title.setText(WordUtil.isNewZh()?"待完成整蠱":"To do");
if (!completedList.isEmpty()){
limitItem(1,Math.min(completedList.size(), 4));
}else {
recycler_prank.setVisibility(View.GONE);
}
}else{
prankAdapter.showAnView(prankAndComboList,prankAnisShow);
prank_group_turntable.setText(WordUtil.isNewZh()?"待完成整蠱":"To do");
prank_group_title.setText(WordUtil.isNewZh()?"整蠱進度":"To do");
recycler_prank.setVisibility(View.VISIBLE);
limitItem(1,Math.min(prankAndComboList.size(), 4));
}
});

4
live/src/main/res/layout/item_prank_progress.xml
View File

@ -10,12 +10,12 @@
<TextView
android:id="@+id/prank_item_subscript"
android:layout_width="11dp"
android:layout_width="15dp"
android:layout_height="11dp"
android:gravity="center"
android:background="@drawable/bg_prank_item_subscript"
android:textStyle="bold"
android:text="8"
android:text="1"
android:textColor="#FFF9B003"
android:textSize="8sp"/>

17
live/src/main/res/layout/view_live_room.xml
View File

@ -1502,14 +1502,6 @@
android:background="@color/white"
android:visibility="invisible" />
<include
android:id="@+id/vote_layout"
layout="@layout/sim_live_room_vote"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:visibility="gone" />
<ImageView
android:id="@+id/icon_pk_top"
android:layout_width="110dp"
@ -2607,6 +2599,15 @@
android:visibility="gone" />
</LinearLayout>
<!-- 问答UI-->
<include
android:id="@+id/vote_layout"
layout="@layout/sim_live_room_vote"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:visibility="gone" />
<pl.droidsonroids.gif.GifImageView
android:id="@+id/dr_pk_end_gif"
android:layout_width="match_parent"