Martin
|
1a2db91ceb
|
Merge branch 'master' into dev_6.7.0
|
2024-06-17 10:55:47 +08:00 |
|
Martin
|
9fa4924278
|
add[修復BUG]
|
2024-06-16 16:26:01 +08:00 |
|
Martin
|
3318fa761c
|
add[合併聲網]
|
2024-06-16 13:41:19 +08:00 |
|
|
|
a7421ba1a6
|
修复暂时离开功能无效问题
调整购买守护的动画效果
|
2024-06-16 11:09:10 +08:00 |
|
Martin
|
40a081caa6
|
Merge remote-tracking branch 'origin/dev_6.7.0' into dev_6.7.0
|
2024-06-16 10:48:45 +08:00 |
|
余前卫
|
1485173227
|
6.7.0用户端更新:整蛊图标闪烁
|
2024-06-16 10:45:44 +08:00 |
|
Martin
|
d5b60523a5
|
Merge remote-tracking branch 'origin/master' into dev_6.7.0
# Conflicts:
# app/src/main/AndroidManifest.xml
# app/src/main/java/com/shayu/phonelive/AppContext.java
# common/src/main/java/com/yunbao/common/CommonAppConfig.java
# common/src/main/java/com/yunbao/common/http/PDLiveApi.java
# common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
# common/src/main/java/com/yunbao/common/manager/OpenAdManager.java
# common/src/main/res/values-zh-rHK/strings.xml
# common/src/main/res/values-zh-rTW/strings.xml
# common/src/main/res/values-zh/strings.xml
# common/src/main/res/values/strings.xml
# live/src/main/java/com/yunbao/live/utils/LiveTextRender.java
# live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
# live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java
|
2024-06-16 10:28:31 +08:00 |
|
余前卫
|
309d04653e
|
6.7.0用户端更新:整蛊图标闪烁
|
2024-06-14 18:15:22 +08:00 |
|
Martin
|
45ae3b1624
|
add[轮盘整蛊]
|
2024-06-14 17:39:42 +08:00 |
|
Martin
|
e874c2ee16
|
add[修復BUG，新增整蛊IM消息类型]
|
2024-06-14 15:40:51 +08:00 |
|
余前卫
|
002f0ad654
|
Merge remote-tracking branch 'origin/dev_6.7.0' into dev_6.7.0
|
2024-06-14 14:40:51 +08:00 |
|
余前卫
|
bb49472817
|
6.7.0用户端更新:修复包裹礼物送礼数量不同步问题
|
2024-06-14 11:33:07 +08:00 |
|
Martin
|
05e4ff89d7
|
add[修復BUG，新增開播整蠱IM消息]
|
2024-06-13 18:25:43 +08:00 |
|
余前卫
|
2cf10cc35a
|
6.7.0用户端更新:限制举报描述字数
|
2024-06-13 16:04:58 +08:00 |
|
余前卫
|
4c53c990e9
|
6.7.0用户端更新:限制举报描述字数
|
2024-06-13 15:51:27 +08:00 |
|
余前卫
|
cd8b58a0ec
|
6.7.0用户端更新：更改数据类型
|
2024-06-13 09:55:15 +08:00 |
|
|
|
b41bd3b89b
|
修复:
1：开播闪屏问题
2：游戏房消息重复（或不显示）
3：模拟器或部分机型滑动声网直播间会白屏问题
4：PK条在平板模式下显示太高问题
5：PK没断开能收到其他人邀请的问题
|
2024-06-13 09:47:38 +08:00 |
|
余前卫
|
d66f098692
|
Merge remote-tracking branch 'origin/dev_6.7.0' into dev_6.7.0
|
2024-06-12 16:45:16 +08:00 |
|
Martin
|
f131fcf546
|
add[主播端，整蛊礼物，待完成项完成]
|
2024-06-12 16:44:46 +08:00 |
|
余前卫
|
eeb1cc008a
|
6.7.0用户端更新：修复空指针
|
2024-06-12 16:42:27 +08:00 |
|
|
|
6eba9558e1
|
修复userlist可能为空的问题
|
2024-06-11 17:03:13 +08:00 |
|
Martin
|
0425b56106
|
add[整蛊翻译]
|
2024-06-11 16:55:07 +08:00 |
|
余前卫
|
c5de062171
|
6.7.0用户端更新:屏蔽空数据
|
2024-06-11 14:23:39 +08:00 |
|
余前卫
|
f82dbccaa5
|
6.7.0用户端更新:更改数据类型
|
2024-06-11 14:18:55 +08:00 |
|
|
|
07d6b959d5
|
Merge branch 'master' into 声网升级
# Conflicts:
# config.gradle
# live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
|
2024-06-11 14:16:00 +08:00 |
|
|
|
5ae55f87fa
|
修复声网直播间会白屏问题
调整模块间的引用
|
2024-06-11 14:08:45 +08:00 |
|
余前卫
|
f59e5e527a
|
6.7.0用户端更新
|
2024-06-11 09:40:24 +08:00 |
|
|
|
d70c3a8b27
|
修复游戏房发言重复/不显示问题
修复贵族不显示英文问题
|
2024-06-07 16:53:48 +08:00 |
|
余前卫
|
c20147bf8f
|
Merge branch 'yuqianwei' into dev_6.7.0
# Conflicts:
# live/src/main/res/values/strings.xml
|
2024-06-07 15:46:53 +08:00 |
|
余前卫
|
45743e3070
|
6.7.0用户端更新
|
2024-06-07 15:35:57 +08:00 |
|
余前卫
|
b8b43c1ef2
|
6.7.0用户端更新
|
2024-06-07 15:35:34 +08:00 |
|
|
|
73847c46a3
|
修复游戏房发言重复/不显示问题
修复贵族不显示英文问题
|
2024-06-07 14:50:39 +08:00 |
|
Martin
|
b7c53a3b21
|
add[整蛊礼物接口调用、整蛊说明]
|
2024-06-06 18:29:31 +08:00 |
|
Martin
|
5baea0f156
|
fix[修复-游戏房消息问题]
|
2024-06-05 15:12:35 +08:00 |
|
Martin
|
419e3a7ab5
|
fix[修复BUG]
|
2024-06-05 13:27:22 +08:00 |
|
Martin
|
66822139ba
|
fix[更新弹幕]
|
2024-06-05 09:52:37 +08:00 |
|
Martin
|
5a924d9fea
|
fix[修复BUG]
|
2024-06-05 09:50:57 +08:00 |
|
|
|
cb0772c9e3
|
update 更新弹幕
|
2024-06-05 09:48:22 +08:00 |
|
Martin
|
9c9eb34756
|
fix[修复BUG-主播开麦按钮的字未显示全]
|
2024-06-04 09:50:46 +08:00 |
|
Martin
|
1b57d8bc8f
|
fix[修复BUG]
|
2024-06-03 15:41:29 +08:00 |
|
|
|
edc738d80b
|
修复一堆图标+10字名字聊天框没有图标问题
|
2024-06-03 15:02:03 +08:00 |
|
|
|
b5417f90b4
|
调整弹窗
|
2024-06-03 09:41:51 +08:00 |
|
Martin
|
4bd1e4bc91
|
fix[修复融云直播间，多人PK主播信息问题]
|
2024-06-02 16:57:48 +08:00 |
|
Martin
|
985e626cb5
|
fix[修复融云直播间，上下滑动闪退问题]
|
2024-06-01 17:31:01 +08:00 |
|
Martin
|
efce2ad93c
|
fix[声望升级-设置竖屏]
|
2024-06-01 15:21:23 +08:00 |
|
Martin
|
6132338c6c
|
fix[声望升级-同步弹窗功能]
|
2024-06-01 14:33:27 +08:00 |
|
Martin
|
8c89fc1de1
|
Merge remote-tracking branch 'origin/声网升级' into 声网升级
|
2024-06-01 14:24:19 +08:00 |
|
Martin
|
a061637492
|
fix[声望升级-去掉多人PK，展示主播信息延迟代码]
|
2024-06-01 14:24:10 +08:00 |
|
18142669586
|
680780145c
|
修改多人图标闪
|
2024-06-01 12:07:36 +08:00 |
|
Martin
|
11c9a53028
|
fix[声望升级-修复BUG]
|
2024-06-01 10:16:31 +08:00 |
|
Martin
|
c4d378daba
|
fix[声望升级-修复BUG]
|
2024-05-31 20:59:16 +08:00 |
|
18142669586
|
efa698ebfa
|
1
|
2024-05-31 20:55:09 +08:00 |
|
18142669586
|
6496440e5d
|
修改9发两次
|
2024-05-31 20:00:04 +08:00 |
|
18142669586
|
d3de01666c
|
修改上下滑动黑
|
2024-05-31 19:01:41 +08:00 |
|
|
|
186b9d61ee
|
調整主播端設置整蠱UI
|
2024-05-31 15:06:35 +08:00 |
|
Martin
|
278801b77a
|
fix[声望升级-修复BUG]
|
2024-05-30 18:25:01 +08:00 |
|
|
|
5f3ebb4235
|
修复直播间 用户等级+超皇+粉丝牌+图标+名字（10字）会丢失名字前面图标的问题
|
2024-05-30 15:52:34 +08:00 |
|
|
|
ab24348f72
|
调整弹窗展示逻辑
|
2024-05-30 15:14:52 +08:00 |
|
|
|
022806d9da
|
修复直播间 用户等级+超皇+粉丝牌+图标+名字（10字）会丢失名字前面图标的问题
|
2024-05-30 15:14:00 +08:00 |
|
Martin
|
b0c5d44d1c
|
fix[声望升级-修复BUG]
|
2024-05-30 13:20:40 +08:00 |
|
Martin
|
d9b1149832
|
fix[声望升级-修复BUG]
|
2024-05-29 21:24:05 +08:00 |
|
Martin
|
9711b1f8d4
|
fix[声望升级-修复BUG]
|
2024-05-28 21:28:20 +08:00 |
|
Martin
|
0252963b2e
|
Merge remote-tracking branch 'origin/声网升级' into 声网升级
# Conflicts:
# live/src/main/java/com/yunbao/live/presenter/LiveSwLinkMicPkPresenter.java
|
2024-05-28 17:13:59 +08:00 |
|
Martin
|
ff8e75768e
|
fix[声望升级-修复BUG]
|
2024-05-28 17:12:52 +08:00 |
|
18142669586
|
01dfb81a46
|
点击【邀请】加上防抖的功能
|
2024-05-28 16:58:39 +08:00 |
|
18142669586
|
0afee3543e
|
邀请后不接受倒计时完了在邀请 不显示pk弹出框
|
2024-05-28 15:20:43 +08:00 |
|
18142669586
|
d5f78cc83a
|
修改pk列表按钮错误
|
2024-05-28 14:26:29 +08:00 |
|
Martin
|
cf48be7d15
|
fix[声望升级-修复BUG]
|
2024-05-28 13:44:44 +08:00 |
|
|
|
225929c891
|
新增【全服公告优化】
|
2024-05-27 14:03:20 +08:00 |
|
|
|
bc63a3e601
|
新增【全服公告优化】
|
2024-05-27 13:48:52 +08:00 |
|
|
|
c33975fe67
|
优化首页右下角悬浮层隐藏显示问题
调整直播间购买推荐的UI显示不合设计问题
|
2024-05-24 15:45:06 +08:00 |
|
|
|
c033340aad
|
优化首页右下角悬浮层隐藏显示问题
|
2024-05-24 14:49:14 +08:00 |
|
|
|
24170d55e2
|
调整进入直播间等待时长15→4
|
2024-05-23 12:53:07 +08:00 |
|
Martin
|
26a71ff825
|
fix[声望升级-修复BUG]
|
2024-05-22 18:29:11 +08:00 |
|
Martin
|
b6d0ea1fba
|
fix[声望升级-合并]
|
2024-05-22 13:46:52 +08:00 |
|
Martin
|
cbf517bed6
|
Merge branch 'master' into 声网升级
# Conflicts:
# common/src/main/java/com/yunbao/common/event/SendBlindGiftEvent.java
# common/src/main/java/com/yunbao/common/http/PDLiveApi.java
# common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
# common/src/main/java/com/yunbao/common/utils/DialogUitl.java
# common/src/main/java/com/yunbao/common/utils/RouteUtil.java
# live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java
# live/src/main/java/com/yunbao/live/socket/SocketRyLinkMicPkUtil.java
# main/src/main/java/com/yunbao/main/dialog/MainStartDialogFragment.java
|
2024-05-22 13:37:33 +08:00 |
|
Martin
|
dc0ae1124f
|
add[声望升级-游戏房判断声网或者融云]
|
2024-05-22 13:32:05 +08:00 |
|
Martin
|
3167ab0be8
|
add[声望升级-游戏房判断声网或者融云]
|
2024-05-20 16:18:16 +08:00 |
|
Martin
|
0b218157d2
|
add[声望升级-AB面]
|
2024-05-18 18:27:38 +08:00 |
|
Martin
|
6a4ac35203
|
add[声望升级-AB面]
|
2024-05-18 14:36:35 +08:00 |
|
Martin
|
93dbee14b3
|
add[声望升级-修复BUG]
|
2024-05-15 15:55:31 +08:00 |
|
Martin
|
cb376aa83a
|
add[声望升级-修复BUG]
|
2024-05-14 18:29:28 +08:00 |
|
|
|
92d1861d8f
|
调整回#1eb43fb8逻辑，不管单人还是多人PK都显示排位赛信息
|
2024-05-14 18:07:37 +08:00 |
|
Martin
|
afef088555
|
add[声望升级-自動PK,直接PK]
|
2024-05-13 17:31:55 +08:00 |
|
Martin
|
73414f3349
|
add[声望升级-自動PK,直接PK]
|
2024-05-11 18:29:46 +08:00 |
|
Martin
|
abfd15f751
|
add[声望升级-小游戏多人连麦]
|
2024-05-09 16:01:39 +08:00 |
|
|
|
8d87dda691
|
修复33000问题
|
2024-05-09 14:07:37 +08:00 |
|
|
|
e24805cf9b
|
移除友盟SDK
|
2024-05-08 11:34:56 +08:00 |
|
Martin
|
95ded2f77c
|
add[声望升级-多人PK]
|
2024-05-08 10:00:00 +08:00 |
|
Martin
|
d78055cdd9
|
add[声望升级-多人PK]
|
2024-05-06 08:51:18 +08:00 |
|
|
|
2093306d36
|
修复测试反馈问题
调整小助手、机器人图标
调整PD一号的IM消息
调整PD一号的红包UI
调整翻译
|
2024-05-05 16:13:28 +08:00 |
|
Martin
|
b4adf4c77c
|
add[声望升级-多人PK]
|
2024-04-30 18:29:09 +08:00 |
|
|
|
8e2acc3417
|
Merge branch 'master' into dev_6.6.8
|
2024-04-29 11:30:25 +08:00 |
|
|
|
d28d0dd3d7
|
修复测试反馈问题
|
2024-04-29 11:02:23 +08:00 |
|
Martin
|
7d46ab8520
|
add[声望升级-多人PK]
|
2024-04-29 09:30:04 +08:00 |
|
|
|
150bdba795
|
完成小游戏直播间半屏内容
|
2024-04-26 18:04:16 +08:00 |
|
|
|
651fe12edd
|
新增小助手中英文图标判定
新增消息页图标中英文判定
|
2024-04-26 14:47:58 +08:00 |
|
|
|
1f12187766
|
根据测试反馈修改帮助反馈问题
新增小游戏跳一跳回血和必中的回调
新增关闭发红包页面后自动打开礼物栏的功能
调整小游戏跳一跳回调防抖
|
2024-04-26 10:08:19 +08:00 |
|
18401019693
|
754f2a9294
|
修改问题全服跳转直播间问题
|
2024-04-25 15:32:38 +08:00 |
|
Martin
|
9320d6c209
|
add[声望升级-单人pk,进入直播间逻辑,单人PK逻辑]
|
2024-04-25 14:13:25 +08:00 |
|
