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

Merge branch 'pandorapan_社区相关' into dev_改版主分支

Browse Source 
# Conflicts:
#	common/build.gradle
#	common/src/main/java/com/yunbao/common/bean/MessageUserInfoBean.java
#	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/RouteUtil.java
#	common/src/main/res/values/strings.xml
#	main/src/main/java/com/yunbao/main/activity/MainActivity.java
This commit is contained in:
hch
2024-03-15 17:27:31 +08:00
parent 0f2269925f 2a8f6d99a5
commit ba7e59a946
148 changed files with 9764 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/res/values-en-rUS/string.xml
View File

@@ -94,6 +94,7 @@
<string name="edit_profile_right_date">Please select the correct date</string>
<string name="edit_nick_name_price_msg">Warm tip: you can change your nickname once for free, and then 1800 diamonds will be needed</string>
<string name="follow">Follow</string>
<string name="main_type_theater">Theater</string>
<string name="noble">VIP</string>
<string name="rosy">Rosy</string>
<string name="skin">Skin</string>
@@ -257,6 +258,7 @@
<string name="login_tip_4">Log in</string>
<string name="shopmall">shopmall</string>
<string name="recomment">Recommend</string>
<string name="main_type_find">Find</string>
<string name="cust_server">CSD</string>
<string name="live_anchor">Anchor</string>
<string name="live_start">Live broadcast</string>