|
|
ea69f4bcb7
|
Merge remote-tracking branch 'origin/master'
|
2022-12-12 15:14:15 +08:00 |
|
18401019693
|
eaf973b927
|
修复单人PK胜利状态展示不对问题
|
2022-12-12 15:02:59 +08:00 |
|
|
|
fdbf5aee04
|
Merge branch 'dev_prank'
# Conflicts:
# common/src/main/java/com/yunbao/common/http/PDLiveApi.java
# common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
|
2022-12-12 14:14:06 +08:00 |
|
|
|
e4c490577d
|
update 整蛊
|
2022-12-12 14:11:05 +08:00 |
|
18401019693
|
b5247df69b
|
完成全服通知功能
|
2022-12-12 14:10:09 +08:00 |
|
|
|
d39ee17cc4
|
update 整蛊
|
2022-12-12 13:45:41 +08:00 |
|
|
|
07da7acacd
|
update 整蛊
|
2022-12-10 18:28:40 +08:00 |
|
18401019693
|
9d69610713
|
修复：pk一次后，重新发起pk报50002错误
|
2022-12-10 17:39:11 +08:00 |
|
18401019693
|
32969a58db
|
修复：单人pk时间结束后，用户端由半屏自动变全屏
|
2022-12-10 17:38:33 +08:00 |
|
|
|
b188613035
|
Merge branch 'dev_random_pk'
|
2022-12-10 17:30:48 +08:00 |
|
|
|
308d5acc21
|
update 整蛊
|
2022-12-10 17:30:11 +08:00 |
|
18401019693
|
284b9784d6
|
多人Pk功能撤回
|
2022-12-10 16:20:13 +08:00 |
|
|
|
26f02065df
|
update 随机PK 新增请求连麦超时管理
|
2022-12-10 16:08:04 +08:00 |
|
|
|
62c3cdcb30
|
update 随机PK 修复对方主播正在PK时不会继续调用next接口
|
2022-12-10 14:59:51 +08:00 |
|
|
|
01c657fdcb
|
update 随机PK 修复对方主播正在PK时不会继续调用next接口
|
2022-12-10 14:59:21 +08:00 |
|
|
|
3a75e24601
|
update 随机PK 补充拒绝PK后的对话框
|
2022-12-10 14:58:50 +08:00 |
|
|
|
bfe8034b24
|
update 自由PK 注释
|
2022-12-10 14:55:21 +08:00 |
|
|
|
c056dfe246
|
update 自由PK
|
2022-12-10 14:55:03 +08:00 |
|
|
|
a7cf09de1e
|
update 自由PK
|
2022-12-10 14:51:49 +08:00 |
|
|
|
7c4c22d69e
|
优化随机PK前先检测是否开启了连麦功能
|
2022-12-10 14:48:35 +08:00 |
|
|
|
3747f214b1
|
*新增长按随机PK【开始匹配】按钮可输入指定UIDPk的测试模式
|
2022-12-10 14:47:37 +08:00 |
|
18401019693
|
503fb0d7f1
|
单人Pk问题主播端修复修复
|
2022-12-10 14:47:29 +08:00 |
|
|
|
ae8c6cc23d
|
update 单人PK 恢复PK计时不动的问题
|
2022-12-10 11:12:58 +08:00 |
|
|
|
ad028c69d0
|
update 自由PK 次数用完了提示用户
update 自由PK 调整UI
|
2022-12-09 17:51:15 +08:00 |
|
|
|
03b3398bce
|
update 随机PK 修复对方主播正在PK时不会继续调用next接口
|
2022-12-09 17:35:39 +08:00 |
|
|
|
4a84283000
|
update 随机PK 调整拒绝PK回报服务器的时机
|
2022-12-09 17:19:50 +08:00 |
|
|
|
c49c560e8d
|
update 随机PK 补充拒绝PK后的对话框
|
2022-12-09 17:08:12 +08:00 |
|
|
|
a1d9b1f75b
|
update 自由PK 注释
|
2022-12-09 16:47:00 +08:00 |
|
18401019693
|
afed0c8833
|
修改用户端多人PK视频顺序
|
2022-12-09 16:40:42 +08:00 |
|
|
|
415ed2fc9b
|
update 自由PK
|
2022-12-09 16:39:41 +08:00 |
|
|
|
8e45e17768
|
update 自由PK
|
2022-12-09 14:13:47 +08:00 |
|
18401019693
|
576a30d1be
|
修改多人PK主播名称大小
|
2022-12-09 14:01:46 +08:00 |
|
18401019693
|
e380c8dcbc
|
yh端多人Pk合流完成，Pk结束完成
|
2022-12-09 13:48:10 +08:00 |
|
|
|
5e9f23286e
|
优化随机PK前先检测是否开启了连麦功能
|
2022-12-09 10:15:20 +08:00 |
|
|
|
1bbc78fb32
|
*新增长按随机PK【开始匹配】按钮可输入指定UIDPk的测试模式
|
2022-12-09 09:50:47 +08:00 |
|
|
|
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 |
|
|
|
4ad75a11a8
|
update 随机PK
|
2022-12-08 18:14:13 +08:00 |
|
|
|
3fa259c5b9
|
优化：调整天梯赛左右下角连胜字样大小
update 随机PK
|
2022-12-08 17:45:21 +08:00 |
|
18401019693
|
4cd4939c58
|
zb端多人Pk合流完成，Pk结束完成
|
2022-12-08 17:29:29 +08:00 |
|
|
|
b20141de02
|
update 整蛊
|
2022-12-08 14:42:33 +08:00 |
|
|
|
9eff246f06
|
update 随机PK&自由PK
|
2022-12-08 13:32:26 +08:00 |
|
|
|
285a33ff9a
|
update 随机PK拒绝对话框
|
2022-12-08 11:34:31 +08:00 |
|
18401019693
|
7ebd935eba
|
多人Pk开播
|
2022-12-07 17:59:10 +08:00 |
|
|
|
f62a093092
|
update 自由PK
|
2022-12-07 16:10:22 +08:00 |
|
|
|
28b4a36800
|
完成随机PK模块
|
2022-12-07 15:36:23 +08:00 |
|
|
|
ec59fce097
|
修复新人特惠弹窗高度为1的问题
|
2022-12-06 17:53:17 +08:00 |
|
|
|
e134ef8d54
|
update 随机PK
|
2022-12-06 17:40:44 +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 |
|
|
|
98122c25d8
|
优化LiveUserMoreDialogFragment.activity强引用导致的内存泄漏
|
2022-12-05 17:41:42 +08:00 |
|
|
|
84c89d7530
|
优化观众LiveRoomViewHolder强引用Context导致的内存泄漏
|
2022-12-05 17:41:42 +08:00 |
|
