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

pdlive6.6.6版本改动合并

Browse Source
This commit is contained in:
18401019693
2024-04-11 13:11:32 +08:00
parent 80d89c8c0b
commit b31ec9cddf
209 changed files with 9450 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,9 +43,9 @@
android:id="@+id/level_anchor"
android:layout_width="13dp"
android:layout_height="13dp"
android:visibility="gone"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true" />
android:layout_alignParentBottom="true"
android:visibility="gone" />
</RelativeLayout>
<LinearLayout
@@ -1154,6 +1154,129 @@
</FrameLayout>
<FrameLayout
android:id="@+id/gif_gift_tip_group_buy_guard_new"
android:layout_width="match_parent"
android:layout_height="51dp"
android:translationX="500dp"
android:visibility="invisible">
<LinearLayout
android:id="@+id/guard_all_server_notify_bg"
android:layout_width="match_parent"
android:layout_height="51dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="9dp"
android:layout_marginRight="9dp"
android:background="@mipmap/background_all_server_notify_star_zh"
android:gravity="center|left"
android:orientation="horizontal">
<com.yunbao.common.views.weight.MarqueeTextView
android:id="@+id/gif_gift_tip_buy_guard_new"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center"
android:marqueeRepeatLimit="marquee_forever"
android:paddingStart="100dp"
android:paddingEnd="6dp"
android:scrollHorizontally="true"
android:singleLine="true"
android:textColor="#072A93"
android:textSize="13sp" />
<TextView
android:id="@+id/iv_look_buy_guard_new"
android:layout_width="32dp"
android:layout_height="20dp"
android:layout_marginEnd="20dp"
android:background="@mipmap/btn_king_guard_onlookers"
android:clickable="true"
android:gravity="center"
android:text="@string/onlookers"
android:textColor="@color/white"
android:textSize="12sp" />
</LinearLayout>
</FrameLayout>
<FrameLayout
android:id="@+id/full_service_notice_new"
android:layout_width="match_parent"
android:layout_height="51dp"
android:translationX="500dp"
android:visibility="invisible">
<ImageView
android:id="@+id/full_service_notice_new_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="13dp"
android:layout_marginEnd="7dp"
android:scaleType="fitXY"
android:src="@mipmap/background_full_service_notice_new" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="9dp"
android:layout_marginTop="3dp"
android:layout_marginRight="9dp"
android:gravity="center|left"
android:orientation="horizontal">
<com.yunbao.common.views.weight.MarqueeTextView
android:id="@+id/full_service_notice_new_text"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_marginStart="67dp"
android:layout_marginEnd="15dp"
android:layout_weight="1"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center"
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"
android:text="字文文字文字文字文字fdsfsdfdsfdsfsdfdsfsdf文字文字"
android:textColor="#fff"
android:textSize="13sp" />
<FrameLayout
android:id="@+id/iv_look_full_service_notice_new3"
android:layout_width="56dp"
android:layout_height="30dp"
android:layout_marginEnd="5dp">
<ImageView
android:id="@+id/iv_look_full_service_notice_new2"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitXY" />
<TextView
android:id="@+id/iv_look_full_service_notice_new"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
android:gravity="center"
android:textSize="12sp" />
</FrameLayout>
</LinearLayout>
</FrameLayout>
<FrameLayout
android:id="@+id/gif_gift_tip_group_buy_zuoji"
android:layout_width="wrap_content"
@@ -1353,7 +1476,8 @@
layout="@layout/sim_live_room_vote"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true" />
android:layout_alignParentEnd="true"
android:visibility="gone" />
<ImageView
android:id="@+id/icon_pk_top"
@@ -2545,4 +2669,60 @@
android:layout_marginEnd="125dp"
android:src="@mipmap/background_quick_gift_reminder"
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="180dp"
android:gravity="center"
android:orientation="vertical"
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"
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>