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

Merge branch 'master' into master_sud

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/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
#	config.gradle
This commit is contained in:
18401019693
2023-10-07 14:46:22 +08:00
parent 916a1447f0 20ccb37ccf
commit c3d4cb8d62
58 changed files with 1184 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
live/src/main/res/layout/dialog_fans_group_buy.xml
View File

@@ -48,15 +48,17 @@
<TextView
android:id="@+id/giftInfo"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginTop="9dp"
android:layout_marginEnd="32dp"
android:text="@string/live_fans_group_buy_info"
android:textColor="#B3000000"
android:textSize="10sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/giftName"
android:text="@string/live_fans_group_buy_info" />
app:layout_constraintTop_toBottomOf="@+id/giftName" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/giftList"

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

@@ -29,7 +29,7 @@
android:layout_marginBottom="8dp"
android:background="@drawable/bg_live_prank_gift_add"
android:gravity="center"
android:text="确定添加"
android:text="@string/live_gift_dialog_select_add"
android:textColor="#FFF"
android:textSize="10sp"
app:layout_constraintBottom_toBottomOf="parent"

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

@@ -326,7 +326,7 @@
android:id="@+id/sign"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="這家夥很懶，什麽都沒留下"
android:text="@string/live_user_dialog_tips"
android:textColor="#B1B1B1"
android:textSize="14sp" />
@@ -504,13 +504,15 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginEnd="5dp"
android:layout_marginStart="2dp"
android:layout_marginStart="7dp"
android:src="@mipmap/img_fans_default"
android:visibility="invisible" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="2dp"
android:layout_marginStart="5dp"
android:orientation="vertical">
<TextView

13
live/src/main/res/layout/view_funs_live_anchor_start_notify.xml
View File

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="340dp"
android:layout_height="75dp"
android:layout_height="wrap_content"
android:minHeight="75dp"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:background="@mipmap/bg_funs_live_anchor_start">
@@ -9,7 +10,7 @@
<com.yunbao.common.custom.RatioRoundImageView
android:id="@+id/avatar"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_height="0dp"
android:layout_marginStart="8dp"
android:layout_marginTop="7dp"
android:layout_marginBottom="7dp"
@@ -34,12 +35,16 @@
<TextView
android:id="@+id/description"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:text="@string/main_anchor_live_notify_info"
android:textSize="13sp"
android:textColor="#CCFFFFFF"
android:textSize="13sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/liveGo"
app:layout_constraintStart_toStartOf="@+id/anchorName"
app:layout_constraintTop_toBottomOf="@+id/anchorName" />

7
live/src/main/res/layout/view_link_mic_pk.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:id="@+id/rl_root"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -159,17 +160,19 @@
<TextView
android:id="@+id/time"
android:layout_width="72dp"
android:layout_height="20dp"
android:layout_height="wrap_content"
android:layout_above="@id/bottom"
android:layout_centerHorizontal="true"
android:layout_marginBottom="8dp"
android:background="@mipmap/bg_time_box"
android:minHeight="20dp"
android:gravity="center"
android:paddingLeft="3dp"
android:paddingRight="3dp"
android:textColor="@color/white"
android:textSize="11sp"
android:visibility="invisible" />
android:visibility="invisible"
tools:visibility="visible" />
<ImageView
android:id="@+id/result"

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

@@ -190,7 +190,7 @@
android:paddingTop="5dp"
android:paddingRight="8dp"
android:paddingBottom="5dp"
android:text="結束連麥"
android:text="@string/live_link_mic_3"
android:textColor="@color/color_white"
android:textSize="13sp"
android:visibility="gone" />

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

@@ -135,7 +135,7 @@
android:paddingTop="5dp"
android:paddingRight="8dp"
android:paddingBottom="5dp"
android:text="結束連麥"
android:text="@string/live_link_mic_3"
android:textColor="@color/color_white"
android:textSize="13sp"
android:visibility="gone" />

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

@@ -19,7 +19,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:text="沒有找到匹配結果~"
android:text="@string/live_free_pk_empty_tips"
android:textColor="#C4C4C4"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

5
live/src/main/res/layout/view_noble_seat.xml
View File

@@ -8,7 +8,7 @@
<FrameLayout
android:id="@+id/wish_list_layout"
android:layout_width="70dp"
android:layout_width="75dp"
android:layout_height="20dp"
android:orientation="horizontal"
android:visibility="visible">
@@ -28,14 +28,13 @@
<TextView
android:id="@+id/wish_list"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="20dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="20dp"
android:layout_marginEnd="6dp"
android:ellipsize="end"
android:gravity="center"
android:maxLength="7"
android:text="@string/noble_seat"
android:textColor="#FFFFFF"
android:textSize="10sp" />

2
live/src/main/res/values-en/strings.xml
View File

@@ -45,7 +45,7 @@
<string name="release_cancel_send" >Release cancel send</string>
<string name="more_than" >No recording has been recognized in over 10 seconds</string>
<string name="live_role_title" >Identity privilege</string>
<string name="noble_seat" >Nobleman\'s seat</string>
<string name="noble_seat" >VIP seats</string>
<string name="live_mic_user_apply" >%s applies for connected wheat. Check whether</string>
<string name="live_mic_user_down" >The wheat has been kicked off</string>
<string name="live_mic_invite" >An invitation has been sent and is waiting for the user to accept</string>