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

修改：直播间UI调整，暂存

Browse Source
This commit is contained in:
Martin 2024-08-16 18:29:35 +08:00
parent 2c56322b1c
commit 150af4fc2c
9 changed files with 305 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
common/src/main/res/mipmap-xxhdpi/bg_live_room_gift.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
common/src/main/res/mipmap-xxhdpi/icon_live_dragon_money.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 27 KiB

BIN
common/src/main/res/mipmap-xxhdpi/icon_live_room_gift.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

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

@ -2,6 +2,7 @@ package com.yunbao.live.views;
import static com.yunbao.live.bean.LiveChatBean.RECOMMEND_CARD_NOTIFY; import static com.yunbao.live.bean.LiveChatBean.RECOMMEND_CARD_NOTIFY;
import android.annotation.SuppressLint;
import android.app.Activity; import android.app.Activity;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context; import android.content.Context;
@ -1176,6 +1177,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
} }
@SuppressLint("WrongViewCast")
@Override @Override
public void init() { public void init() {
EventBus.getDefault().register(this); EventBus.getDefault().register(this);
@ -1627,7 +1629,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
avatar_r1 = (RoundedImageView) findViewById(R.id.avatar_r1); avatar_r1 = (RoundedImageView) findViewById(R.id.avatar_r1);
avatar_r2 = (RoundedImageView) findViewById(R.id.avatar_r2); avatar_r2 = (RoundedImageView) findViewById(R.id.avatar_r2);
avatar_r3 = (RoundedImageView) findViewById(R.id.avatar_r3); avatar_r3 = (RoundedImageView) findViewById(R.id.avatar_r3);
redPacket = (FrameLayout) findViewById(R.id.red_packet); redPacket = findViewById(R.id.red_packet);
redPacketCountdown = (TextView) findViewById(R.id.red_packet_countdown); redPacketCountdown = (TextView) findViewById(R.id.red_packet_countdown);
redSchedule = (TextView) findViewById(R.id.red_schedule); redSchedule = (TextView) findViewById(R.id.red_schedule);
redPacketQueue = (LinearLayout) findViewById(R.id.red_packet_queue); redPacketQueue = (LinearLayout) findViewById(R.id.red_packet_queue);
@ -1730,8 +1732,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
pa_pao_layout.setVisibility(View.GONE); pa_pao_layout.setVisibility(View.GONE);
combo_layout.setVisibility(View.GONE); combo_layout.setVisibility(View.GONE);
dragonImmediateParticipation = (LinearLayout) findViewById(R.id.dragon_immediate_participation); dragonImmediateParticipation = (RelativeLayout) findViewById(R.id.dragon_immediate_participation);
dragonImmediateParticipationTime = (LinearLayout) findViewById(R.id.dragon_immediate_participation_time); dragonImmediateParticipationTime = (RelativeLayout) findViewById(R.id.dragon_immediate_participation_time);
participation_time = (TextView) findViewById(R.id.participation_time); participation_time = (TextView) findViewById(R.id.participation_time);
ViewClicksAntiShake.clicksAntiShake(dragonImmediateParticipation, new ViewClicksAntiShake.ViewClicksCallBack() { ViewClicksAntiShake.clicksAntiShake(dragonImmediateParticipation, new ViewClicksAntiShake.ViewClicksCallBack() {
@ -2099,8 +2101,8 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
} }
int ttttttype = 0; int ttttttype = 0;
private LinearLayout dragonImmediateParticipation, dragonImmediateParticipationTime; private RelativeLayout dragonImmediateParticipation, dragonImmediateParticipationTime;
private FrameLayout redPacket; private RelativeLayout redPacket;
private TextView redPacketCountdown, redSchedule, openRedPacket, participation_time; private TextView redPacketCountdown, redSchedule, openRedPacket, participation_time;
private LinearLayout redPacketQueue; private LinearLayout redPacketQueue;
private int redTimeCountdown = 0; private int redTimeCountdown = 0;

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

@ -257,7 +257,8 @@
android:layout_width="14dp" android:layout_width="14dp"
android:layout_height="14dp" android:layout_height="14dp"
android:src="@mipmap/live_icon_wishlist" android:src="@mipmap/live_icon_wishlist"
android:visibility="gone" /> android:visibility="gone"
tools:visibility="visible" />
<ViewFlipper <ViewFlipper
android:id="@+id/hour_rank_list" android:id="@+id/hour_rank_list"
@ -278,6 +279,297 @@
</FrameLayout> </FrameLayout>
<LinearLayout
android:id="@+id/topLayout1"
android:layout_width="match_parent"
android:layout_height="23dp"
android:layout_below="@+id/lin"
android:layout_marginStart="12dp"
android:layout_marginTop="9dp"
android:orientation="horizontal">
<!--热度-->
<LinearLayout
android:id="@+id/hot_btn"
android:layout_width="wrap_content"
android:layout_height="21dp"
android:background="@drawable/bg_live_item"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="8dp"
android:paddingRight="5dp"
android:visibility="gone"
tools:visibility="visible">
<ImageView
android:layout_width="13dp"
android:layout_height="13dp"
android:src="@mipmap/iconhot"
android:textColor="@color/red" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:textSize="10sp" />
<TextView
android:id="@+id/room_hot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:text="0"
android:textColor="@color/white"
android:textSize="10sp" />
</LinearLayout>
<!--天梯赛-->
<FrameLayout
android:id="@+id/live_rank_pk"
android:layout_width="85dp"
android:layout_height="20dp"
android:layout_alignParentEnd="true"
android:layout_marginEnd="10dp"
android:clickable="true"
android:focusable="true"
android:visibility="visible">
<LinearLayout
android:id="@+id/live_rank_pk2"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal" />
<ViewFlipper
android:id="@+id/rank_pk_vf"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="5dp"
android:flipInterval="5000"
android:inAnimation="@anim/anim_marquee_in"
android:outAnimation="@anim/anim_marquee_out" />
</FrameLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/topLayout2"
android:layout_width="match_parent"
android:layout_height="38dp"
android:layout_below="@+id/topLayout1"
android:layout_marginTop="5dp"
android:orientation="horizontal">
<!--新手任务-->
<LinearLayout
android:layout_width="82dp"
android:layout_height="match_parent"
android:layout_marginStart="12dp"
android:layout_marginEnd="7dp"
android:background="@mipmap/bg_live_room_task"
android:gravity="center">
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:text="新手任務"
android:textColor="#1D386B"
android:textSize="10dp" />
<ImageView
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginStart="2dp"
android:src="@mipmap/icon_live_room_task" />
</LinearLayout>
<RelativeLayout
android:id="@+id/red_packet"
android:layout_width="38dp"
android:layout_height="match_parent">
<ImageView
android:layout_width="38dp"
android:layout_height="38dp"
android:src="@mipmap/icon_red_packet_new" />
<TextView
android:id="@+id/red_packet_countdown"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:gravity="center_vertical"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:text="@string/red_packet_countdown"
android:textColor="@color/white"
android:textSize="9sp"
android:visibility="gone" />
<LinearLayout
android:id="@+id/red_packet_queue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:orientation="vertical"
android:paddingStart="6dp"
android:visibility="visible">
<TextView
android:id="@+id/red_schedule"
android:layout_width="19dp"
android:layout_height="8dp"
android:background="@mipmap/bg_live_room_red_time"
android:gravity="center"
android:text="10/200"
android:textColor="@color/white"
android:textSize="6sp" />
<TextView
android:id="@+id/open_red_packet"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/open_red_packet"
android:textColor="@color/white"
android:textSize="9sp"
android:visibility="gone" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/dragon_immediate_participation"
android:layout_width="38dp"
android:layout_height="match_parent"
android:layout_marginStart="10dp"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">
<ImageView
android:layout_width="38dp"
android:layout_height="38dp"
android:src="@mipmap/icon_live_dragon_money" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:background="@mipmap/bg_live_room_red_time"
android:padding="1dp"
android:text="@string/dragon_immediate_participation"
android:textColor="#F9BA03"
android:textSize="7sp"
android:textStyle="bold" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/dragon_immediate_participation_time"
android:layout_width="38dp"
android:layout_height="match_parent"
android:layout_marginStart="10dp"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">
<ImageView
android:layout_width="38dp"
android:layout_height="38dp"
android:src="@mipmap/icon_live_dragon_money" />
<TextView
android:id="@+id/participation_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:background="@mipmap/bg_live_room_red_time"
android:padding="1dp"
android:text="@string/dragon_immediate_participation"
android:textColor="#F9BA03"
android:textSize="7sp"
android:textStyle="bold" />
</RelativeLayout>
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<LinearLayout
android:layout_marginEnd="12dp"
android:layout_width="82dp"
android:layout_height="38dp"
android:layout_gravity="end"
android:orientation="horizontal"
android:background="@mipmap/bg_live_room_gift">
<LinearLayout
android:paddingStart="6dp"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="禮物牆"
android:textColor="#FFFFFF"
android:textSize="10dp" />
<LinearLayout
android:layout_width="wrap_content"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="5"
android:textColor="#FFC949"
android:textSize="15dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="/26"
android:textColor="#FFFFFF"
android:textSize="14dp" />
</LinearLayout>
<ProgressBar
android:id="@+id/progressbar"
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="1.5dp"
android:max="26"
android:progress="5"
android:progressDrawable="@drawable/bg_horizontal_progressbar" />
</LinearLayout>
<ImageView
android:layout_marginStart="10dp"
android:src="@mipmap/icon_live_room_gift"
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"/>
</LinearLayout>
</LinearLayout>
<!--贡献--> <!--贡献-->
<LinearLayout <LinearLayout
android:id="@+id/btn_votes" android:id="@+id/btn_votes"
@ -292,7 +584,8 @@
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:paddingRight="5dp" android:paddingRight="5dp"
android:visibility="gone"> android:visibility="gone"
tools:visibility="visible">
<ImageView <ImageView
android:layout_width="13dp" android:layout_width="13dp"
@ -492,46 +785,6 @@
android:src="@mipmap/icon_arrow_right" android:src="@mipmap/icon_arrow_right"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout>
<!--热度-->
<LinearLayout
android:id="@+id/hot_btn"
android:layout_width="wrap_content"
android:layout_height="21dp"
android:layout_below="@id/lin"
android:layout_alignTop="@id/hour_rank_layout"
android:layout_alignParentRight="true"
android:layout_marginLeft="10dp"
android:layout_marginRight="12dp"
android:background="@drawable/bg_live_item"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="8dp"
android:paddingRight="5dp"
android:visibility="gone">
<ImageView
android:layout_width="13dp"
android:layout_height="13dp"
android:src="@mipmap/iconhot"
android:textColor="@color/red" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:textSize="10sp" />
<TextView
android:id="@+id/room_hot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:text="0"
android:textColor="@color/white"
android:textSize="10sp" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -563,36 +816,6 @@
android:textSize="10sp" /> android:textSize="10sp" />
</LinearLayout> </LinearLayout>
<FrameLayout
android:id="@+id/live_rank_pk"
android:layout_width="85dp"
android:layout_height="20dp"
android:layout_alignTop="@id/hour_rank_layout"
android:layout_alignParentEnd="true"
android:layout_marginEnd="10dp"
android:clickable="true"
android:focusable="true"
android:visibility="visible">
<LinearLayout
android:id="@+id/live_rank_pk2"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal" />
<ViewFlipper
android:id="@+id/rank_pk_vf"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="5dp"
android:flipInterval="5000"
android:inAnimation="@anim/anim_marquee_in"
android:outAnimation="@anim/anim_marquee_out" />
</FrameLayout>
<ImageView <ImageView
android:id="@+id/btn_noble" android:id="@+id/btn_noble"
android:layout_width="45dp" android:layout_width="45dp"
@ -730,25 +953,14 @@
android:id="@+id/top_banner1" android:id="@+id/top_banner1"
android:layout_width="52dp" android:layout_width="52dp"
android:layout_height="76dp" android:layout_height="76dp"
android:layout_below="@+id/live_rank_pk"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_marginTop="20dp" android:layout_marginTop="70dp"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:visibility="visible" android:visibility="visible"
app:delay_time="5000" app:delay_time="5000"
app:indicator_height="8dp" app:indicator_height="8dp"
app:indicator_width="8dp" /> app:indicator_width="8dp" />
<include
android:id="@+id/red_packet"
layout="@layout/view_red_packet"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="160dp"
android:visibility="gone"
tools:visibility="visible"/>
<FrameLayout <FrameLayout
android:id="@+id/btn_prize_pool_level" android:id="@+id/btn_prize_pool_level"
android:layout_width="70dp" android:layout_width="70dp"
@ -1158,8 +1370,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="51dp" android:layout_height="51dp"
android:translationX="500dp" android:translationX="500dp"
tools:visibility="visible" android:visibility="invisible"
android:visibility="invisible"> tools:visibility="visible">
<LinearLayout <LinearLayout
android:id="@+id/guard_all_server_notify_bg" android:id="@+id/guard_all_server_notify_bg"
@ -2767,61 +2979,4 @@
android:src="@mipmap/background_quick_gift_reminder" android:src="@mipmap/background_quick_gift_reminder"
android:visibility="gone" /> android:visibility="gone" />
<LinearLayout
android:id="@+id/dragon_immediate_participation"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="240dp"
android:gravity="center"
android:orientation="vertical"
tools:visibility="visible"
android:visibility="gone">
<ImageView
android:layout_width="36dp"
android:layout_height="39dp"
android:src="@mipmap/icon_live_dragon_money" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="-5dp"
android:background="@drawable/background_dragon_immediate_participation"
android:padding="1dp"
android:text="@string/dragon_immediate_participation"
android:textColor="#F9BA03"
android:textSize="10sp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:id="@+id/dragon_immediate_participation_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="120dp"
android:gravity="center"
android:orientation="vertical"
tools:visibility="visible"
android:visibility="gone">
<ImageView
android:layout_width="36dp"
android:layout_height="39dp"
android:src="@mipmap/icon_live_dragon_money" />
<TextView
android:id="@+id/participation_time"
android:layout_width="45dp"
android:layout_height="wrap_content"
android:layout_marginTop="-5dp"
android:background="@drawable/background_dragon_immediate_participation"
android:gravity="center"
android:padding="1dp"
android:text="00:00"
android:textColor="#F9BA03"
android:textSize="10sp"
android:textStyle="bold" />
</LinearLayout>
</RelativeLayout> </RelativeLayout>

BIN
live/src/main/res/mipmap-xhdpi/bg_live_room_red_time.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 543 B

BIN
live/src/main/res/mipmap-xhdpi/bg_live_room_task.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

BIN
live/src/main/res/mipmap-xhdpi/icon_live_room_task.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

BIN
live/src/main/res/mipmap-xxxhdpi/icon_red_packet_new.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB