18401019693 c3d4cb8d62 Merge branch 'master' into master_sud ...

# 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

2023-10-07 14:46:22 +08:00

..

src/main

update config加入网络失败提示

2023-09-16 14:23:43 +08:00

agconnect-services.json

111

2022-08-26 13:00:45 +08:00

build.gradle

update 粉丝团

2023-08-05 18:04:36 +08:00

google-services.json

androidx版本首次提交

2022-07-18 15:31:45 +08:00

img_optimizer.log

androidx版本首次提交

2022-07-18 15:31:45 +08:00

proguard-rules.pro

游戏修改，粉丝团提示修改

2023-10-05 10:52:54 +08:00