Commit Graph

469 Commits

Author SHA1 Message Date
04f0953cfa 美颜补充对比键功能 2022-09-23 10:43:34 +08:00
7033f5e707 修复一处空指针错误
提交图片优化版本:直播间滑动3分钟,内存占用:3G → 1.5G
2022-09-22 16:33:03 +08:00
7f423a9ae2 Merge branch 'master' into dev_test 2022-09-22 15:27:41 +08:00
a9302d3e54 移除FaceUnity的日志输出 2022-09-22 15:25:48 +08:00
18142669586
f52e10b96f 谷歌敏感权限和新的更新包逻辑 2022-09-22 15:21:15 +08:00
ff7bfc040d Merge branch 'dev_Memory' into dev_test
# Conflicts:
#	app/src/main/java/com/shayu/phonelive/AppContext.java
#	common/src/main/java/com/yunbao/common/glide/ImgLoader.java
#	dependencies.gradle
#	live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java
#	live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
#	main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java
#	main/src/main/java/com/yunbao/main/adapter/MainListAdapter.java
2022-09-22 14:43:57 +08:00
24e07db6e1 修复一处设置密码房时的闪退问题 2022-09-22 14:23:31 +08:00
fa12ce88d7 update 2022-09-22 13:57:15 +08:00
e749e1a7d5 Merge remote-tracking branch 'origin/master' 2022-09-22 13:50:54 +08:00
c0d0fed83a 解决冲突 2022-09-22 13:50:46 +08:00
18401019693
aaa453c903 推荐加跳转直播间 2022-09-22 13:41:14 +08:00
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
1e98de9931 补充注释及移除部分未用到代码 2022-09-22 13:35:45 +08:00
18401019693
ab2991a999 网页标题兼容,周星榜图片样式裁剪,推荐卡加标签 2022-09-22 13:30:24 +08:00
d2bb4e4375 update 2022-09-22 13:02:53 +08:00
18401019693
6bc3019b02 指导员背景文字改动 2022-09-22 10:39:34 +08:00
80c5609bb7 update 2022-09-22 00:02:45 +08:00
e29ecd2845 update 2022-09-21 18:31:07 +08:00
18401019693
82ccf66d80 超皇字体颜色 2022-09-21 18:02:40 +08:00
18401019693
f8826d0239 网页标题整改 2022-09-21 16:28:00 +08:00
18401019693
362dff002f 隱身榜單修改 2022-09-21 15:08:56 +08:00
18401019693
a5826b2dc3 新增h5功能全服喇叭修改 2022-09-21 14:55:24 +08:00
18401019693
83aed0bedb 新增h5功能 2022-09-21 14:13:59 +08:00
bdaa51dbb6 update ui 2022-09-20 22:21:38 +08:00
02206dc289 完成美颜UI 90% 2022-09-20 18:30:17 +08:00
d1d31da6be 完成美颜UI 90% 2022-09-20 18:29:05 +08:00
18401019693
d77721a0bc 修改問題 2022-09-20 15:07:05 +08:00
18401019693
567e403151 修改問題 2022-09-20 14:55:32 +08:00
18401019693
1cdf065839 心愿单背景去除 2022-09-20 10:57:28 +08:00
18401019693
a555019561 直播间开通贵族结束 2022-09-19 18:20:29 +08:00
18401019693
86735ab81f 直播间开通贵族结束 2022-09-19 17:59:15 +08:00
18401019693
1935ac14f0 直播间开通贵族结束 2022-09-19 17:07:59 +08:00
18401019693
f531fd4d0e 隐身榜单的更改 2022-09-19 16:22:57 +08:00
c634d29e79 补充美颜模型和美颜配置 2022-09-19 15:43:06 +08:00
18401019693
0de802bf3c 贵族开通的动画横幅 2022-09-19 15:35:37 +08:00
18142669586
8b4d25bbeb Merge remote-tracking branch 'origin/master' 2022-09-19 13:52:22 +08:00
18142669586
8c75b80535 谷歌敏感权限 2022-09-19 13:51:59 +08:00
18401019693
6fef3ee243 直播间推荐气泡文字 2022-09-19 13:43:18 +08:00
8ef917ebb6 补充美颜模型和美颜配置 2022-09-17 18:21:53 +08:00
333e4fc1e6 新接入FaceUnity美颜SDK 2022-09-17 16:54:58 +08:00
18401019693
c95fd2d49c 直播间聊天列表展示不全问题修复 2022-09-17 14:33:55 +08:00
18401019693
fc0c734261 直播间贡献榜添加隐身 2022-09-16 18:03:33 +08:00
18401019693
0cafd76035 首页贡献榜添加隐身 2022-09-16 17:27:41 +08:00
18401019693
bebf19215e 首页贡献榜添加隐身 2022-09-16 17:04:45 +08:00
18142669586
5e581dd65e Merge remote-tracking branch 'origin/master' 2022-09-16 14:21:50 +08:00
18142669586
3225cf5d5f 首页皇帝推荐边框 2022-09-16 14:21:21 +08:00
18401019693
1c16a673fd 直播间开通贵族 2022-09-16 11:03:46 +08:00
18401019693
bf9d573727 直播间开通贵族 2022-09-16 11:02:54 +08:00
882c5ff95c 主播直播中点击小时榜不跳转 2022-09-15 18:30:54 +08:00
c6770c1d51 Merge remote-tracking branch 'origin/master' 2022-09-15 16:11:28 +08:00