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

app

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

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

baidu

fix[修复BUG]

2024-06-05 13:27:22 +08:00

beauty

fix[修复BUG]

2024-06-05 13:27:22 +08:00

common

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

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

FaceUnity

fix[修复BUG]

2024-06-05 13:27:22 +08:00

gradle/wrapper

替换优化后SVGA库

2022-09-13 17:15:33 +08:00

IAP6Helper

三星内购

2023-12-07 17:46:22 +08:00

lib_country_code

lib_google

2023-11-28 18:28:47 +08:00

lib_faceunity

修复声网直播间会白屏问题

2024-06-11 14:08:45 +08:00

lib_google

移除友盟SDK

2024-05-08 11:34:56 +08:00

lib_huawei

修复支付问题

2023-11-30 16:15:23 +08:00

libs

替换友盟为本地aar

2024-05-08 09:52:35 +08:00

live

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

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

main

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

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

pluginsForAnchor

fix[修复BUG]

2024-06-05 13:27:22 +08:00

Share

fix[修复BUG]

2024-06-05 13:27:22 +08:00

video

fix[修复BUG]

2024-06-05 13:27:22 +08:00

.gitignore

androidx版本首次提交

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

build.gradle

fix[修复BUG]

2024-06-05 13:27:22 +08:00

config.gradle

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

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

dependencies.gradle

Merge branch 'dev_Memory' into dev_test

2022-09-22 14:43:57 +08:00

gradle.properties

修复游戏房发言重复/不显示问题

2024-06-07 14:50:39 +08:00

gradlew

androidx版本首次提交

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

gradlew.bat

androidx版本首次提交

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

hdl.jks

androidx版本首次提交

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

settings.gradle

fix[修复BUG]

2024-06-05 09:50:57 +08:00

Description

No description provided

419 MiB

Languages

Java 99.8%

Kotlin 0.2%