Commit Graph

222 Commits

Author SHA1 Message Date
b56368412c Merge branch 'dev_random_pk'
# Conflicts:
#	common/src/main/res/values/strings.xml
#	config.gradle
#	live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
#	live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
#	live/src/main/java/com/yunbao/live/socket/SocketRyClient.java
2022-12-09 09:30:17 +08:00
285a33ff9a update 随机PK拒绝对话框 2022-12-08 11:34:31 +08:00
18401019693
7ebd935eba 多人Pk开播 2022-12-07 17:59:10 +08:00
9ead9a6fb8 Merge branch 'master' into dev_random_pk
# Conflicts:
#	live/src/main/res/values/strings.xml
2022-12-05 17:46:57 +08:00
8b4f88c766 新增开屏图 2022-12-01 16:58:05 +08:00
18142669586
f43ccea32a 版本更新問題 2022-12-01 16:15:16 +08:00
18401019693
80a1508dfc 修复手机开播Pk界面问题,直播间聊天滚动至底部优化 2022-12-01 13:34:25 +08:00
18401019693
70b05b85d7 直播间闪烁问题 2022-11-30 17:37:20 +08:00
18401019693
cf4948a3e2 悬浮窗视频调整,主播离开下滑直播间离开画面不消失问题修复 2022-11-29 14:34:23 +08:00
18401019693
3bdee09402 合并接口第五次次上传 2022-11-26 16:12:22 +08:00
6bd29ec63e 调整在线列表-守护-空列表时的图片显示 2022-11-25 14:55:56 +08:00
47b9487e13 调整连麦主播邀请用户时,用户的弹框样式 2022-11-24 17:08:38 +08:00
08906e028a 修复三按键导航模式下,首页Banner进去可能网页底部显示不全的问题 2022-11-23 17:41:34 +08:00
3d117dbcb4 Merge remote-tracking branch 'origin/master' 2022-11-23 14:14:34 +08:00
202aedbcf3 新增多人连麦主播端 2022-11-23 14:14:02 +08:00
18401019693
011322dd8e 贵族开通全服通知 2022-11-23 13:42:55 +08:00
18401019693
0d219e4b6d act进入退出动画 2022-11-22 18:15:25 +08:00
4a637d0a69 创建随机PK分支 2022-11-21 15:39:12 +08:00
4a28abf5b7 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	main/src/main/java/com/yunbao/main/activity/MainActivity.java
2022-11-18 15:30:42 +08:00
18401019693
e8f13d7590 测试更改 2022-11-18 15:18:50 +08:00
7eb3e567f6 调整个人卡片UI 2022-11-18 15:14:32 +08:00
86b7ad6d92 修复通知栏布局显示不全的问题 2022-11-17 17:54:31 +08:00
62ed0ae78e 调整天梯赛大小 2022-11-17 17:12:41 +08:00
18401019693
1d50f8e4f5 侧边栏修改,直播关播页面BUg修改 2022-11-16 17:22:34 +08:00
749ac197de 新增PK TOP 2022-11-15 11:35:03 +08:00
d20210f291 创建PK排位赛分支 2022-11-15 09:53:15 +08:00
18401019693
da3398f1f9 侧边栏修改 2022-11-14 16:54:42 +08:00
37dfa05a25 调整靓号icon 2022-11-14 13:57:28 +08:00
18401019693
7fe7178b27 小菜单的展开 2022-11-11 11:38:46 +08:00
18401019693
9dcc23960e 小菜单的展开 2022-11-11 09:53:10 +08:00
18401019693
140e5740e6 任务 2022-11-10 17:04:06 +08:00
18401019693
d13e42e33d 猜你喜欢 2022-11-10 13:48:08 +08:00
44a05ea0d5 调整个人名片 2022-11-10 11:17:04 +08:00
18401019693
0b6c188e0a 侧边栏:侧边栏界面完成,文字消息更改 2022-11-09 18:27:41 +08:00
18401019693
f74a01efc0 侧边栏:权益 2022-11-09 17:02:02 +08:00
18401019693
60453c756c 侧边栏:趣味游戏 2022-11-09 16:04:48 +08:00
18401019693
350f17915a 侧边栏:任务中心 2022-11-09 15:26:59 +08:00
18401019693
5e55a5b94c 侧边栏:充值送好礼 2022-11-09 14:02:39 +08:00
1fc417ec25 Merge branch 'dev_userCard'
# Conflicts:
#	main/src/main/java/com/yunbao/main/activity/MainActivity.java
2022-11-09 11:01:45 +08:00
18401019693
ef4c377990 侧边栏 2022-11-09 09:47:04 +08:00
96f21643b4 update 2022-11-08 13:53:24 +08:00
34dd3ca883 update 2022-11-08 13:17:35 +08:00
ab953b4785 update 2022-11-07 16:48:16 +08:00
18401019693
6656aebff9 悬浮窗和开播离开 2022-11-04 14:58:40 +08:00
18401019693
1075f7252a 修改主题颜色 2022-11-03 14:45:51 +08:00
a2de293e10 update 2022-11-01 18:18:58 +08:00
18401019693
2e2e5c7ec0 测试修改 2022-10-27 15:20:46 +08:00
18401019693
8b180ce664 测试修改 2022-10-27 14:48:07 +08:00
18401019693
2891c3bf14 直播间UI调整,修改悬浮 2022-10-27 10:36:25 +08:00
38d2e0df57 新增直播间轮播Banner
调整身份特权弹窗
2022-10-26 16:34:53 +08:00
18401019693
787d50c5b4 直播间UI调整,修改悬浮 2022-10-26 15:28:03 +08:00
c83db0ec77 新增幸运女神通知 2022-10-26 11:33:32 +08:00
18401019693
1ce5ac2c5f 语音转文字 2022-10-25 15:29:21 +08:00
18401019693
7e00a5e71e 语音转文字 2022-10-25 14:41:08 +08:00
18401019693
7fabc4f1b6 语音转文字 2022-10-24 18:18:39 +08:00
18401019693
ab6e578336 删除不必要文件,修改设置页面 2022-10-24 10:58:56 +08:00
18401019693
60a132489a 悬浮窗修改 2022-10-22 16:27:12 +08:00
3be5f8b0cd Merge remote-tracking branch 'origin/master' 2022-10-22 14:50:18 +08:00
be0f81e059 Merge branch 'dev_20221020' 2022-10-22 14:48:25 +08:00
18401019693
099cc0d83d 讯飞sdk替换,页面修改 2022-10-22 14:43:01 +08:00
18401019693
c2d2687441 设定页面修改 2022-10-22 10:04:05 +08:00
18401019693
5f27031620 设置页面修改 2022-10-21 18:28:50 +08:00
18401019693
f25f61b78c 语音听写 2022-10-20 17:49:04 +08:00
461a23a790 Merge branch 'master' into dev_20221020 2022-10-20 17:40:57 +08:00
18401019693
845be4d795 按需求修改 2022-10-20 15:10:18 +08:00
4330ee9d57 Merge branch 'master' into dev_20221020 2022-10-20 11:30:05 +08:00
18401019693
ad785f2b39 修改悬浮窗样式,添加悬浮设置 2022-10-20 11:29:37 +08:00
1501858a7d Merge branch 'master' into dev_20221020 2022-10-20 11:23:53 +08:00
18401019693
a49db975b1 修改悬浮窗样式,添加悬浮设置 2022-10-20 11:22:31 +08:00
79aadad668 Merge branch 'master' into dev_20221020
# Conflicts:
#	settings.gradle
2022-10-20 11:17:52 +08:00
ca03a8f23e 排除美颜so
压缩图片资源
2022-10-20 10:49:08 +08:00
18401019693
4b5f3a9560 修改悬浮窗样式,添加悬浮设置 2022-10-20 10:48:58 +08:00
18401019693
b9977a3d90 星级挑战成功 2022-10-12 16:34:54 +08:00
99308f5ac5 Merge remote-tracking branch 'origin/master' 2022-10-12 16:05:42 +08:00
d86e68060c 调整礼物UI
新增新人签到弹框
2022-10-12 16:05:33 +08:00
18401019693
9212ed34cc 星级挑战成功 2022-10-12 14:44:21 +08:00
18401019693
88107b7ab5 星级挑战成功 2022-10-12 11:52:45 +08:00
18401019693
5b4912815a 机器人Im消息 2022-10-12 10:05:30 +08:00
18401019693
ce7433226d 星级挑战 2022-10-10 17:22:04 +08:00
18401019693
5f9e27aa8a @消息逻辑补充 2022-10-10 13:38:51 +08:00
bc553a1b1d Merge remote-tracking branch 'origin/master'
# Conflicts:
#	common/src/main/res/values/strings.xml
2022-10-08 11:10:12 +08:00
18401019693
80655a8662 @消息界面 2022-10-08 10:01:58 +08:00
2f97839619 优化视觉:第三方登录点击后弹出loading
更新svga库
2022-10-06 17:34:45 +08:00
18401019693
72dd63355e 直播间滑动设置 2022-10-06 13:06:46 +08:00
18401019693
b7129bcbfa TOKEN失效 2022-09-29 16:26:10 +08:00
05c490672d 修复主播直播节目周星榜和心愿单无法点击的问题 2022-09-28 15:08:50 +08:00
c45cc7a990 取消Banner和开盘图片的裁切
修复主播直播间合集名字、图标错误
调整直播准备间文案
调整直播准备心愿单列表
调整直播间遮罩
调整进场动画svga动画
修复观众及个人中心头像svga闪烁和消失问题
2022-09-28 14:08:05 +08:00
18401019693
8d98c6b5cc google支付修改 2022-09-28 13:43:53 +08:00
18142669586
cadbf53086 Merge remote-tracking branch 'origin/master' 2022-09-27 14:53:40 +08:00
18142669586
2490c6bdd1 1 2022-09-27 14:53:01 +08:00
ec730e850a 恢复momo美颜
调整进场svga动画填充类型
2022-09-26 17:18:07 +08:00
59256c9cf7 隐藏主播连麦入口 2022-09-26 15:15:41 +08:00
18142669586
f52e10b96f 谷歌敏感权限和新的更新包逻辑 2022-09-22 15:21:15 +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
18401019693
a5826b2dc3 新增h5功能全服喇叭修改 2022-09-21 14:55:24 +08:00
bdaa51dbb6 update ui 2022-09-20 22:21:38 +08:00
18401019693
86735ab81f 直播间开通贵族结束 2022-09-19 17:59:15 +08:00
18401019693
f531fd4d0e 隐身榜单的更改 2022-09-19 16:22:57 +08:00
18401019693
6fef3ee243 直播间推荐气泡文字 2022-09-19 13:43:18 +08:00
18401019693
bebf19215e 首页贡献榜添加隐身 2022-09-16 17:04:45 +08:00