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

Merge branch 'master' into dev_680_礼物展馆

Browse Source 
# Conflicts:
#	common/src/main/res/values-zh-rHK/strings.xml
#	common/src/main/res/values-zh-rTW/strings.xml
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
#	gradle.properties
#	live/build.gradle
This commit is contained in:
Martin
2024-07-17 09:53:22 +08:00
parent fe827482c9 a11d7f07e9
commit 152848a04f
215 changed files with 3143 additions and 872 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
live/src/main/res/layout/dialog_live_guard.xml
View File

@@ -9,7 +9,7 @@
android:layout_height="match_parent"
android:layout_marginTop="59dp"
android:layout_marginBottom="71dp"
android:background="@drawable/background_live_guard">
android:background="@drawable/guard_buy_top_bg">
<RelativeLayout
android:layout_width="wrap_content"
@@ -82,7 +82,6 @@
<FrameLayout
android:id="@+id/guardian_task"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="14dp"
@@ -96,12 +95,13 @@
android:textColor="#E8C7F9"
android:textSize="12sp" />
<View
<ImageView
android:id="@+id/guardian_task_view"
android:layout_width="50dp"
android:layout_height="1dp"
android:layout_gravity="bottom|center_horizontal"
android:background="#E8C7F9" />
android:layout_width="48dp"
android:layout_height="20dp"
android:layout_marginTop="6dp"
android:src="@drawable/live_dialog_top_guardian_tasks_bg"
/>
</FrameLayout>
@@ -121,11 +121,6 @@
android:textColor="@color/white"
android:textSize="12sp" />
<View
android:layout_width="60dp"
android:layout_height="1dp"
android:layout_gravity="bottom"
android:background="@color/white" />
</FrameLayout>
<FrameLayout
@@ -134,7 +129,7 @@
android:layout_marginStart="7dp"
android:layout_marginTop="96dp"
android:layout_marginEnd="7dp"
android:background="@drawable/background_live_guard2">
android:background="@drawable/guard_buy_center_bg">
<com.yunbao.common.custom.CommonRefreshView
@@ -174,9 +169,8 @@
android:id="@+id/guard_imageView"
android:layout_width="58dp"
android:layout_height="58dp"
android:layout_centerInParent="true"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_marginTop="20dp"
android:scaleType="centerCrop"
android:src="@mipmap/guardian_img_wings"
android:visibility="visible"
@@ -197,7 +191,7 @@
android:layout_width="match_parent"
android:layout_height="71dp"
android:layout_gravity="bottom"
android:background="@drawable/background_live_guard3">
android:background="@drawable/guard_buy_bottom_bg">
<LinearLayout
android:layout_width="0dp"
@@ -232,18 +226,18 @@
android:textSize="11sp" />
</LinearLayout>
<TextView
<ImageView
android:id="@+id/btn_guard_open"
android:layout_width="124dp"
android:layout_height="42dp"
android:layout_gravity="center_vertical|end"
android:layout_marginEnd="16dp"
android:background="@mipmap/btn_guard_open"
android:layout_width="101dp"
android:layout_height="36dp"
android:layout_gravity="center_vertical"
android:layout_marginEnd="15dp"
android:background="@mipmap/guard_btn_buy_icon"
android:enabled="false"
android:gravity="center"
android:text="續費守護"
android:singleLine="true"
android:text="@string/guard_buy_2"
android:textColor="@color/white"
android:textSize="15sp"
android:textStyle="bold" />
android:textSize="14sp" />
</LinearLayout>
</FrameLayout>

49
live/src/main/res/layout/dialog_new_guard.xml
View File

@@ -17,6 +17,36 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<ImageView
android:layout_width="50dp"
android:layout_height="20dp"
android:src="@drawable/live_dialog_top_guardian_tasks_bg"
tools:ignore="MissingConstraints"
tools:layout_editor_absoluteX="23.5dp"
tools:layout_editor_absoluteY="26dp" />
<TextView
android:id="@+id/guardian_tasks"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/live_dialog_top_guardian_tasks"
android:textColor="#E8B9FF"
tools:ignore="MissingConstraints"
tools:layout_editor_absoluteX="20dp"
tools:layout_editor_absoluteY="15dp" />
<TextView
android:id="@+id/guardian_tasks_my_rank"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="我的等級 >"
app:layout_constraintEnd_toEndOf="parent"
android:textColor="@color/white"
android:layout_marginRight="20dp"
android:layout_alignParentEnd="true"
tools:ignore="MissingConstraints"
tools:layout_editor_absoluteY="15dp" />
<LinearLayout
android:id="@+id/guard_linearLayout"
@@ -125,13 +155,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:text=""
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"
android:text=""
android:textColor="@color/white"
android:textSize="11sp" />
@@ -143,30 +173,29 @@
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:drawablePadding="4dp"
android:text="456"
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"
android:text="456"
android:textColor="#A281FD"
android:textSize="11sp"
android:visibility="gone" />
</LinearLayout>
<TextView
<ImageView
android:id="@+id/guard_btn_buy"
android:layout_width="110dp"
android:layout_height="30dp"
android:singleLine="true"
android:layout_width="101dp"
android:layout_height="36dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="15dp"
android:background="@drawable/bg_guard_btn_buy"
android:background="@mipmap/guard_btn_buy_icon"
android:enabled="false"
android:gravity="center"
android:singleLine="true"
android:text="@string/guard_buy_2"
android:textColor="@color/white"
android:textSize="14sp" />
@@ -195,7 +224,7 @@
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:scaleType="centerCrop"
android:src="@mipmap/guardian_img_wings"
android:src="@mipmap/guardian_img_wings"
android:visibility="visible"
app:riv_oval="true" />
@@ -204,7 +233,7 @@
android:id="@+id/gift_svga"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@mipmap/guardian_img_wings"
android:src="@mipmap/guardian_img_wings"
android:visibility="visible"
app:autoPlay="true" />

2
live/src/main/res/layout/view_live_audience.xml
View File

@@ -515,7 +515,7 @@
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginEnd="150dp"
android:layout_marginEnd="144dp"
android:layout_marginBottom="-2dp"
android:text="99"
android:textColor="#FFB403"

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

@@ -745,8 +745,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="100dp"
android:visibility="gone" />
android:layout_marginTop="160dp"
android:visibility="gone"
tools:visibility="visible"/>
<FrameLayout
android:id="@+id/btn_prize_pool_level"
@@ -1158,6 +1159,7 @@
android:layout_width="match_parent"
android:layout_height="51dp"
android:translationX="500dp"
tools:visibility="visible"
android:visibility="invisible">
<LinearLayout
@@ -1282,8 +1284,8 @@
android:id="@+id/iv_look_full_service_notice_new3"
android:layout_width="56dp"
android:layout_height="30dp"
android:layout_marginBottom="1dp"
android:layout_marginEnd="5dp">
android:layout_marginEnd="5dp"
android:layout_marginBottom="1dp">
<ImageView
android:id="@+id/iv_look_full_service_notice_new2"
@@ -1296,10 +1298,10 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
tools:text="btn"
tools:textColor="@color/white"
android:gravity="center"
android:textSize="12sp" />
android:textSize="12sp"
tools:text="btn"
tools:textColor="@color/white" />
</FrameLayout>
@@ -1514,10 +1516,11 @@
<RelativeLayout
android:id="@+id/lt_pk_line"
android:layout_width="match_parent"
tools:visibility="visible"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/live_top"
android:visibility="gone">
android:visibility="gone"
tools:visibility="visible">
<TextView
android:id="@+id/pk_rank_red_val"
android:layout_width="wrap_content"
@@ -1556,8 +1559,8 @@
<LinearLayout
android:id="@+id/pk_red_layout"
android:layout_width="match_parent"
android:layout_alignParentBottom="true"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_alignParentBottom="true">
<LinearLayout
android:layout_width="match_parent"
@@ -2389,29 +2392,28 @@
<!--整蛊进度列表-->
<include
android:id="@+id/prank_group"
layout="@layout/view_prank_group"
android:visibility="gone"
tools:visibility="visible"
layout="@layout/view_prank_group"/>
tools:visibility="visible" />
<pl.droidsonroids.gif.GifImageView
android:id="@+id/prank_small_icon"
android:layout_gravity="end"
android:visibility="gone"
android:layout_width="23dp"
android:layout_height="33dp"
android:layout_gravity="end"
android:layout_marginBottom="5dp"
/>
android:visibility="gone" />
<ImageView
android:id="@+id/prank_group_turntable_icon"
android:src="@mipmap/turntable_icon"
android:layout_gravity="end"
android:visibility="gone"
android:layout_marginBottom="5dp"
tools:visibility="visible"
android:layout_marginEnd="16dp"
android:layout_width="44dp"
android:layout_height="46dp"/>
android:layout_height="46dp"
android:layout_gravity="end"
android:layout_marginEnd="16dp"
android:layout_marginBottom="5dp"
android:src="@mipmap/turntable_icon"
android:visibility="gone"
tools:visibility="visible" />
<LinearLayout
@@ -2445,13 +2447,13 @@
android:id="@+id/top_banner2"
android:layout_width="52dp"
android:layout_height="76dp"
android:layout_marginTop="20dp"
android:layout_gravity="end"
android:layout_marginTop="20dp"
android:layout_marginEnd="16dp"
android:visibility="gone"
app:delay_time="5000"
tools:visibility="visible"
app:indicator_height="8dp" />
app:indicator_height="8dp"
tools:visibility="visible" />
<LinearLayout
android:id="@+id/lt_trickery"
@@ -2663,31 +2665,73 @@
android:layout_marginTop="80dp"
app:autoPlay="true" />
<LinearLayout
<RelativeLayout
android:id="@+id/sud_layout_name"
android:layout_width="257dp"
android:layout_width="200dp"
android:layout_height="40dp"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginStart="21dp"
android:layout_marginEnd="42dp"
android:layout_marginStart="13dp"
android:background="@drawable/background_live_sud_hint"
android:gravity="center"
android:paddingStart="21dp"
android:paddingEnd="15dp"
android:visibility="gone">
android:paddingStart="5dp"
android:visibility="gone"
tools:visibility="visible">
<ImageView
android:id="@+id/sud_game_coin"
android:layout_width="22dp"
android:layout_height="16dp"
android:layout_centerVertical="true"
android:layout_marginTop="2dp"
android:src="@mipmap/live_room_sud_hint_icon" />
<com.yunbao.common.views.weight.MarqueeTextView
android:id="@+id/sud_text_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="5dp"
android:layout_toStartOf="@+id/sud_join"
android:layout_toEndOf="@+id/sud_game_coin"
android:ellipsize="marquee"
android:scrollHorizontally="true"
android:singleLine="true"
android:text="主播創建了【游戲名】房間，快來與主播同玩~"
android:textColor="#999999"
android:textSize="12dp" />
<TextView
android:id="@+id/sud_join"
android:layout_width="wrap_content"
android:layout_height="18dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:layout_marginEnd="20dp"
android:background="@drawable/bg_live_room_sud_hint_join"
android:ellipsize="end"
android:fontFamily="sans-serif-condensed-medium"
android:gravity="center"
android:maxWidth="50dp"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:singleLine="true"
android:text="@string/live_room_sud_hint_join"
android:textColor="@color/white"
android:textSize="14sp" />
</LinearLayout>
android:textSize="10sp"
android:visibility="visible"
tools:visibility="visible" />
<ImageView
android:id="@+id/iconSudClose"
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:layout_marginTop="2dp"
android:layout_marginEnd="2dp"
android:src="@mipmap/icon_live_room_sud_close" />
</RelativeLayout>
<FrameLayout
android:id="@+id/pa_pao_layout"
@@ -2700,7 +2744,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginStart="220dp">
android:layout_marginStart="220dp"
tools:visibility="gone">
<TextView
android:layout_width="wrap_content"
@@ -2735,9 +2780,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="180dp"
android:layout_marginTop="240dp"
android:gravity="center"
android:orientation="vertical"
tools:visibility="visible"
android:visibility="gone">
<ImageView
@@ -2765,6 +2811,7 @@
android:layout_marginTop="120dp"
android:gravity="center"
android:orientation="vertical"
tools:visibility="visible"
android:visibility="gone">
<ImageView

2
live/src/main/res/layout/view_new_guard_item.xml
View File

@@ -15,7 +15,7 @@
<ImageView
android:id="@+id/guard_number_img"
android:layout_width="19dp"
android:layout_width="38.5dp"
android:layout_height="19dp"
android:layout_gravity="center"
android:src="@mipmap/icon_one_guard"