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

Merge branch 'master' into dev_hour_rank

Browse Source
This commit is contained in:
zlzw
2022-08-29 09:44:46 +08:00
parent 55ccb03b4a 513d6d19eb
commit 308ceeb28c
102 changed files with 3632 additions and 1015 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
live/src/main/res/layout/activity_live_audience.xml
View File

@@ -18,6 +18,7 @@
android:src="@mipmap/live_bg" />
<View
android:id="@+id/mask"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#70000000" />

6
live/src/main/res/layout/activity_live_detail.xml
View File

@@ -9,10 +9,6 @@
android:layout_height="match_parent"
android:overScrollMode="never" />
<com.yunbao.live.views.LoadingView
android:id="@+id/loading"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="visible" />
</RelativeLayout>

3
live/src/main/res/layout/dialog_guard_list.xml
View File

@@ -48,8 +48,7 @@
android:gravity="center"
android:text="@string/guard_buy_2"
android:textColor="@color/white"
android:textSize="14sp"
/>
android:textSize="14sp" />
<TextView
android:id="@+id/tip"

184
live/src/main/res/layout/dialog_new_guard_buy.xml Normal file
View File

@@ -0,0 +1,184 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout 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"
android:background="@color/transparent"
android:clipChildren="false">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/guard_rootView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="52dp"
android:background="@drawable/guardian_img_bg"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<LinearLayout
android:id="@+id/guard_linearLayout"
android:layout_width="182dp"
android:layout_height="32dp"
android:layout_marginTop="52dp"
android:layout_marginBottom="21dp"
android:background="@drawable/bg_guard_up_title"
android:gravity="center"
android:orientation="vertical"
app:layout_constraintBottom_toTopOf="@+id/guard_constraintLayout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/guard_anchor_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text=""
android:textColor="#F6F7FB"
android:textSize="14sp" />
</LinearLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/guard_constraintLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="5dp"
android:layout_marginTop="11dp"
android:layout_marginEnd="5dp"
android:background="@drawable/bg_guard_info"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/guard_linearLayout">
<TextView
android:id="@+id/guard_textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="center"
android:text="@string/buy_guard_info"
android:textColor="#020202"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:id="@+id/guard_buys_layout"
android:layout_width="0dp"
android:layout_height="110dp"
android:layout_marginStart="6dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="6dp"
android:orientation="vertical"
android:overScrollMode="never"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/guard_textView2">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/guard_buys"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center">
</androidx.recyclerview.widget.RecyclerView>
</LinearLayout>
<ImageView
android:id="@+id/guard_imageView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/guard_buys_layout"
app:srcCompat="@drawable/sh_img_title" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/guard_rights"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:overScrollMode="never"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/guard_imageView2">
</androidx.recyclerview.widget.RecyclerView>
</androidx.constraintlayout.widget.ConstraintLayout>
<RelativeLayout
android:id="@+id/guard_relativeLayout"
android:layout_width="match_parent"
android:layout_height="77dp"
android:layout_marginTop="-20dp"
android:background="@drawable/img_guard_bottom"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/guard_constraintLayout">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="25dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<TextView
android:id="@+id/guard_coin_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:textColor="@color/textColor2"
android:textSize="14sp" />
<TextView
android:id="@+id/guard_coin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:layout_toRightOf="@id/guard_coin_name"
android:drawablePadding="4dp"
android:textColor="@color/global"
android:textSize="14sp" />
<TextView
android:id="@+id/guard_btn_buy"
android:layout_width="90dp"
android:layout_height="30dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="15dp"
android:background="@drawable/bg_guard_btn_buy"
android:enabled="false"
android:gravity="center"
android:text="@string/guard_buy"
android:textColor="@color/white"
android:textSize="14sp" />
</RelativeLayout>
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView
android:id="@+id/guard_imageView"
android:layout_width="243dp"
android:layout_height="117dp"
android:layout_above="@id/guard_rootView"
android:layout_centerHorizontal="true"
android:layout_marginBottom="-102dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/guardian_img_wings" />
</RelativeLayout>

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

@@ -73,7 +73,7 @@
android:text="@string/live_guard"
android:textColor="#ff646464"
android:textSize="16sp"
android:visibility="gone" />
android:visibility="visible" />
<TextView
android:id="@+id/fans_btn"

71
live/src/main/res/layout/item_dialog_guard_buy.xml Normal file
View File

@@ -0,0 +1,71 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="112dp"
android:layout_height="114dp"
android:id="@+id/guard_buy_button"
android:background="@drawable/img_k_selected"
android:orientation="vertical">
<TextView
android:id="@+id/guard_buy_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="15dp"
android:text="TextView"
android:textColor="#020202"
android:textSize="14sp"
android:textStyle="bold" />
<LinearLayout
android:layout_marginTop="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/guard_buy_goback"
android:layout_width="wrap_content"
android:layout_height="17dp"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="right"
android:text="TextView"
android:textColor="#979797"
android:textSize="12sp" />
<ImageView
android:layout_width="10dp"
android:layout_height="11dp"
android:layout_gravity="center"
android:layout_weight="1"
app:srcCompat="@drawable/img_venosa" />
</LinearLayout>
<LinearLayout
android:layout_marginTop="14dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="horizontal">
<TextView
android:id="@+id/guard_buy_money"
android:layout_width="wrap_content"
android:layout_height="17dp"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="right"
android:text="TextView"
android:textColor="#7C4FF9"
android:textSize="12sp" />
<ImageView
android:layout_width="17dp"
android:layout_height="13dp"
android:layout_gravity="center"
android:layout_weight="1"
app:srcCompat="@drawable/img_diamond" />
</LinearLayout>
</LinearLayout>

24
live/src/main/res/layout/item_fast_msg.xml Normal file
View File

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/room_fast_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/bg_fast_meg">
<TextView
android:id="@+id/room_fast_message_text_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="4dp"
android:text="TextView"
android:textColor="#FFFFFF"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

19
live/src/main/res/layout/layout_portrait_comm_item.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/iv_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"/>
<ImageView
android:id="@+id/iv_loading"
android:layout_width="150dp"
android:layout_height="188dp"
android:layout_centerInParent="true"
android:background="@drawable/loading_animation" />
</RelativeLayout>

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

@@ -12,8 +12,8 @@
<ImageView
android:id="@+id/iv_loading"
android:layout_width="50dp"
android:layout_height="10dp"
android:layout_width="150dp"
android:layout_height="188dp"
android:layout_centerInParent="true"
android:background="@drawable/loading_animation" />

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

@@ -85,47 +85,6 @@
</LinearLayout>
<LinearLayout
android:id="@+id/btn_event1"
android:layout_width="68dp"
android:layout_height="68dp"
android:layout_gravity="right"
android:layout_marginRight="10dp"
android:layout_marginBottom="18dp"
android:gravity="center_horizontal"
android:orientation="vertical">
<com.ms.banner.Banner
android:id="@+id/banner1"
android:layout_width="68dp"
android:layout_height="68dp"
android:layout_marginBottom="5dp"
app:delay_time="5000"
app:indicator_height="8dp"
app:indicator_width="8dp" />
</LinearLayout>
<LinearLayout
android:id="@+id/btn_event2"
android:layout_width="58dp"
android:layout_height="80dp"
android:layout_gravity="right"
android:layout_marginRight="15dp"
android:layout_marginBottom="45dp"
android:gravity="center_horizontal"
android:orientation="vertical">
<com.ms.banner.Banner
android:id="@+id/banner2"
android:layout_width="58dp"
android:layout_height="80dp"
android:layout_marginBottom="5dp"
app:delay_time="5000"
app:indicator_height="8dp"
app:indicator_width="8dp" />
</LinearLayout>
<LinearLayout
android:id="@+id/btn_onecz_event"
@@ -147,24 +106,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/btn_event"
android:layout_width="68dp"
android:layout_height="68dp"
android:layout_gravity="right"
android:layout_marginRight="10dp"
android:layout_marginBottom="20dp"
android:gravity="center_horizontal"
android:orientation="vertical"
android:visibility="gone">
<ImageView
android:id="@+id/img_event"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/live_turntable" />
</LinearLayout>
<LinearLayout

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

@@ -9,6 +9,76 @@
android:paddingTop="15dp">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:orientation="vertical">
<LinearLayout
android:id="@+id/btn_event1"
android:layout_width="68dp"
android:layout_height="68dp"
android:layout_gravity="right"
android:layout_marginRight="10dp"
android:layout_marginBottom="18dp"
android:gravity="center_horizontal"
android:orientation="vertical">
<com.ms.banner.Banner
android:id="@+id/banner1"
android:layout_width="68dp"
android:layout_height="68dp"
android:layout_marginBottom="5dp"
app:delay_time="5000"
app:indicator_height="8dp"
app:indicator_width="8dp" />
</LinearLayout>
<LinearLayout
android:id="@+id/btn_event2"
android:layout_width="58dp"
android:layout_height="80dp"
android:layout_gravity="right"
android:layout_marginRight="15dp"
android:layout_marginBottom="45dp"
android:gravity="center_horizontal"
android:orientation="vertical">
<com.ms.banner.Banner
android:id="@+id/banner2"
android:layout_width="58dp"
android:layout_height="80dp"
android:layout_marginBottom="5dp"
app:delay_time="5000"
app:indicator_height="8dp"
app:indicator_width="8dp" />
</LinearLayout>
<LinearLayout
android:id="@+id/btn_event"
android:layout_width="68dp"
android:layout_height="68dp"
android:layout_gravity="right"
android:layout_marginRight="10dp"
android:layout_marginBottom="20dp"
android:gravity="center_horizontal"
android:orientation="vertical"
android:visibility="gone">
<ImageView
android:id="@+id/img_event"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/live_turntable" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/lin"
android:layout_width="match_parent"
@@ -127,12 +197,12 @@
android:id="@+id/user_guard"
android:layout_width="27dp"
android:layout_height="27dp"
android:layout_centerVertical="true"
android:layout_centerInParent="true"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:scaleType="centerCrop"
app:riv_oval="true"
android:src="@mipmap/img_guardian_empty"/>
android:src="@mipmap/img_guardian_empty"
app:riv_oval="true" />
<com.opensource.svgaplayer.SVGAImageView
@@ -141,18 +211,18 @@
android:layout_height="38dp"
android:src="@drawable/img_guardian_online"
android:visibility="gone"
app:autoPlay="true"/>
app:autoPlay="true" />
</RelativeLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/user_recyclerView"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_marginRight="-3dp"
android:overScrollMode="never" />
<ImageView
android:id="@+id/user_more"
android:layout_width="33dp"
@@ -352,10 +422,10 @@
android:layout_width="wrap_content"
android:layout_height="20dp"
android:layout_marginStart="6dp"
android:flipInterval="5000"
android:layout_marginEnd="6dp"
android:flipInterval="5000"
android:inAnimation="@anim/anim_marquee_in"
android:outAnimation="@anim/anim_marquee_out"/>
android:outAnimation="@anim/anim_marquee_out" />
</LinearLayout>
<!--粉丝团-->
@@ -1796,7 +1866,11 @@
android:layout_centerHorizontal="true"
android:layout_centerVertical="true" />
<!-- SVG 座骑-->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/room_fast_msg"
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_alignParentBottom="true" />
</RelativeLayout>

1
live/src/main/res/layout/view_sidebar_live_audience.xml
View File

@@ -10,6 +10,7 @@
android:scaleType="centerCrop" />
<View
android:id="@+id/mask"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#90000000" />