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
..
anim	act进入退出动画	2022-11-22 18:15:25 +08:00
color	androidx版本首次提交	2022-07-18 15:31:45 +08:00
drawable	直播间闪烁问题	2022-11-30 17:37:20 +08:00
layout	update 随机PK拒绝对话框	2022-12-08 11:34:31 +08:00
mipmap-hdpi	改版主播工具栏界面	2022-09-15 16:00:50 +08:00
mipmap-mdpi	新增开屏图	2022-12-01 16:58:05 +08:00
mipmap-xxhdpi	Merge branch 'master' into dev_random_pk	2022-12-05 17:46:57 +08:00
values	Merge branch 'dev_random_pk'	2022-12-09 09:30:17 +08:00
values-en	新增多人连麦主播端	2022-11-23 14:14:02 +08:00
xml	androidx版本首次提交	2022-07-18 15:31:45 +08:00