zlzw b56368412c Merge branch 'dev_random_pk' ...

# Conflicts:
#	common/src/main/res/values/strings.xml
#	config.gradle
#	live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
#	live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
#	live/src/main/java/com/yunbao/live/socket/SocketRyClient.java

2022-12-09 09:30:17 +08:00

app

多人Pk开播

2022-12-07 17:59:10 +08:00

baidu

androidx版本首次提交

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

beauty

1

2022-07-20 14:40:44 +08:00

common

Merge branch 'dev_random_pk'

2022-12-09 09:30:17 +08:00

FaceUnity

修复一处回报的闪退异常

2022-11-26 10:57:31 +08:00

gradle/wrapper

替换优化后SVGA库

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

lib_country_code

update

2022-09-22 13:57:15 +08:00

libs

更新SVGA库：新增获取动画持续时间方法

2022-10-10 16:10:15 +08:00

live

Merge branch 'dev_random_pk'

2022-12-09 09:30:17 +08:00

main

update 随机PK拒绝对话框

2022-12-08 11:34:31 +08:00

video

Js调用原生整改

2022-11-11 18:32:35 +08:00

.gitignore

androidx版本首次提交

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

build.gradle

调整个人名片

2022-11-10 11:17:04 +08:00

config.gradle

zb端多人Pk合流完成，Pk结束完成

2022-12-08 17:29:29 +08:00

dependencies.gradle

Merge branch 'dev_Memory' into dev_test

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

gradle.properties

androidx版本首次提交

2022-07-18 15:31:45 +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

Merge branch 'master' into dev_20221020

2022-10-20 11:17:52 +08:00

Description

No description provided

455 MiB

Languages

Java 97.1%

Kotlin 2.9%