|
|
9292e6f5c5
|
Merge remote-tracking branch 'origin/dev_680_礼物展馆' into dev_680_礼物展馆
# Conflicts:
# common/src/main/java/com/yunbao/common/http/PDLiveApi.java
# common/src/main/res/values-zh/strings.xml
# common/src/main/res/values/strings.xml
|
2024-07-13 09:29:11 +08:00 |
|
|
|
845b217c4d
|
新增礼物墙相关内容
|
2024-07-13 09:28:02 +08:00 |
|
Martin
|
7edd75e223
|
礼物墙功能
|
2024-07-13 09:27:11 +08:00 |
|
Martin
|
15a52aaa62
|
1、开通守护，im消息优化
2、游戏房安全区域优化
3、举报接口新增字段区分
|
2024-07-11 13:07:17 +08:00 |
|
余前卫
|
6d6010d023
|
Merge branch 'master' of https://gitee.com/xxkp/pdlivexp
# Conflicts:
# app/build.gradle
# common/src/main/res/values-zh-rHK/strings.xml
# common/src/main/res/values-zh-rTW/strings.xml
# common/src/main/res/values/strings.xml
|
2024-07-10 10:53:01 +08:00 |
|
Martin
|
94156e2984
|
Merge branch '直播间提示优化'
# Conflicts:
# config.gradle
|
2024-07-09 13:49:31 +08:00 |
|
Martin
|
769f527565
|
1、開通守護-使用優惠券
2、开通贵族，在当前直播间有围观按钮问题
|
2024-07-09 13:08:33 +08:00 |
|
Martin
|
3dcc801331
|
1、開通守護-使用優惠券
|
2024-07-05 13:58:35 +08:00 |
|
Martin
|
963fe2c110
|
1、好友邀请守护内容修改
|
2024-07-04 17:59:56 +08:00 |
|
Martin
|
9dd3619049
|
1、全服通知，新增【围观】按钮显示判断逻辑
|
2024-07-04 13:16:48 +08:00 |
|
Martin
|
96b80a460b
|
1、游戏房，游戏操作区域距离顶部问题
2、直播间红包、神龙位置问题
|
2024-07-03 18:24:14 +08:00 |
|
Martin
|
a68bee94a9
|
直播间侧边栏美化
|
2024-07-03 15:21:32 +08:00 |
|
Martin
|
40a2843696
|
守护榜页面需美化
|
2024-07-03 11:21:25 +08:00 |
|
Martin
|
f14fb4612b
|
1、直播间-互动游戏角标优化
|
2024-07-01 16:55:46 +08:00 |
|
|
|
e0669e98cf
|
新增上报日志功能
|
2024-06-29 10:11:42 +08:00 |
|
Martin
|
8f82c7c785
|
1.直播间游戏提示优化
2.战令经验值购买优化
|
2024-06-28 17:52:41 +08:00 |
|
余前卫
|
2eea1f1b75
|
6.8.0:谷歌内购版本升级，小游戏结算界面优化
|
2024-06-27 18:30:51 +08:00 |
|
Martin
|
b68c7f1c46
|
1.守护榜页面需美化
2.直播间功能栏美化
3.游戏房间界面需美化
|
2024-06-26 17:27:29 +08:00 |
|
Martin
|
dd7eb2326a
|
[优化]：
1.直播间游戏提示优化
2.战令经验值购买优化
3.守护榜页面需美化
|
2024-06-25 16:52:09 +08:00 |
|
|
|
a154f480f6
|
增强配置化打包程序，可有效防止手动打包配置错误
|
2024-06-20 14:02:15 +08:00 |
|
Martin
|
29badbf725
|
fix[修復小窗播放白屏問題]
|
2024-06-19 14:47:53 +08:00 |
|
Martin
|
e89f22329f
|
Merge branch 'dev_6.7.0'
|
2024-06-19 11:13:16 +08:00 |
|
Martin
|
81e08d41af
|
FIX[修复BUG]
|
2024-06-18 18:42:26 +08:00 |
|
|
|
d89b356395
|
修复PK时整蛊观众端联系方式会闪动问题
|
2024-06-18 18:22:06 +08:00 |
|
|
|
4d2985456d
|
修复整蛊设置连击数有xN的字符
|
2024-06-18 17:56:55 +08:00 |
|
|
|
48e3ff46ab
|
修复安卓用户主播关播后在关播顶面显示主播最后一真画面。
修复安卓主播关播后还在一直推流。
|
2024-06-18 17:39:05 +08:00 |
|
Martin
|
6dd3e02c1d
|
add[新增添加整蠱禮物提示]
|
2024-06-18 16:31:13 +08:00 |
|
|
|
d8e9cc2189
|
调整进游戏房就关掉小窗
|
2024-06-18 15:09:18 +08:00 |
|
Martin
|
0310628ba3
|
Merge branch 'master' into dev_6.7.0
|
2024-06-18 14:48:28 +08:00 |
|
|
|
2f54fdab12
|
调整进游戏房就关掉小窗
|
2024-06-18 14:44:12 +08:00 |
|
Martin
|
a3228f48c2
|
add[修復BUG]
|
2024-06-18 13:50:21 +08:00 |
|
余前卫
|
35c83a255a
|
6.7.0用户端更新:列表和缩小图标同时出现bug
|
2024-06-18 10:15:34 +08:00 |
|
Martin
|
0aeb2d32c2
|
add[修復BUG]
|
2024-06-17 17:21:18 +08:00 |
|
Martin
|
313320473f
|
add[修復BUG]
|
2024-06-17 15:35:58 +08:00 |
|
Martin
|
2b86927b5b
|
Merge remote-tracking branch 'origin/dev_6.7.0' into dev_6.7.0
|
2024-06-17 11:02:17 +08:00 |
|
余前卫
|
bf3ebfedbd
|
6.7.0用户端更新:
|
2024-06-17 10:59:47 +08:00 |
|
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 |
|
