Martin cbf517bed6 Merge branch 'master' into 声网升级 ... # Conflicts: # common/src/main/java/com/yunbao/common/event/SendBlindGiftEvent.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/utils/DialogUitl.java # common/src/main/java/com/yunbao/common/utils/RouteUtil.java # live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java # live/src/main/java/com/yunbao/live/socket/SocketRyLinkMicPkUtil.java # main/src/main/java/com/yunbao/main/dialog/MainStartDialogFragment.java		2024-05-22 13:37:33 +08:00
..
anim	act进入退出动画	2022-11-22 18:15:25 +08:00
color	androidx版本首次提交	2022-07-18 15:31:45 +08:00
drawable	ui修改	2024-03-26 15:03:08 +08:00
layout	Merge branch 'master' into 声网升级	2024-05-22 13:37:33 +08:00
mipmap-b+en+us	语音房bug修改	2024-01-12 15:16:40 +08:00
mipmap-hdpi	短剧	2023-11-30 14:37:16 +08:00
mipmap-mdpi	守护弹窗	2024-03-04 14:51:07 +08:00
mipmap-xxhdpi	添加短剧签到	2024-04-07 09:40:32 +08:00
mipmap-xxxhdpi	修改 测试问题	2023-12-05 09:27:47 +08:00
values	Merge branch 'master' into 声网升级	2024-05-22 13:37:33 +08:00
values-en-rUS	修复测试反馈问题	2024-05-05 16:13:28 +08:00
values-zh	Merge branch 'master' into 声网升级	2024-05-22 13:37:33 +08:00
values-zh-rHK	Merge branch 'master' into 声网升级	2024-05-22 13:37:33 +08:00
values-zh-rTW	Merge branch 'master' into 声网升级	2024-05-22 13:37:33 +08:00
xml	androidx版本首次提交	2022-07-18 15:31:45 +08:00