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	提交主播投票功能	2023-05-17 15:12:51 +08:00
color	androidx版本首次提交	2022-07-18 15:31:45 +08:00
drawable	對接開通接口神龍送財的im消息	2024-03-13 11:18:26 +08:00
layout	Merge branch 'master' into 声网升级	2024-05-22 13:37:33 +08:00
mipmap-b+en+us	修改中英文	2023-10-14 17:05:14 +08:00
mipmap-hdpi	6.5.4礼物冠名	2023-08-02 13:23:37 +08:00
mipmap-mdpi	修改测试问题,新增直播列表页面的神龙送财的图标	2024-03-20 15:19:53 +08:00
mipmap-xhdpi	對接開通接口神龍送財的im消息	2024-03-13 11:18:26 +08:00
mipmap-xxxhdpi	修改守护问题，添加全服通知功能	2024-04-03 16:05:53 +08:00
values	update 6.5.5	2023-08-24 14:26:38 +08:00
values-en	修改测试问题	2023-11-14 16:05:43 +08:00
background_fff.xml	androidx版本首次提交	2022-07-18 15:31:45 +08:00