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 |
|
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
|
583740e866
|
add[声望升级-接入美颜]
|
2024-04-18 09:47:38 +08:00 |
|
Martin
|
0db8eefbe6
|
add[声望升级]
|
2024-04-13 18:19:14 +08:00 |
|
Martin
|
3f68e2a3aa
|
add[声望升级]
|
2024-04-12 18:29:26 +08:00 |
|
18401019693
|
11ba2c45f8
|
修改问题
|
2024-04-12 14:14:16 +08:00 |
|
18401019693
|
320584769d
|
修改问题
|
2024-04-11 16:32:21 +08:00 |
|
Martin
|
5922f4c08b
|
add[声望升级]
|
2024-04-10 18:31:00 +08:00 |
|
18401019693
|
b29b0a1688
|
修改问题
|
2024-04-10 13:31:40 +08:00 |
|
18401019693
|
a100ab1a4a
|
修改问题
|
2024-04-09 13:04:42 +08:00 |
|
18401019693
|
88b96267ef
|
修改守护购买页过期用户购买逻辑
|
2024-04-08 10:01:42 +08:00 |
|
18401019693
|
7c006e8e03
|
修改守护榜位置信息
|
2024-04-07 17:21:17 +08:00 |
|
18401019693
|
f35b547c0d
|
自测修复，全服添加主播端
|
2024-04-07 15:32:42 +08:00 |
|
18401019693
|
bbf5d159b4
|
自测修复，全服添加主播端
|
2024-04-07 14:15:41 +08:00 |
|
18401019693
|
f626ab03d4
|
添加短剧签到
|
2024-04-07 09:40:32 +08:00 |
|
18401019693
|
0d7bdce4f0
|
修改守护问题，添加全服通知功能
|
2024-04-03 16:05:53 +08:00 |
|
18401019693
|
cd3feebb94
|
修改问题
|
2024-04-01 14:32:46 +08:00 |
|
18401019693
|
0b7b959151
|
修改问题
|
2024-04-01 11:10:54 +08:00 |
|
18401019693
|
ce7b6decc1
|
心愿单
|
2024-03-29 18:05:01 +08:00 |
|
18401019693
|
4a4a52aa61
|
修改守护列表页标签展示
|
2024-03-29 15:16:27 +08:00 |
|
18401019693
|
123b9dd74a
|
Merge branch 'dev_6.6.6_开通守护'
|
2024-03-28 16:51:13 +08:00 |
|
18401019693
|
28dba93f17
|
修改守护列表页标签展示
|
2024-03-28 16:29:02 +08:00 |
|
18401019693
|
285515345b
|
修改守护列表页标签展示
|
2024-03-28 10:00:20 +08:00 |
|
18401019693
|
f24744afe8
|
修改测试问题
|
2024-03-28 09:50:29 +08:00 |
|
18401019693
|
1e466ac13d
|
Merge branch 'dev_6.6.6_开通守护'
|
2024-03-27 16:19:31 +08:00 |
|
18401019693
|
d37b490088
|
修改测试问题，添加代理和vpn检测的开播检测
|
2024-03-27 16:19:08 +08:00 |
|
18401019693
|
a61bc8fbb8
|
Merge branch 'dev_6.6.6_开通守护'
|
2024-03-27 09:44:56 +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
|
5b0f5f03ab
|
新增主播端 获取活动悬浮窗状态的接口：Live.getAnchorActiveImgStatus，替换原有的接口：Rank.isActivity，
|
2024-03-25 11:10:46 +08:00 |
|
18401019693
|
3953e146a5
|
修改问题
|
2024-03-23 17:33:09 +08:00 |
|
18401019693
|
f04a2865af
|
修改问题
|
2024-03-23 16:47:28 +08:00 |
|
18401019693
|
f94b3f27e3
|
守护团新增红点
|
2024-03-22 14:53:33 +08:00 |
|
18401019693
|
61a966ea41
|
修改直播间内红包和神龙送财的位置首页的位置
|
2024-03-22 11:23:30 +08:00 |
|
18401019693
|
d0f2ac2c60
|
修改测试问题，
|
2024-03-21 18:37:35 +08:00 |
|
18401019693
|
5dff64ec99
|
修改测试问题，对接H5页面
|
2024-03-21 18:13:24 +08:00 |
|
18401019693
|
cad8236e5c
|
修改测试问题
|
2024-03-21 17:36:07 +08:00 |
|
18401019693
|
faa401245f
|
修改测试问题
|
2024-03-21 15:48:50 +08:00 |
|
18401019693
|
4fc021e866
|
修改测试问题
|
2024-03-21 15:28:36 +08:00 |
|
18401019693
|
f9a21d0357
|
修改测试问题
|
2024-03-21 15:08:42 +08:00 |
|
18401019693
|
d72a9a39c6
|
修改测试问题
|
2024-03-20 16:29:37 +08:00 |
|
18401019693
|
0317b339f8
|
修改测试问题,新增直播列表页面的神龙送财的图标
|
2024-03-20 15:19:53 +08:00 |
|
18401019693
|
4fabf3aba3
|
修改测试问题
|
2024-03-20 13:40:30 +08:00 |
|
18401019693
|
4693954a72
|
神龙送财，逻辑修改，由开通接口触发
|
2024-03-20 10:02:14 +08:00 |
|
18401019693
|
859810f1f6
|
守护的全服通知，修改测试问题
|
2024-03-19 15:32:04 +08:00 |
|
18401019693
|
53f389ddc8
|
守護等級的檢查接口，領取接口。相關頁面的請求添加。h5方法新鄭
|
2024-03-18 14:52:24 +08:00 |
|
18401019693
|
ddc9bc344e
|
神龙送财结束Im结束调用接口，神龙列表倒计时修改
|
2024-03-18 10:24:05 +08:00 |
|
18401019693
|
cf34e73d32
|
神龙列表接口对接，神龙送财活动参加接口对接，ui更新
|
2024-03-14 18:21:55 +08:00 |
|
18401019693
|
1981fb553a
|
神龙列表接口对接，神龙送财活动参加接口对接，ui更新
|
2024-03-14 16:39:04 +08:00 |
|
18401019693
|
3b6d586b58
|
神龙送财开启接口。展示直播间神龙送财点击参与的图标
|
2024-03-14 10:44:40 +08:00 |
|
18401019693
|
50b6deaf01
|
對接開通接口神龍送財的im消息
|
2024-03-13 11:18:26 +08:00 |
|
18401019693
|
bc8d916445
|
神龍送財彈窗頁面。神龍送財規則頁面
|
2024-03-06 17:18:54 +08:00 |
|
18401019693
|
6870037683
|
新版守护，空页面，列表页面。守护类型开通页面。开通时间页面
|
2024-03-06 14:24:04 +08:00 |
|
hch
|
8af7f907eb
|
守护弹窗
|
2024-03-04 14:51:07 +08:00 |
|
|
|
ae9ef1f8a1
|
新增守护测试页面
|
2024-02-26 14:41:01 +08:00 |
|
18401019693
|
1023c0ab4d
|
修改直播间发言报错提示
|
2024-02-23 09:47:49 +08:00 |
|
hch
|
85b4facfe8
|
调整UI
|
2024-01-26 17:04:11 +08:00 |
|
hch
|
0552f56eb4
|
调整UI
|
2024-01-26 13:06:03 +08:00 |
|
hch
|
e7ef492015
|
调整UI
|
2024-01-26 10:18:58 +08:00 |
|
18401019693
|
dd64568fdf
|
修复：连送重新选择礼物或者包裹按钮不消失问题
|
2024-01-24 15:47:19 +08:00 |
|
18401019693
|
45fd56ba66
|
修复：手机开播邀请多人PK，多人PK一轮结束后，再次多人PK，在直播间的观众无法看到第二轮的PK倒计时
|
2024-01-24 14:39:00 +08:00 |
|
18401019693
|
508e9f1931
|
修复：手机开播邀请多人PK，多人PK一轮结束后，再次多人PK，在直播间的观众无法看到第二轮的PK倒计时
|
2024-01-24 11:29:00 +08:00 |
|
|
|
47077a465a
|
修复PK显示问题：【是用户先进 主播后挂断会显示对方信息角标】
调整直播间游戏半屏UI
调整战令UI
|
2024-01-23 15:28:13 +08:00 |
|
hch
|
aa62dda844
|
短剧优化
|
2024-01-23 14:05:33 +08:00 |
|
18401019693
|
64f9cee3af
|
优化
|
2024-01-23 09:50:34 +08:00 |
|
|
|
1eb43fb8cf
|
修复PK排位赛信息问题
|
2024-01-20 15:15:30 +08:00 |
|
18401019693
|
f770370be0
|
多人pk邀请人数限制
|
2024-01-20 13:59:27 +08:00 |
|
|
|
c2979b4cf7
|
修改战令入口颜色
|
2024-01-18 18:04:07 +08:00 |
|
18401019693
|
0f70f10aed
|
多人PK结束以后横竖屏修改
|
2024-01-18 16:50:39 +08:00 |
|
18401019693
|
c49c9c2f81
|
Merge remote-tracking branch 'origin/master'
|
2024-01-18 16:09:45 +08:00 |
|
18401019693
|
74b19de11c
|
多人PK倒计时bug修改
|
2024-01-18 16:09:34 +08:00 |
|
hch
|
00b89aab69
|
合并
|
2024-01-18 15:15:04 +08:00 |
|
hch
|
6ff6cbbe6b
|
Merge branch 'master' into pdlive_samsung
# Conflicts:
# config.gradle
# live/src/main/java/com/yunbao/live/views/SystemMessageViewHolder.java
|
2024-01-18 14:56:27 +08:00 |
|
18401019693
|
ae6fdab7e8
|
多人PK倒计时bug修改
|
2024-01-18 14:48:29 +08:00 |
|
18401019693
|
3d1c4466e0
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# config.gradle
|
2024-01-18 13:38:34 +08:00 |
|
18401019693
|
9963b37b6f
|
多人PK倒计时bug修改
|
2024-01-18 13:37:49 +08:00 |
|
hch
|
3a1268aac7
|
修改UI
|
2024-01-17 11:26:15 +08:00 |
|
hch
|
5b813aff88
|
修改UI
|
2024-01-17 11:12:53 +08:00 |
|
18401019693
|
d9951b5a35
|
添加了接口控制文字消息和语音的展示
|
2024-01-15 17:59:18 +08:00 |
|
18401019693
|
f928fce069
|
Merge remote-tracking branch 'origin/master'
|
2024-01-15 17:58:53 +08:00 |
|
18401019693
|
d365389ff8
|
添加了接口控制文字消息和语音的展示
|
2024-01-15 17:58:47 +08:00 |
|
|
|
a4e98f3703
|
调整弹幕统计接口字段
|
2024-01-15 17:52:53 +08:00 |
|
hch
|
a307e6f864
|
修复 点击去支付无反应 问题
|
2024-01-15 17:24:07 +08:00 |
|
18401019693
|
1f7c6c8adc
|
添加了接口控制文字消息和语音的展示
|
2024-01-15 17:04:36 +08:00 |
|
18401019693
|
2aa50ecfc7
|
添加了接口控制文字消息和语音的展示
|
2024-01-15 16:15:00 +08:00 |
|
18401019693
|
58b2d69601
|
添加了接口控制文字消息和语音的展示
|
2024-01-15 14:31:59 +08:00 |
|
18401019693
|
24788d7e21
|
添加了接口控制文字消息和语音的展示
|
2024-01-15 13:59:46 +08:00 |
|
hch
|
92d271ff93
|
TopGradual 更改引用
|
2024-01-15 10:22:08 +08:00 |
|
18401019693
|
0b15df41b8
|
Merge remote-tracking branch 'origin/语音房_6.6.4_'
# Conflicts:
# common/src/main/res/values-en-rUS/string.xml
# 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
|
2024-01-15 10:03:00 +08:00 |
|
18401019693
|
f22f8fcb4b
|
语音房bug修改
|
2024-01-15 10:01:00 +08:00 |
|
hch
|
7627219e77
|
新增首页战令入口
|
2024-01-12 15:33:16 +08:00 |
|
18401019693
|
cf749d85c6
|
语音房bug修改
|
2024-01-12 15:16:40 +08:00 |
|
hch
|
ac6eb21e06
|
Merge remote-tracking branch 'origin/master' into 6.6.4_推送管理
# Conflicts:
# common/src/main/java/com/yunbao/common/utils/RouteUtil.java
# common/src/main/res/values-en-rUS/string.xml
# 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
# config.gradle
|
2024-01-12 13:52:03 +08:00 |
|
18401019693
|
5ca13b770c
|
语音房bug修改
|
2024-01-12 09:34:29 +08:00 |
|
|
|
7795317c14
|
修复【直播间信件往下滑，信件界面会显示为空】
|
2024-01-11 16:10:17 +08:00 |
|
18401019693
|
a036e5eff6
|
语音房接口添加
|
2024-01-11 15:15:21 +08:00 |
|
