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
|
e874c2ee16
|
add[修復BUG，新增整蛊IM消息类型]
|
2024-06-14 15:40:51 +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 |
|
|
|
b41bd3b89b
|
修复:
1：开播闪屏问题
2：游戏房消息重复（或不显示）
3：模拟器或部分机型滑动声网直播间会白屏问题
4：PK条在平板模式下显示太高问题
5：PK没断开能收到其他人邀请的问题
|
2024-06-13 09:47:38 +08:00 |
|
Martin
|
f131fcf546
|
add[主播端，整蛊礼物，待完成项完成]
|
2024-06-12 16:44:46 +08:00 |
|
Martin
|
0425b56106
|
add[整蛊翻译]
|
2024-06-11 16:55:07 +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 |
|
余前卫
|
b8b43c1ef2
|
6.7.0用户端更新
|
2024-06-07 15:35:34 +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 |
|
Martin
|
9c9eb34756
|
fix[修复BUG-主播开麦按钮的字未显示全]
|
2024-06-04 09:50:46 +08:00 |
|
Martin
|
1b57d8bc8f
|
fix[修复BUG]
|
2024-06-03 15:41:29 +08:00 |
|
|
|
b5417f90b4
|
调整弹窗
|
2024-06-03 09:41:51 +08:00 |
|
Martin
|
4bd1e4bc91
|
fix[修复融云直播间，多人PK主播信息问题]
|
2024-06-02 16:57:48 +08:00 |
|
Martin
|
c4d378daba
|
fix[声望升级-修复BUG]
|
2024-05-31 20:59:16 +08:00 |
|
|
|
186b9d61ee
|
調整主播端設置整蠱UI
|
2024-05-31 15:06:35 +08:00 |
|
Martin
|
278801b77a
|
fix[声望升级-修复BUG]
|
2024-05-30 18:25:01 +08:00 |
|
|
|
022806d9da
|
修复直播间 用户等级+超皇+粉丝牌+图标+名字（10字）会丢失名字前面图标的问题
|
2024-05-30 15:14:00 +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
|
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 |
|
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
|
6a4ac35203
|
add[声望升级-AB面]
|
2024-05-18 14:36:35 +08:00 |
|
Martin
|
cb376aa83a
|
add[声望升级-修复BUG]
|
2024-05-14 18:29:28 +08:00 |
|
Martin
|
73414f3349
|
add[声望升级-自動PK,直接PK]
|
2024-05-11 18:29:46 +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 |
|
Martin
|
9320d6c209
|
add[声望升级-单人pk,进入直播间逻辑,单人PK逻辑]
|
2024-04-25 14:13:25 +08:00 |
|
Martin
|
8228c45a4d
|
add[声望升级-多人PK]
|
2024-04-22 18:28:01 +08:00 |
|
Martin
|
4147e3c5f5
|
add[声望升级-多人PK]
|
2024-04-19 18:27:56 +08:00 |
|
Martin
|
0db8eefbe6
|
add[声望升级]
|
2024-04-13 18:19:14 +08:00 |
|
Martin
|
3f68e2a3aa
|
add[声望升级]
|
2024-04-12 18:29:26 +08:00 |
|
Martin
|
5922f4c08b
|
add[声望升级]
|
2024-04-10 18:31:00 +08:00 |
|
18401019693
|
7c006e8e03
|
修改守护榜位置信息
|
2024-04-07 17:21:17 +08:00 |
|
18401019693
|
0d7bdce4f0
|
修改守护问题，添加全服通知功能
|
2024-04-03 16:05:53 +08:00 |
|
18401019693
|
28dba93f17
|
修改守护列表页标签展示
|
2024-03-28 16:29:02 +08:00 |
|
18401019693
|
5f1eadc47b
|
ui修改
|
2024-03-26 17:27:42 +08:00 |
|
18401019693
|
de11b5123d
|
ui修改
|
2024-03-26 15:03:08 +08:00 |
|
18401019693
|
f94b3f27e3
|
守护团新增红点
|
2024-03-22 14:53:33 +08:00 |
|
