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

Merge branch 'master' into dev_6.5.4_tmp

Browse Source 
# Conflicts:
#	common/src/main/java/com/yunbao/common/http/PDLiveApi.java
#	common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
#	common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java
#	common/src/main/res/values-en-rUS/string.xml
#	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
#	live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
This commit is contained in:
zlzw
2023-08-04 15:41:11 +08:00
parent fe921e25bb 45c256cbbb
commit bf8d88608d
203 changed files with 9611 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
live/src/main/res/drawable/background_fc6945.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<corners android:radius="13dp" />
<solid android:color="#FC6945" />
</shape>
</item>
</selector>

13
live/src/main/res/drawable/background_gift_select.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true">
<shape android:shape="rectangle">
<corners android:radius="4dp" />
<solid android:color="#e6272C42" />
<stroke android:width="0.6dp" android:color="#AEAEB2" />
</shape>
</item>
<item android:state_selected="false">
<shape android:shape="rectangle"></shape>
</item>
</selector>

8
live/src/main/res/drawable/background_gift_wall_shape.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="90"
android:centerColor="#8391FE"
android:endColor="#818CFF"
android:startColor="#8D9DFF" />
</shape>

9
live/src/main/res/drawable/background_medal_achievement.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="180"
android:centerColor="#FF9615"
android:endColor="#EB7314"
android:startColor="#FFBD14" />
<corners android:radius="12dp" />
</shape>

9
live/src/main/res/drawable/background_naming.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<corners android:radius="25dp" />
<gradient android:endColor="#EC9BFF" android:startColor="#BA68FF" />
</shape>
</item>
</selector>

9
live/src/main/res/drawable/background_naming_icon.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<corners android:bottomLeftRadius="25dp" android:topRightRadius="25dp" />
<solid android:color="#F7D80B" />
</shape>
</item>
</selector>

8
live/src/main/res/drawable/background_regular.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<gradient android:angle="90" android:centerColor="#D5C9FF" android:endColor="#E5EBFF" android:startColor="#8C96FF" android:type="linear" />
</shape>
</item>
</selector>

9
live/src/main/res/drawable/background_regular_center.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<corners android:radius="10dp" />
<gradient android:angle="90" android:endColor="#FDFBFF" android:startColor="#F8EEFF" android:type="linear" />
</shape>
</item>
</selector>

9
live/src/main/res/drawable/bg_gift_wall_lv.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="112dp" android:height="56dp">
<shape android:shape="rectangle">
<gradient android:angle="180" android:endColor="#74C7FB" android:startColor="#CD8BFA" android:type="linear" android:useLevel="true" />
<corners android:radius="6dp" />
</shape>
</item>
</selector>

2
live/src/main/res/drawable/bg_user_card_fans.xml
View File

@@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="112dp" android:height="56dp">
<shape android:shape="rectangle">
<gradient android:type="linear" android:useLevel="true" android:startColor="#ffff9782" android:endColor="#ffffbf8a" android:angle="180" />
<gradient android:type="linear" android:useLevel="true" android:startColor="#FE9C54" android:endColor="#FFC764" android:angle="180" />
<corners android:radius="6dp" />
</shape>
</item>

2
live/src/main/res/drawable/bg_user_card_honor.xml
View File

@@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="112dp" android:height="56dp">
<shape android:shape="rectangle">
<gradient android:type="linear" android:useLevel="true" android:startColor="#fffe9afc" android:endColor="#ff8ab3ff" android:angle="180" />
<gradient android:type="linear" android:useLevel="true" android:startColor="#B76DFF" android:endColor="#D477EF" android:angle="180" />
<corners android:radius="6dp" />
</shape>
</item>

2
live/src/main/res/drawable/bg_user_card_lv.xml
View File

@@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="112dp" android:height="56dp">
<shape android:shape="rectangle">
<gradient android:type="linear" android:useLevel="true" android:startColor="#ffff8abd" android:endColor="#fffe9aaa" android:angle="180" />
<gradient android:type="linear" android:useLevel="true" android:startColor="#F96496" android:endColor="#FFA999" android:angle="180" />
<corners android:radius="6dp" />
</shape>
</item>

BIN
live/src/main/res/drawable/icon_gift_wall.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.1 KiB

188
live/src/main/res/layout/activity_live_gift_wall.xml Normal file
View File

@@ -0,0 +1,188 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/background_gift_wall_shape"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentBottom="true"
android:background="@mipmap/background_gift_wall"
android:orientation="vertical">
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar"
android:layout_width="41dp"
android:layout_height="41dp"
android:layout_centerHorizontal="true"
android:layout_gravity="center_horizontal"
android:layout_marginTop="11dp"
android:scaleType="centerCrop"
android:src="@drawable/m_chu_xia"
app:riv_oval="true" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="5dp"
android:gravity="center_vertical">
<TextView
android:id="@+id/anchor_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="主播昵称"
android:textColor="@color/white"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="35dp"
android:layout_marginStart="6dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="6dp"
android:background="@mipmap/background_giftwall_tab">
<TextView
android:id="@+id/codex_layout"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="@string/codex"
android:textColor="#184DED"
android:textSize="16sp" />
<TextView
android:id="@+id/medal_achievement"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="@string/honorary_achievement"
android:textColor="@color/white"
android:textSize="16sp" />
</LinearLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="15dp"
android:layout_marginTop="14dp"
android:layout_marginEnd="15dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="4dp"
android:background="@drawable/bg_gift_wall_list"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="41dp">
<LinearLayout
android:id="@+id/layout_lit_icon"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:id="@+id/text_lit_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="2dp"
android:text="@string/lit_icon"
android:textColor="#3E68FF"
android:textSize="14sp"
android:textStyle="italic|bold" />
<View
android:id="@+id/view_lit_icon"
android:layout_width="18dp"
android:layout_height="5dp"
android:background="@drawable/tablayout_gift_wall" />
</LinearLayout>
<LinearLayout
android:id="@+id/layout_unlit_icon"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:id="@+id/text_unlit_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="2dp"
android:text="@string/unlit_icon"
android:textColor="#3E68FF"
android:textSize="14sp"
android:textStyle="italic" />
<View
android:id="@+id/view_unlit_icon"
android:layout_width="18dp"
android:layout_height="5dp"
android:background="@drawable/tablayout_gift_wall" />
</LinearLayout>
<LinearLayout
android:id="@+id/layout_all_service_champion"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:id="@+id/text_all_service_champion"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="2dp"
android:text="@string/all_service_champion"
android:textColor="#3E68FF"
android:textSize="14sp"
android:textStyle="italic" />
<View
android:id="@+id/view_all_service_champion"
android:layout_width="18dp"
android:layout_height="5dp"
android:background="@drawable/tablayout_gift_wall" />
</LinearLayout>
</LinearLayout>
<FrameLayout
android:id="@+id/context_layout_gift"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
<TextView
android:layout_width="148dp"
android:layout_height="27dp"
android:layout_gravity="center_horizontal"
android:background="@mipmap/background_gift_wall_title"
android:gravity="center"
android:text="@string/gift_wall"
android:textColor="#3E68FF"
android:textSize="15sp" />
</FrameLayout>
</LinearLayout>
</FrameLayout>

208
live/src/main/res/layout/dialog_live_gift_wall.xml Normal file
View File

@@ -0,0 +1,208 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="540dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="522dp"
android:layout_alignParentBottom="true"
android:background="@mipmap/background_gift_wall"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="27dp"
android:gravity="center_vertical">
<TextView
android:id="@+id/anchor_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="主播昵称"
android:textColor="@color/white"
android:textSize="14sp" />
<ImageView
android:id="@+id/attention"
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_marginStart="4dp"
android:src="@mipmap/icon_following_anchor" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="35dp"
android:layout_marginStart="6dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="6dp"
android:background="@mipmap/background_giftwall_tab">
<TextView
android:id="@+id/codex_layout"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="@string/codex"
android:textColor="#184DED"
android:textSize="16sp" />
<TextView
android:id="@+id/medal_achievement"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="@string/honorary_achievement"
android:textColor="@color/white"
android:textSize="16sp" />
</LinearLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="15dp"
android:layout_marginTop="14dp"
android:layout_marginEnd="15dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="4dp"
android:background="@drawable/bg_gift_wall_list"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="41dp">
<LinearLayout
android:id="@+id/layout_lit_icon"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:id="@+id/text_lit_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="2dp"
android:text="@string/lit_icon"
android:textColor="#3E68FF"
android:textSize="14sp"
android:textStyle="italic|bold" />
<View
android:id="@+id/view_lit_icon"
android:layout_width="18dp"
android:layout_height="5dp"
android:background="@drawable/tablayout_gift_wall" />
</LinearLayout>
<LinearLayout
android:id="@+id/layout_unlit_icon"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:id="@+id/text_unlit_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="2dp"
android:text="@string/unlit_icon"
android:textColor="#3E68FF"
android:textSize="14sp"
android:textStyle="italic" />
<View
android:id="@+id/view_unlit_icon"
android:layout_width="18dp"
android:layout_height="5dp"
android:background="@drawable/tablayout_gift_wall" />
</LinearLayout>
<LinearLayout
android:id="@+id/layout_all_service_champion"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:id="@+id/text_all_service_champion"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="2dp"
android:text="@string/all_service_champion"
android:textColor="#3E68FF"
android:textSize="14sp"
android:textStyle="italic" />
<View
android:id="@+id/view_all_service_champion"
android:layout_width="18dp"
android:layout_height="5dp"
android:background="@drawable/tablayout_gift_wall" />
</LinearLayout>
</LinearLayout>
<FrameLayout
android:id="@+id/context_layout_gift"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
<TextView
android:layout_width="148dp"
android:layout_height="27dp"
android:layout_gravity="center_horizontal"
android:background="@mipmap/background_gift_wall_title"
android:gravity="center"
android:text="@string/gift_wall"
android:textColor="#3E68FF"
android:textSize="15sp" />
</FrameLayout>
</LinearLayout>
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar"
android:layout_width="41dp"
android:layout_height="41dp"
android:layout_centerHorizontal="true"
android:scaleType="centerCrop"
android:src="@drawable/m_chu_xia"
app:riv_oval="true" />
</RelativeLayout>
<TextView
android:id="@+id/regular_bubble"
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_gravity="end"
android:layout_marginTop="134dp"
android:background="@mipmap/icon_regular_bubble"
android:gravity="center"
android:textColor="@color/white"
android:text="@string/regular_bubble"
android:textSize="8sp" />
</FrameLayout>

81
live/src/main/res/layout/dialog_medal_achievement.xml Normal file
View File

@@ -0,0 +1,81 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="524dp"
android:layout_gravity="bottom"
android:background="@drawable/background_dialog_live_codex"
android:orientation="vertical"
tools:ignore="MissingDefaultResource">
<ImageView
android:id="@+id/close_btn"
android:layout_width="8dp"
android:layout_height="14dp"
android:layout_margin="13dp"
android:src="@mipmap/icon_regular_black" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="56dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:background="@drawable/background_medal_achievement">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="15dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/gift_wall_entrance8_1"
android:textColor="@color/white"
android:textSize="16sp" />
<TextView
android:id="@+id/achievement_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="9dp"
android:textColor="@color/white"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/wall_honor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical|end"
android:layout_marginEnd="15dp"
android:gravity="center_vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/wall_honor"
android:textColor="@color/white"
android:textSize="16sp" />
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginTop="1dp"
android:src="@mipmap/icon_right" />
</LinearLayout>
</FrameLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/achievement_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="14dp"
android:paddingStart="10dp"
android:paddingEnd="10dp" />
</LinearLayout>

16
live/src/main/res/layout/dialog_new_guard_buy.xml
View File

@@ -145,14 +145,20 @@
android:layout_marginTop="25dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:visibility="gone">
tools:visibility="visible">
<TextView
<com.yunbao.common.views.weight.MarqueeTextView
android:id="@+id/guard_coin_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"
android:layout_marginLeft="10dp"
android:textColor="#9E7CFD"
android:textSize="14sp" />
@@ -173,13 +179,13 @@
android:id="@+id/guard_btn_buy"
android:layout_width="110dp"
android:layout_height="30dp"
android:maxLines="1"
android:ellipsize="end"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="15dp"
android:background="@drawable/bg_guard_btn_buy"
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
android:text="@string/guard_buy"
android:textColor="@color/white"
android:textSize="14sp" />
@@ -194,7 +200,7 @@
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:visibility="visible">
tools:visibility="invisible">
<LinearLayout
android:layout_width="match_parent"

18
live/src/main/res/layout/dialog_new_guard_list.xml
View File

@@ -115,21 +115,27 @@
app:layout_constraintStart_toStartOf="parent">
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="280dp"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:orientation="vertical">
<TextView
<com.yunbao.common.views.weight.MarqueeTextView
android:id="@+id/guard_tip1"
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:textColor="#A281FD"
android:textSize="14sp" />
<TextView
<com.yunbao.common.views.weight.MarqueeTextView
android:id="@+id/guard_tip2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -138,6 +144,12 @@
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:textColor="#A281FD"
android:textSize="14sp"
android:visibility="gone" />

158
live/src/main/res/layout/dialog_new_live_user.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -20,18 +19,37 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/btn_report"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="14dp"
android:layout_marginEnd="14dp"
android:gravity="center"
android:text="@string/report"
android:textColor="#B1B1B1"
android:visibility="visible"
android:gravity="end"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/btn_report"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/report"
android:textColor="#B1B1B1"
android:visibility="visible" />
<TextView
android:id="@+id/ai_te"
android:layout_width="41dp"
android:layout_height="25dp"
android:layout_marginTop="10dp"
android:background="@drawable/background_fc6945"
android:gravity="center"
android:text="\@TA"
android:textColor="@color/white"
android:visibility="visible" />
</LinearLayout>
<LinearLayout
android:id="@+id/btn_guard"
@@ -154,9 +172,9 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="17dp"
android:layout_gravity="center"
android:layout_marginTop="13dp"
android:gravity="center"
android:layout_gravity="center"
android:orientation="horizontal">
<ImageView
@@ -231,11 +249,11 @@
android:layout_marginLeft="4dp" />
<androidx.constraintlayout.widget.ConstraintLayout
android:orientation="horizontal"
android:layout_width="46.5dp"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_marginStart="6dp">
android:layout_marginStart="6dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/user_card_lv_icon"
@@ -292,28 +310,32 @@
android:layout_marginStart="6dp"
android:src="@mipmap/emperor_rom" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp">
<ImageView
android:src="@mipmap/icon_user_card_t1"
android:layout_width="17dp"
android:layout_height="14dp"
android:layout_gravity="top"
android:layout_height="14dp"/>
android:src="@mipmap/icon_user_card_t1" />
<TextView
android:id="@+id/sign"
android:text="這家夥很懶，什麽都沒留下"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="這家夥很懶，什麽都沒留下"
android:textColor="#B1B1B1"
android:textSize="14sp" />
<ImageView
android:src="@mipmap/icon_user_card_t2"
android:layout_width="17dp"
android:layout_height="14dp"
android:layout_gravity="bottom"
android:layout_height="14dp"/>
android:src="@mipmap/icon_user_card_t2" />
</LinearLayout>
<LinearLayout
@@ -379,29 +401,32 @@
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="0dp"
android:visibility="visible">
<LinearLayout
android:id="@+id/user_level_layout"
android:layout_width="112dp"
android:layout_height="56dp"
android:layout_width="0dp"
android:layout_height="55dp"
android:layout_marginStart="8dp"
android:layout_weight="1"
android:background="@drawable/bg_user_card_lv"
android:gravity="center">
android:gravity="center_vertical">
<ImageView
android:id="@+id/live_icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginEnd="5dp"
android:layout_marginStart="2dp"
android:src="@mipmap/icon_chat_face"
android:visibility="visible" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:orientation="vertical">
<TextView
@@ -410,7 +435,7 @@
android:layout_height="wrap_content"
android:text="@string/live_user_level_anchor"
android:textColor="#FFFFFF"
android:textSize="12sp" />
android:textSize="11sp" />
<TextView
android:id="@+id/lv_val"
@@ -418,31 +443,75 @@
android:layout_height="wrap_content"
android:text="Lv.0"
android:textColor="#FFFFFF"
android:textSize="14sp" />
android:textSize="9sp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/gift_wall"
android:layout_width="0dp"
android:layout_height="55dp"
android:layout_marginStart="8dp"
android:layout_weight="1"
android:background="@drawable/bg_user_card_lv"
android:gravity="center_vertical">
<ImageView
android:id="@+id/icon_gift_wall"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginEnd="5dp"
android:layout_marginStart="2dp"
android:src="@mipmap/icon_chat_face"
android:visibility="visible" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/text_gift_wall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/live_user_level_anchor"
android:textColor="#FFFFFF"
android:textSize="11sp" />
<TextView
android:id="@+id/value_gift_wall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Lv.0"
android:textColor="#FFFFFF"
android:textSize="9sp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/noble_icon_layout"
android:layout_width="112dp"
android:layout_height="56dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_width="0dp"
android:layout_height="55dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_weight="1"
android:background="@mipmap/img_aristocrat_notopen"
android:gravity="center">
android:gravity="center_vertical">
<ImageView
android:id="@+id/noble_icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginEnd="5dp"
android:layout_marginStart="2dp"
android:src="@mipmap/img_fans_default"
android:visibility="invisible" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:orientation="vertical">
<TextView
@@ -451,7 +520,7 @@
android:layout_height="wrap_content"
android:text="@string/live_noble_level_anchor"
android:textColor="#FFFFFF"
android:textSize="12sp" />
android:textSize="11sp" />
<TextView
android:id="@+id/noble_val"
@@ -459,29 +528,32 @@
android:layout_height="wrap_content"
android:text="Lv.0"
android:textColor="#FFFFFF"
android:textSize="14sp" />
android:textSize="9sp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/honor_layout"
android:layout_width="112dp"
android:layout_height="56dp"
android:layout_width="0dp"
android:layout_height="55dp"
android:layout_marginEnd="8dp"
android:layout_weight="1"
android:background="@drawable/bg_user_card_honor"
android:gravity="center">
android:gravity="center_vertical">
<ImageView
android:id="@+id/honor_icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginEnd="5dp"
android:layout_marginStart="2dp"
android:src="@mipmap/img_honor_default"
android:visibility="visible" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:orientation="vertical">
<TextView
@@ -489,7 +561,7 @@
android:layout_height="wrap_content"
android:text="@string/live_honor_number_anchor"
android:textColor="#FFFFFF"
android:textSize="12sp" />
android:textSize="11sp" />
<TextView
android:id="@+id/honor_val"
@@ -497,7 +569,7 @@
android:layout_height="wrap_content"
android:text="0"
android:textColor="#FFFFFF"
android:textSize="14sp" />
android:textSize="9sp" />
</LinearLayout>
</LinearLayout>

23
live/src/main/res/layout/fragment_live_gift.xml Normal file
View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.viewpager.widget.ViewPager
android:id="@+id/context_layout"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_weight="1" />
<RadioGroup
android:id="@+id/radio_group"
android:layout_width="wrap_content"
android:layout_height="6dp"
android:layout_gravity="center_horizontal|bottom"
android:layout_marginTop="7dp"
android:layout_marginBottom="9dp"
android:orientation="horizontal" />
</LinearLayout>

13
live/src/main/res/layout/fragment_live_gift_item.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/frame_gift_list"
android:layout_width="match_parent"
android:overScrollMode="never"
android:layout_height="match_parent" />
</LinearLayout>

52
live/src/main/res/layout/fragment_live_parcel.xml Normal file
View File

@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:id="@+id/parcel_data_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:visibility="gone">
<androidx.viewpager.widget.ViewPager
android:id="@+id/context_layout"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_weight="1" />
<RadioGroup
android:id="@+id/radio_group"
android:layout_width="wrap_content"
android:layout_height="6dp"
android:layout_gravity="center_horizontal|bottom"
android:layout_marginTop="7dp"
android:layout_marginBottom="9dp"
android:orientation="horizontal" />
</LinearLayout>
<LinearLayout
android:id="@+id/parcel_data_no"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="112dp"
android:layout_height="90dp"
android:src="@mipmap/icon_empty_parcel" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/nothing_in_the_package_yet"
android:textColor="#717375"
android:textSize="12sp" />
</LinearLayout>
</FrameLayout>

79
live/src/main/res/layout/item_frame_gift.xml Normal file
View File

@@ -0,0 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/gift_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/background_gift_select"
android:gravity="center"
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:id="@+id/gift_icon"
android:layout_width="55dp"
android:layout_height="55dp" />
<TextView
android:id="@+id/gift_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="1dp"
android:textColor="@color/white"
android:textSize="11sp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/pay_ico"
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_marginEnd="2dp" />
<TextView
android:id="@+id/price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:textSize="10sp" />
</LinearLayout>
</LinearLayout>
<ImageView
android:id="@+id/corner_mark"
android:layout_width="wrap_content"
android:layout_height="11dp"
android:layout_gravity="end"
android:layout_marginEnd="2dp" />
</FrameLayout>
<LinearLayout
android:id="@+id/gift_loading_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#C0000000"
android:gravity="center"
android:visibility="visible">
<ImageView
android:id="@+id/gift_loading"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="30dp"
android:src="@mipmap/icon_download_gift" />
</LinearLayout>
</RelativeLayout>

18
live/src/main/res/layout/item_gift_top_new.xml Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="match_parent">
<com.yunbao.common.custom.DrawableTextView
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:gravity="center_vertical"
android:text="@string/live_wrap"
android:textStyle="bold"
android:textColor="@color/white"
android:textSize="16sp" />
</LinearLayout>

97
live/src/main/res/layout/item_live_parcel.xml Normal file
View File

@@ -0,0 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/gift_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/background_gift_select"
android:gravity="center"
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="55dp">
<ImageView
android:id="@+id/gift_icon"
android:layout_width="55dp"
android:layout_height="55dp" />
<TextView
android:id="@+id/gift_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="2dp"
android:background="@drawable/bg_parcel_point"
android:paddingStart="3dp"
android:paddingEnd="3dp"
android:text="11"
android:textColor="@color/white"
android:textSize="8sp" />
</RelativeLayout>
<TextView
android:id="@+id/gift_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="1dp"
android:textColor="@color/white"
android:textSize="11sp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/pay_ico"
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_marginEnd="2dp"
android:visibility="gone" />
<TextView
android:id="@+id/price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:textSize="10sp" />
</LinearLayout>
</LinearLayout>
<ImageView
android:id="@+id/corner_mark"
android:layout_width="wrap_content"
android:layout_height="11dp"
android:layout_gravity="end"
android:layout_marginEnd="2dp" />
</FrameLayout>
<LinearLayout
android:id="@+id/gift_loading_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#C0000000"
android:gravity="center"
android:visibility="visible">
<ImageView
android:id="@+id/gift_loading"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="30dp"
android:src="@mipmap/icon_download_gift" />
</LinearLayout>
</RelativeLayout>

127
live/src/main/res/layout/item_random_pk_info.xml
View File

@@ -6,79 +6,86 @@
android:layout_height="wrap_content"
android:visibility="visible">
<LinearLayout
<androidx.core.widget.NestedScrollView
android:id="@+id/linearLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:background="@drawable/background_7792d0"
android:orientation="vertical"
android:layout_height="230dp"
android:fillViewport="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="15dp"
android:text="@string/random_pk_info_title"
android:textColor="#F6F7FB"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:background="@drawable/background_7792d0"
android:orientation="vertical">
android:text="@string/random_pk_info_desc_1"
android:textColor="#F6F7FB"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="15dp"
android:text="@string/random_pk_info_title"
android:textColor="#F6F7FB"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:text="@string/random_pk_info_desc_2"
android:textColor="#F6F7FB"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:text="@string/random_pk_info_desc_3"
android:textColor="#F6F7FB"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="15dp"
android:text="@string/random_pk_info_time_desc"
android:textColor="#F6F7FB"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="15dp"
android:text="@string/random_pk_info_time"
android:textColor="#F6F7FB"
android:textSize="14sp" />
</LinearLayout>
android:text="@string/random_pk_info_desc_1"
android:textColor="#F6F7FB"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:text="@string/random_pk_info_desc_2"
android:textColor="#F6F7FB"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:text="@string/random_pk_info_desc_3"
android:textColor="#F6F7FB"
android:textSize="14sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="15dp"
android:text="@string/random_pk_info_time_desc"
android:textColor="#F6F7FB"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="15dp"
android:text="@string/random_pk_info_time"
android:textColor="#F6F7FB"
android:textSize="14sp" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

194
live/src/main/res/layout/rogular_introduce_popup.xml Normal file
View File

@@ -0,0 +1,194 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/background_regular"
android:orientation="vertical">
<ImageView
android:id="@+id/close_btn"
android:layout_width="8dp"
android:layout_height="14dp"
android:layout_marginStart="23dp"
android:layout_marginTop="37dp"
android:src="@mipmap/icon_regular_black" />
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="15dp"
android:layout_marginTop="58dp"
android:layout_marginEnd="15dp"
android:layout_marginBottom="34dp"
android:background="@drawable/background_regular_center">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingStart="11dp"
android:paddingEnd="11dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="33dp"
android:text="@string/gift_wall_entrance"
android:textColor="#1D31FE"
android:textSize="14sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/gift_wall_entrance1"
android:textColor="#7480FF"
android:textSize="13sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/gift_wall_entrance2"
android:textColor="#1D31FE"
android:textSize="14sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/gift_wall_entrance3"
android:textColor="#7480FF"
android:textSize="13sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/gift_wall_entrance4"
android:textColor="#1D31FE"
android:textSize="14sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/gift_wall_entrance5"
android:textColor="#7480FF"
android:textSize="13sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/codex"
android:textColor="#1D31FE"
android:textSize="14sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/gift_wall_entrance6"
android:textColor="#7480FF"
android:textSize="13sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/gift_wall_entrance7"
android:textColor="#1D31FE"
android:textSize="14sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/gift_wall_entrance8_1"
android:textColor="#7480FF"
android:textSize="13sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/gift_wall_entrance8_2"
android:textColor="#7480FF"
android:textSize="13sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/gift_wall_entrance8_3"
android:textColor="#7480FF"
android:textSize="13sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/gift_wall_entrance8_4"
android:textColor="#7480FF"
android:textSize="13sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/gift_wall_entrance8_5"
android:textColor="#7480FF"
android:textSize="13sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/gift_wall_entrance8_6"
android:textColor="#7480FF"
android:textSize="13sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/gift_wall_entrance8_7"
android:textColor="#7480FF"
android:textSize="13sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/gift_wall_entrance8_8"
android:textColor="#7480FF"
android:textSize="13sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/gift_wall_entrance8_9"
android:textColor="#7480FF"
android:textSize="13sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:text="@string/gift_wall_entrance8_10"
android:textColor="#7480FF"
android:textSize="13sp" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
<TextView
android:id="@+id/regular_title"
android:layout_width="142dp"
android:layout_height="42dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="28dp"
android:background="@mipmap/background_regular_title"
android:gravity="center"
android:textSize="16sp"
android:textStyle="bold" />
</FrameLayout>

147
live/src/main/res/layout/view_blind_box.xml
View File

@@ -1,147 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="170dp"
android:layout_height="110dp">
<LinearLayout
android:layout_width="159dp"
android:layout_height="match_parent"
android:layout_gravity="end"
android:gravity="center_horizontal"
android:orientation="vertical">
<!--凤凰，龙，麒麟-->
<FrameLayout
android:id="@+id/frame_blind_top"
android:layout_width="match_parent"
android:layout_height="86.5dp"
android:background="@mipmap/bg_kirin">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="51dp"
android:layout_marginTop="59dp"
android:orientation="vertical">
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ProgressBar
android:id="@+id/progress_blind3"
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="80dp"
android:layout_height="8dp"
android:layout_gravity="center"
android:max="100"
android:progress="30"
android:progressDrawable="@drawable/bg_blind_progres"
android:visibility="gone" />
<ProgressBar
android:id="@+id/progress_blind1"
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="80dp"
android:layout_height="8dp"
android:layout_gravity="center"
android:max="100"
android:progress="50"
android:progressDrawable="@drawable/bg_blind_progress"
android:visibility="visible" />
<ProgressBar
android:id="@+id/progress_blind2"
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="80dp"
android:layout_height="8dp"
android:layout_gravity="center"
android:max="100"
android:progress="50"
android:progressDrawable="@drawable/bg_blind_progress1"
android:visibility="gone" />
<TextView
android:id="@+id/text_blind_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textSize="6sp" />
</FrameLayout>
</LinearLayout>
<TextView
android:id="@+id/blind_number"
android:layout_width="90dp"
android:layout_height="wrap_content"
android:layout_marginStart="47dp"
android:layout_marginTop="71dp"
android:textColor="@color/white"
android:textSize="8sp" />
<ImageView
android:id="@+id/description"
android:layout_width="13dp"
android:layout_height="13dp"
android:layout_gravity="end"
android:layout_marginTop="40dp"
android:layout_marginEnd="15dp"
android:src="@mipmap/icon_what" />
</FrameLayout>
<FrameLayout
android:layout_width="149dp"
android:layout_height="match_parent"
android:background="@mipmap/bg_blind_bottom">
<com.yunbao.common.views.weight.MarqueeTextView
android:id="@+id/text_blind_gift_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="5dp"
android:ellipsize="marquee"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center"
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="10sp" />
</FrameLayout>
</LinearLayout>
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/blind_svga"
android:layout_width="71dp"
android:layout_marginStart="5dp"
android:layout_height="71dp"
android:layout_marginTop="29dp" />
<RelativeLayout
android:layout_width="42dp"
android:layout_height="42dp"
android:layout_marginStart="20dp"
android:layout_marginTop="43dp">
<ImageView
android:id="@+id/icon_masking"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
</RelativeLayout>
<com.opensource.svgaplayer.SVGAImageView
android:id="@+id/blind_box_open"
android:layout_width="61dp"
android:layout_height="110dp"
android:layout_marginStart="10dp"
android:layout_marginTop="2dp" />
</FrameLayout>

12
live/src/main/res/layout/view_live_gift.xml
View File

@@ -8,6 +8,7 @@
android:visibility="invisible">
<View
android:id="@+id/root_back"
android:layout_width="204dp"
android:layout_height="50dp"
android:layout_gravity="bottom"
@@ -107,4 +108,15 @@
android:visibility="invisible" />
</LinearLayout>
<TextView
android:id="@+id/naming_icon"
android:layout_width="56dp"
android:layout_height="15dp"
android:layout_gravity="bottom"
android:layout_marginStart="11dp"
android:background="@drawable/background_naming_icon"
android:gravity="center"
android:text="@string/the_title_financier2"
android:textColor="#DB7008"
android:textSize="10sp" />
</FrameLayout>

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

@@ -360,7 +360,7 @@
<!--周星榜-->
<FrameLayout
android:id="@+id/live_wks_layout"
android:layout_width="wrap_content"
android:layout_width="70dp"
android:layout_height="20dp"
android:layout_alignTop="@id/hour_rank_layout"
android:layout_marginStart="4dp"
@@ -371,26 +371,44 @@
<LinearLayout
android:id="@+id/live_wks_layout2"
android:layout_width="56dp"
android:layout_width="70dp"
android:layout_height="match_parent"
android:orientation="horizontal" />
<ImageView
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="6dp"
android:src="@mipmap/live_icon_zhouxing" />
<TextView
<ViewFlipper
android:id="@+id/live_wks_and_gift_wall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="20dp"
android:layout_marginEnd="6dp"
android:text="@string/live_wks"
android:textColor="#FFFFFFFF"
android:textSize="10sp" />
android:layout_height="20dp"
android:layout_marginStart="0dp"
android:flipInterval="5000"
android:inAnimation="@anim/anim_marquee_in"
android:outAnimation="@anim/anim_marquee_out" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="6dp"
android:src="@mipmap/live_icon_zhouxing"
android:visibility="gone" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="20dp"
android:layout_marginEnd="6dp"
android:text="@string/live_wks"
android:textColor="#FFFFFFFF"
android:textSize="10sp"
android:visibility="gone" />
</LinearLayout>
</FrameLayout>
<!--心愿单-->
@@ -524,7 +542,8 @@
android:clickable="true"
android:focusable="true"
android:gravity="center"
android:visibility="invisible">
android:visibility="invisible"
tools:visibility="visible">
<ImageView
android:layout_width="8dp"

BIN
live/src/main/res/mipmap-mdpi/icon_live_gift_2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 233 B

BIN
live/src/main/res/mipmap-mdpi/icon_live_gift_lian.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.8 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 28 KiB

BIN
live/src/main/res/mipmap-xxxhdpi/bg_blind_bottom.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.3 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 933 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
live/src/main/res/mipmap-xxxhdpi/icon_what.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 KiB

BIN
live/src/main/res/mipmap-xxxhdpi/live_icon_leftt_sliding.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 331 B

After

Width:  |  Height:  |  Size: 357 B