18401019693 08bc6d554a Merge remote-tracking branch 'origin/dev_red_packet' ... # Conflicts: # common/src/main/java/com/yunbao/common/http/PDLiveApi.java # common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java # common/src/main/res/values/strings.xml		2023-07-03 17:57:35 +08:00
..
anim	act进入退出动画	2022-11-22 18:15:25 +08:00
color	androidx版本首次提交	2022-07-18 15:31:45 +08:00
drawable	Merge branch 'master' into dev_proguard	2023-06-05 16:42:18 +08:00
layout	add 新增红包专区	2023-06-28 16:44:42 +08:00
mipmap-hdpi	改版主播工具栏界面	2022-09-15 16:00:50 +08:00
mipmap-mdpi	add 新增红包专区	2023-06-28 16:44:42 +08:00
mipmap-xxhdpi	add 新增红包专区	2023-06-28 16:44:42 +08:00
values	Merge remote-tracking branch 'origin/dev_red_packet'	2023-07-03 17:57:35 +08:00
values-en-rUS	add 新增红包专区	2023-06-28 16:44:42 +08:00
values-zh	add 新增红包专区	2023-06-28 16:44:42 +08:00
values-zh-rHK	add 新增红包专区	2023-06-28 16:44:42 +08:00
values-zh-rTW	add 新增红包专区	2023-06-28 16:44:42 +08:00
xml	androidx版本首次提交	2022-07-18 15:31:45 +08:00