Commit Graph

4 Commits

Author SHA1 Message Date
0b0967f84d Merge branch 'dev_FaceUnity'
# Conflicts:
#	live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
#	live/src/main/res/layout/view_live_room.xml
2022-09-22 13:41:13 +08:00
18142669586
8c75b80535 谷歌敏感权限 2022-09-19 13:51:59 +08:00
333e4fc1e6 新接入FaceUnity美颜SDK 2022-09-17 16:54:58 +08:00
18401019693
1791a114e3 androidx版本首次提交 2022-07-18 15:31:45 +08:00