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

合并6.8.0代码

Browse Source
This commit is contained in:
Martin
2024-08-01 13:08:08 +08:00
parent c3ffb658c8
commit f157a5862d
429 changed files with 25508 additions and 5888 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
<?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="match_parent"
android:clickable="true">
@@ -15,7 +16,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#b3000000"
android:visibility="gone">
android:visibility="gone"
tools:visibility="gone">
<TextView
android:id="@+id/text_1"
@@ -137,6 +139,7 @@
</LinearLayout>
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avatar_2"
android:layout_width="100dp"
@@ -169,7 +172,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#b3000000"
android:visibility="visible">
android:visibility="visible"
tools:visibility="gone">
<View
@@ -259,9 +263,11 @@
android:background="@drawable/background_live_end"
android:gravity="center"
android:padding="10dp">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -352,7 +358,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#b3000000"
android:visibility="gone">
android:visibility="gone"
tools:visibility="visible">
<TextView
android:id="@+id/title"
@@ -464,15 +471,127 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:gravity="center"
android:text="@string/live_watch_num"
android:textColor="@color/white"
android:gravity="center"
android:textSize="13.33sp" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:id="@+id/banLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/anchor_data_show"
android:layout_centerHorizontal="true"
android:layout_marginLeft="20dp"
android:layout_marginTop="20dp"
android:layout_marginRight="20dp"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">
<TextView
android:id="@+id/ban_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/live_end_view_ban_title"
android:textColor="#E5E5E5"
android:textSize="14sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:background="@drawable/bg_live_end"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:text="@string/live_end_view_ban_reason"
android:textColor="#E5E5E5"
android:textSize="14sp" />
<TextView
android:id="@+id/ban_reason"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginRight="17dp"
android:gravity="end"
android:layout_weight="1"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:text="123\n45678"
tools:text="Pornography: Sexual behavior: Moderate pornography"
android:textColor="#E5E5E5"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="44dp"
android:layout_marginTop="10dp"
android:background="@drawable/bg_live_end"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:text="@string/live_end_view_ban_content"
android:textColor="#E5E5E5"
android:textSize="14sp" />
<TextView
android:id="@+id/ban_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="17dp"
android:gravity="end"
android:text="123\n45678"
android:textColor="#E5E5E5"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="44dp"
android:layout_marginTop="10dp"
android:background="@drawable/bg_live_end"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:text="@string/live_end_view_ban_timer"
android:textColor="#E5E5E5"
android:textSize="14sp" />
<TextView
android:id="@+id/ban_timer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="17dp"
android:gravity="end"
android:text="123\n45678"
android:textColor="#E5E5E5"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
<FrameLayout
android:layout_width="88.13dp"
android:layout_height="88.13dp"