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

Merge branch 'dev_6.5.0_anchor_say' into dev_6.5.0_anchor_call_me

Browse Source 
# Conflicts:
#	common/src/main/java/com/yunbao/common/http/PDLiveApi.java
#	common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
#	main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
This commit is contained in:
zlzw
2023-03-28 11:01:58 +08:00
parent 2b56eff39a 6ef8c3778b
commit 3a980d22fd
21 changed files with 460 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/src/main/res/values-en/strings.xml
View File

@@ -1089,4 +1089,5 @@ Limited ride And limited avatar frame</string>
<string name="live_medal_des4">Get a fan badge for giving gifts</string>
<string name="clear_unread_messages">Whether to clear unread messages</string>
<string name="support_login">The application collects location data to support login and registration functions.</string>
<string name="layout_live_anchor_say_ready_title">女神說</string>
</resources>

2
common/src/main/res/values/strings.xml
View File

@@ -1085,7 +1085,7 @@
<string name="sign_up_for">註冊PD LIVE</string>
<string name="register_and_log_in">註冊並登錄</string>
<string name="enjoy_a_lot">開通貴族，尊享超多特權！</string>
<string name="layout_live_anchor_say_ready_title">女神說</string>
</resources>