Martin d5b60523a5 Merge remote-tracking branch 'origin/master' into dev_6.7.0 ...

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/shayu/phonelive/AppContext.java
#	common/src/main/java/com/yunbao/common/CommonAppConfig.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/manager/OpenAdManager.java
#	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
#	live/src/main/java/com/yunbao/live/utils/LiveTextRender.java
#	live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
#	live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java

2024-06-16 10:28:31 +08:00

..

src/main

Merge remote-tracking branch 'origin/master' into dev_6.7.0

2024-06-16 10:28:31 +08:00

agconnect-services.json

lib_google

2023-11-27 17:12:27 +08:00

build.gradle

fix[修复BUG]

2024-06-05 13:27:22 +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

Merge branch 'master' into 声网升级

2024-05-22 13:37:33 +08:00