|
|
862ec98fa3
|
Merge remote-tracking branch 'origin/master'
|
2022-12-14 18:12:10 +08:00 |
|
|
|
b827f7bfa6
|
修复主播可以自己点整蛊拯救的问题
调整整蛊设置
|
2022-12-14 18:11:41 +08:00 |
|
18401019693
|
786dfb54a3
|
Merge remote-tracking branch 'origin/master'
|
2022-12-14 18:10:34 +08:00 |
|
18401019693
|
a373738d70
|
修复：修复直播间滚动Loading问题
|
2022-12-14 18:10:21 +08:00 |
|
|
|
6929276512
|
移除DEBUG位置
|
2022-12-14 17:40:52 +08:00 |
|
|
|
64c33f5709
|
调整整蛊的UI位置
|
2022-12-14 17:33:22 +08:00 |
|
|
|
7330e1ae2b
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# config.gradle
|
2022-12-14 17:32:42 +08:00 |
|
|
|
f359c9994d
|
修复PK过程中可以再次打开PK对话框的问题
|
2022-12-14 17:25:03 +08:00 |
|
|
|
d49b60a1e1
|
修复直播间不显示靓号问题
|
2022-12-14 17:13:25 +08:00 |
|
18401019693
|
ee2cebdc41
|
修复：修复主播关播数据不展示问题
|
2022-12-14 17:08:09 +08:00 |
|
|
|
1407ecc2f2
|
修复随机PK天梯赛不出现的问题
|
2022-12-14 16:45:43 +08:00 |
|
18401019693
|
606fc64262
|
修复：修改主播播放时长位置
|
2022-12-14 16:31:43 +08:00 |
|
|
|
a5516ebfb3
|
移除一处debug位置
|
2022-12-14 15:35:20 +08:00 |
|
|
|
dd7214a945
|
Merge remote-tracking branch 'origin/master'
|
2022-12-14 14:44:06 +08:00 |
|
|
|
a20571e050
|
修复一处Glide的Contexts可能为空的问题
|
2022-12-14 14:43:28 +08:00 |
|
|
|
8f7adb3079
|
修复禁言IM消息过来时，uid可能为空的问题
|
2022-12-14 14:36:28 +08:00 |
|
|
|
adcf005e62
|
修复MainActivity初始化initTXIM时，登录信息失效导致getUid为空的问题
|
2022-12-14 14:18:25 +08:00 |
|
18401019693
|
8cff0195ad
|
修复：观看直播时，在直播间内主播Pk不展示对方主播头像问题
|
2022-12-14 14:08:38 +08:00 |
|
|
|
98940d7554
|
修复聊天室添加粉丝徽章，bitmap被回收的问题
|
2022-12-14 13:57:46 +08:00 |
|
|
|
4a8c29365c
|
修复CrashSaveBean的activities数组可能为空的问题
|
2022-12-14 13:44:22 +08:00 |
|
|
|
b641a65117
|
修复IMLoginManager的userInfo可能为空的问题
|
2022-12-14 13:42:36 +08:00 |
|
18401019693
|
d747407d6b
|
修复单人PK坐席头像展示问题
|
2022-12-14 13:08:03 +08:00 |
|
|
|
f302155912
|
update Pk补充注释
|
2022-12-14 11:37:00 +08:00 |
|
18401019693
|
3d60814538
|
修复单人PK坐席头像展示问题
|
2022-12-14 11:02:46 +08:00 |
|
|
|
1293368d59
|
fix:移除主播端飘屏弹幕选项
|
2022-12-13 18:11:57 +08:00 |
|
18401019693
|
d1e1f5f4e8
|
修复：上下滑动直播间，Pk头像展示在不PK得房间的情况
|
2022-12-13 16:56:06 +08:00 |
|
18401019693
|
b804c20ba0
|
修复：单人PK，PK条主播端和用户端展示问题
|
2022-12-13 16:23:13 +08:00 |
|
|
|
e030db04b9
|
fix:移除toast
|
2022-12-13 16:21:57 +08:00 |
|
|
|
0fcadde670
|
fix:修复天梯赛连胜标识通过PK-小头像-主页-跳转方式换房间不会被清空的问题
|
2022-12-13 16:00:17 +08:00 |
|
|
|
e522d04ead
|
fix:修复开播后没有排位赛图标的问题
|
2022-12-13 14:35:51 +08:00 |
|
18401019693
|
ce0061e86e
|
修复：我的页面我的等修改只想新页面，优化：修改加入直播间报错
|
2022-12-13 14:30:21 +08:00 |
|
|
|
7ed4043a1f
|
Merge remote-tracking branch 'origin/master'
|
2022-12-13 13:38:22 +08:00 |
|
18401019693
|
0b97d7bbaf
|
修复：多人Pk结束动画问题
|
2022-12-13 13:30:50 +08:00 |
|
|
|
5317f6d88f
|
fix:修复首页ViewPager.setCurrentItem(int)为null导致的闪退问题
|
2022-12-13 13:23:00 +08:00 |
|
|
|
092b2ac519
|
udpate 移除隨機PK測試用代碼
|
2022-12-13 11:29:32 +08:00 |
|
|
|
c9725875b3
|
fix:整蠱添加禮物新增一些限制提示
|
2022-12-13 11:24:31 +08:00 |
|
|
|
6c33ac15f8
|
fix:修复主播开播返回不会弹出确认框
fix：修复主播点离开后，主播端没有离开遮罩图
|
2022-12-13 10:28:11 +08:00 |
|
|
|
af91783b9f
|
Merge remote-tracking branch 'origin/master'
|
2022-12-12 18:30:48 +08:00 |
|
|
|
5755aa5232
|
update 多人PK也用新UI
|
2022-12-12 18:30:20 +08:00 |
|
|
|
ddc246e11c
|
update 多人PK也用新UI
|
2022-12-12 18:18:36 +08:00 |
|
18401019693
|
869ad9adf7
|
修复：多人Pk结束动画问题
|
2022-12-12 18:16:53 +08:00 |
|
|
|
5356d91fef
|
update 多人PK也用新UI
|
2022-12-12 17:45:15 +08:00 |
|
18401019693
|
f024283e80
|
修复：人Pk状态展示不正常
|
2022-12-12 17:00:51 +08:00 |
|
|
|
49167f332d
|
update 隨機/自由PK
|
2022-12-12 16:30:32 +08:00 |
|
|
|
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 |
|
