zlzw f15c609f1c Merge branch 'master' into dev_6.5.5_语聊 ...

# Conflicts:
#	Share/src/main/java/com/yunbao/share/ui/InvitePopDialog.java
#	Share/src/main/java/com/yunbao/share/ui/SharePopDialog.java
#	app/proguard-rules.pro
#	app/src/main/AndroidManifest.xml
#	build.gradle
#	common/build.gradle
#	common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java
#	common/src/main/java/com/yunbao/common/utils/ToastUtil.java
#	common/src/main/java/com/yunbao/common/utils/WordUtil.java
#	config.gradle

2023-11-09 15:20:39 +08:00

app

Merge branch 'master' into dev_6.5.5_语聊

2023-11-09 15:20:39 +08:00

baidu

androidx版本首次提交

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

beauty

多语言切换

2023-04-18 10:30:55 +08:00

callkit

修复测试反馈问题

2023-11-07 18:29:37 +08:00

common

Merge branch 'master' into dev_6.5.5_语聊

2023-11-09 15:20:39 +08:00

FaceUnity

更新美颜中英文繁体

2023-08-24 13:34:08 +08:00

gradle/wrapper

个人页面

2023-10-07 14:11:12 +08:00

lib_country_code

修复部分机型开播异常问题

2023-07-04 13:03:19 +08:00

libs

启动页 登录注册 个人页面

2023-10-07 09:55:17 +08:00

live

Merge branch 'master' into dev_6.5.5_语聊

2023-11-09 15:20:39 +08:00

main

Merge branch 'master' into dev_6.5.5_语聊

2023-11-09 15:20:39 +08:00

OneToOne

1.0封存版本

2023-11-09 14:47:14 +08:00

pluginsForAnchor

新增插件模块管理

2023-06-14 13:41:12 +08:00

Share

Merge branch 'master' into dev_6.5.5_语聊

2023-11-09 15:20:39 +08:00

TabLayout

初始化1v1语聊项目

2023-09-27 14:37:28 +08:00

video

修改中英文

2023-10-12 16:19:27 +08:00

ViewPager2Delegate

初始化1v1语聊项目

2023-09-27 14:37:28 +08:00

.gitignore

androidx版本首次提交

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

build.gradle

Merge branch 'master' into dev_6.5.5_语聊

2023-11-09 15:20:39 +08:00

config.gradle

Merge branch 'master' into dev_6.5.5_语聊

2023-11-09 15:20:39 +08:00

dependencies.gradle

Merge branch 'dev_Memory' into dev_test

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

gradle.properties

修复测试反馈问题

2023-10-28 18:13:23 +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

同步ios接听界面

2023-11-06 18:24:57 +08:00

Description

No description provided

455 MiB

Languages

Java 97.1%

Kotlin 2.9%