|
|
e7daabe588
|
Merge branch 'dev_6.5.4'
|
2023-08-05 16:53:13 +08:00 |
|
|
|
d912ad6119
|
update 粉丝团
|
2023-08-05 16:52:48 +08:00 |
|
18401019693
|
dfeb1c246b
|
6.5.4礼物冠名
|
2023-08-05 15:22:49 +08:00 |
|
18401019693
|
6ba71508ca
|
6.5.4礼物冠名
|
2023-08-04 16:28:43 +08:00 |
|
|
|
c8f443c105
|
Merge branch 'master' into dev_6.5.4_tmp
|
2023-08-04 16:15:25 +08:00 |
|
18401019693
|
ebcfddf450
|
6.5.4礼物冠名
|
2023-08-04 16:14:36 +08:00 |
|
|
|
e43fb5e479
|
Merge branch 'master' into dev_6.5.4_tmp
|
2023-08-04 16:13:14 +08:00 |
|
18401019693
|
545c69ff8b
|
6.5.4礼物冠名
|
2023-08-04 15:50:32 +08:00 |
|
|
|
bf8d88608d
|
Merge branch 'master' into dev_6.5.4_tmp
# Conflicts:
# 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/JavascriptInterfaceUtils.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
# live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
|
2023-08-04 15:41:11 +08:00 |
|
18401019693
|
45c256cbbb
|
6.5.4礼物冠名
|
2023-08-04 15:18:06 +08:00 |
|
|
|
fe921e25bb
|
update 粉丝团
|
2023-08-04 14:25:49 +08:00 |
|
18401019693
|
d5ca010ec7
|
6.5.4礼物冠名
|
2023-08-04 13:57:36 +08:00 |
|
18401019693
|
04259472a1
|
Merge remote-tracking branch 'origin/dev_gift_6.5.4'
|
2023-08-04 10:19:18 +08:00 |
|
18401019693
|
d6032a0a0a
|
6.5.4礼物冠名
|
2023-08-04 10:18:05 +08:00 |
|
18401019693
|
4a7790d968
|
6.5.4礼物冠名
|
2023-08-04 10:11:03 +08:00 |
|
18401019693
|
49810407ce
|
6.5.4礼物冠名
|
2023-08-04 09:47:42 +08:00 |
|
18401019693
|
fa086dc5cb
|
6.5.4礼物冠名
|
2023-08-03 17:54:14 +08:00 |
|
18401019693
|
3f8d6ed4af
|
6.5.4礼物冠名
|
2023-08-03 16:08:43 +08:00 |
|
18401019693
|
986902886a
|
6.5.4礼物冠名
|
2023-08-03 14:29:04 +08:00 |
|
18401019693
|
8ed7595aec
|
6.5.4礼物冠名
|
2023-08-02 17:47:00 +08:00 |
|
18401019693
|
b78fef6adc
|
6.5.4礼物冠名
|
2023-08-02 16:55:36 +08:00 |
|
|
|
fae0d01dc2
|
update 粉丝团
|
2023-08-02 15:48:51 +08:00 |
|
|
|
2705342e18
|
修复#249问题
|
2023-08-02 14:39:56 +08:00 |
|
18401019693
|
5afa3bd30b
|
6.5.4礼物冠名
|
2023-08-02 13:23:37 +08:00 |
|
18401019693
|
54458bd0c0
|
6.5.4礼物冠名
|
2023-07-31 18:25:32 +08:00 |
|
|
|
c53b9a6064
|
update 粉丝团相关
|
2023-07-31 16:28:42 +08:00 |
|
|
|
92d4130c45
|
update 粉丝团相关
|
2023-07-28 10:01:41 +08:00 |
|
18401019693
|
a353e51ba8
|
6.5.4礼物栏优化
|
2023-07-25 15:25:01 +08:00 |
|
18401019693
|
0646f245b6
|
6.5.4礼物栏优化
|
2023-07-25 14:08:52 +08:00 |
|
|
|
7e3ca79a01
|
调整随机PK弹框UI
|
2023-07-21 14:19:20 +08:00 |
|
|
|
dfeb3a78c1
|
修复英文模式下，购买是守护文案超长问题
|
2023-07-21 13:34:31 +08:00 |
|
|
|
e32d450ca1
|
修复随机PK文案在英文模式下过长问题
|
2023-07-21 09:45:11 +08:00 |
|
|
|
f29766731c
|
修复#232问题
|
2023-07-20 18:12:09 +08:00 |
|
|
|
736592b4e1
|
新增头像选择界面
|
2023-07-19 18:30:32 +08:00 |
|
|
|
fdbbc3b224
|
修復紅點檢測
|
2023-07-19 10:25:11 +08:00 |
|
|
|
1e4b0bb536
|
补充信箱角标点亮和防抖
|
2023-07-18 18:09:27 +08:00 |
|
|
|
4729f93515
|
新增获取联系方式的弹框新样式
|
2023-07-18 15:40:15 +08:00 |
|
18401019693
|
3376a57f9d
|
6.5.4版本更新-“@”功能优化
|
2023-07-18 13:48:37 +08:00 |
|
18401019693
|
0a4425d705
|
修复
|
2023-07-14 10:18:50 +08:00 |
|
18401019693
|
7184b147d9
|
修复
|
2023-07-12 15:32:44 +08:00 |
|
18401019693
|
dd657e9918
|
修复
|
2023-07-12 13:50:00 +08:00 |
|
|
|
09cef4ade6
|
6.5.3 更新发送红包说明图片
|
2023-07-12 13:11:19 +08:00 |
|
|
|
6cf68838f8
|
修改红包样式和文案
|
2023-07-11 17:25:51 +08:00 |
|
|
|
c3a08974d1
|
修改发红包样式
|
2023-07-11 14:14:33 +08:00 |
|
18401019693
|
20c25a51ef
|
修复
|
2023-07-11 11:44:02 +08:00 |
|
18401019693
|
9dfb772224
|
修复
|
2023-07-11 11:43:12 +08:00 |
|
18401019693
|
f5f68f16b7
|
Merge remote-tracking branch 'origin/master'
|
2023-07-11 11:34:47 +08:00 |
|
18401019693
|
7672cea263
|
修复
|
2023-07-11 11:34:40 +08:00 |
|
|
|
0a02b39c12
|
根据产品需求修改英文翻译
根据产品需求修改UI样式
|
2023-07-11 10:51:03 +08:00 |
|
18401019693
|
e786ae16c2
|
修复
|
2023-07-11 10:13:29 +08:00 |
|
18401019693
|
1d447b0a90
|
修复
|
2023-07-10 16:36:48 +08:00 |
|
18401019693
|
4918f9ba20
|
修复
|
2023-07-08 15:52:18 +08:00 |
|
18401019693
|
124b18dcb0
|
修复
|
2023-07-08 15:15:40 +08:00 |
|
18401019693
|
f55e9c0cfe
|
修复
|
2023-07-08 13:40:50 +08:00 |
|
18401019693
|
84c43f74bc
|
修复
|
2023-07-07 16:14:28 +08:00 |
|
18401019693
|
674346b6de
|
修复
|
2023-07-07 16:01:29 +08:00 |
|
18401019693
|
64f40d52da
|
修复
|
2023-07-07 10:34:25 +08:00 |
|
18401019693
|
75e342975c
|
修复
|
2023-07-07 10:15:11 +08:00 |
|
18401019693
|
dd4172fc3d
|
修复
|
2023-07-07 09:51:29 +08:00 |
|
|
|
3807ff8916
|
修复红包出现在联系方式选项里
|
2023-07-06 17:00:02 +08:00 |
|
|
|
36b85c15f5
|
修复飘屏弹幕被禁言没提示问题
|
2023-07-06 16:44:07 +08:00 |
|
18401019693
|
4d61c7e176
|
添加翻译
|
2023-07-06 10:17:14 +08:00 |
|
18401019693
|
c6d9dbc118
|
添加翻译
|
2023-07-06 10:02:18 +08:00 |
|
|
|
6743ec3cf6
|
调整红包查看手气的UI
|
2023-07-06 10:02:04 +08:00 |
|
18401019693
|
addab80997
|
添加翻译
|
2023-07-05 18:15:18 +08:00 |
|
18401019693
|
12bedd630e
|
修复问题
|
2023-07-05 17:07:11 +08:00 |
|
18401019693
|
003c7f9e12
|
修复问题
|
2023-07-05 16:19:30 +08:00 |
|
18401019693
|
9089e96856
|
修复问题
|
2023-07-05 13:29:46 +08:00 |
|
18401019693
|
c139b03417
|
修复问题
|
2023-07-04 17:02:05 +08:00 |
|
|
|
b3fb6e62ae
|
Merge remote-tracking branch 'origin/master'
|
2023-07-04 16:37:34 +08:00 |
|
|
|
613185db40
|
修复红包记录样式问题
|
2023-07-04 16:36:46 +08:00 |
|
18401019693
|
291492f2d0
|
修复问题
|
2023-07-04 16:29:34 +08:00 |
|
18401019693
|
cbe91c84e9
|
红包全服通知
|
2023-07-04 16:02:45 +08:00 |
|
18401019693
|
08bc6d554a
|
Merge remote-tracking branch 'origin/dev_red_packet'
# Conflicts:
# common/src/main/java/com/yunbao/common/http/PDLiveApi.java
# common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
# common/src/main/res/values/strings.xml
|
2023-07-03 17:57:35 +08:00 |
|
18401019693
|
895a1c6951
|
红包中奖列表
|
2023-07-03 17:48:02 +08:00 |
|
18401019693
|
58508ca0ae
|
红包中奖列表
|
2023-07-03 13:05:29 +08:00 |
|
18401019693
|
5736265388
|
展示红包，领取红包接口逻辑对接
|
2023-06-30 16:03:37 +08:00 |
|
18401019693
|
e68d20252a
|
创建接口，红包展示接口
|
2023-06-30 10:17:33 +08:00 |
|
|
|
44b4b06592
|
退出直播间时移除加载错误的提示
|
2023-06-29 15:09:46 +08:00 |
|
|
|
fb7551f7d0
|
Merge branch 'master' into 6.5.3
|
2023-06-29 14:09:33 +08:00 |
|
18401019693
|
40455fffc9
|
红包打开创建领取的样式逻辑构建
|
2023-06-29 10:15:24 +08:00 |
|
|
|
492003ff01
|
update 调整禁言对话框的文案
|
2023-06-28 17:37:30 +08:00 |
|
|
|
710cddd3a7
|
Merge branch 'dev_6.5.3_红包' into 6.5.3
|
2023-06-28 16:49:23 +08:00 |
|
|
|
da7ebb2663
|
add 新增红包专区
add 新增红包专区进去是只有发放红包的直播间
add 新增首页红包浮窗
add 新增红包记录
|
2023-06-28 16:44:42 +08:00 |
|
|
|
6a6696f355
|
fix 修复测试服ios发消息安卓端收不到问题
|
2023-06-28 16:43:26 +08:00 |
|
|
|
368b002db6
|
update 直播间超时进入的提示
|
2023-06-27 14:19:34 +08:00 |
|
18401019693
|
279575d80b
|
红包直播间展示样式构建
|
2023-06-26 18:04:58 +08:00 |
|
|
|
e0312eedd1
|
update 禁言弹框ui标题
|
2023-06-26 10:17:45 +08:00 |
|
|
|
abbb8c524c
|
新增被禁言的提示
|
2023-06-25 16:19:55 +08:00 |
|
|
|
9741be743c
|
新增直播播放器报错时提示
新增观众端看异常下播直播间提示
|
2023-06-25 14:18:40 +08:00 |
|
|
|
beb566b294
|
新增期间禁言功能
|
2023-06-25 09:51:29 +08:00 |
|
18401019693
|
6889828c00
|
消息中心新增【系统消息】类型
|
2023-06-20 17:46:31 +08:00 |
|
18401019693
|
1198a8f1d8
|
送礼交互优化
|
2023-06-15 15:27:46 +08:00 |
|
|
|
ae9c050ae6
|
Merge remote-tracking branch 'origin/master'
|
2023-06-08 17:02:32 +08:00 |
|
|
|
7b61e8c562
|
修复Ranking.getAnchorRankData多次调用问题
|
2023-06-08 17:02:20 +08:00 |
|
18142669586
|
23a396864f
|
修改全服
|
2023-06-08 17:02:11 +08:00 |
|
|
|
af8052f65b
|
修复Ranking.getAnchorRankData多次调用问题
|
2023-06-08 15:21:24 +08:00 |
|
|
|
6603a2dbb5
|
修复Ranking.getAnchorRankData多次调用问题
|
2023-06-08 14:33:44 +08:00 |
|
|
|
f3a0b4d145
|
修复Ranking.getAnchorRankData多次调用问题
|
2023-06-08 14:20:15 +08:00 |
|
|
|
0c99324904
|
Merge remote-tracking branch 'origin/master'
|
2023-06-08 11:13:55 +08:00 |
|
|
|
8d077e8062
|
修复PK结束时会隐藏投票问题
|
2023-06-08 11:13:38 +08:00 |
|
18401019693
|
3aaafdbbbe
|
修改完善资料和礼物点击
|
2023-06-08 10:12:37 +08:00 |
|
18401019693
|
f4016089a1
|
修改完善资料和礼物点击
|
2023-06-06 15:28:00 +08:00 |
|
18401019693
|
cd2e176f0a
|
Merge branch 'dev_6.5.3'
|
2023-06-05 14:09:42 +08:00 |
|
|
|
e6d92ffc86
|
调整投票ui
|
2023-06-05 13:24:13 +08:00 |
|
|
|
ea0a3375e4
|
修复非粉丝通过送礼打开的粉丝团url不正确问题
|
2023-06-05 11:42:56 +08:00 |
|
18401019693
|
06357088c1
|
修改礼物类型
|
2023-06-05 10:36:27 +08:00 |
|
18401019693
|
fa24d226ee
|
6.5.2
|
2023-06-03 18:30:08 +08:00 |
|
18401019693
|
35f16bdcae
|
修改盲盒问题
|
2023-06-03 15:20:18 +08:00 |
|
18401019693
|
aacd8b8735
|
修改盲盒问题
|
2023-06-03 14:35:39 +08:00 |
|
18142669586
|
6e595ff1e4
|
Merge remote-tracking branch 'origin/master'
|
2023-06-03 11:48:37 +08:00 |
|
18142669586
|
fbc50229e8
|
修改关播页面英文显示问题
|
2023-06-03 11:45:57 +08:00 |
|
|
|
1edb07d76c
|
调整投票主播二次点击关闭按钮后直接关闭浮窗
|
2023-06-03 11:45:23 +08:00 |
|
18401019693
|
067bbc70c5
|
修改盲盒问题
|
2023-06-03 10:35:52 +08:00 |
|
18401019693
|
0bab58d507
|
修改盲盒问题
|
2023-06-02 13:52:29 +08:00 |
|
18401019693
|
f4b5cdfed3
|
修改直播间展示ID
|
2023-06-02 13:13:07 +08:00 |
|
18142669586
|
a7a9a28c09
|
Merge remote-tracking branch 'origin/master'
|
2023-06-02 10:27:48 +08:00 |
|
18142669586
|
bbd394044f
|
修改关播页面英文显示问题
|
2023-06-02 10:27:36 +08:00 |
|
18401019693
|
49df393781
|
Merge remote-tracking branch 'origin/master'
|
2023-06-02 10:04:40 +08:00 |
|
18401019693
|
f0a8c17401
|
修改盲盒连宋
|
2023-06-02 10:04:32 +08:00 |
|
|
|
a01ddd310b
|
新增投票观众端的中英文切换
|
2023-06-02 09:56:24 +08:00 |
|
18401019693
|
26ec74932f
|
修改盲盒蒙版
|
2023-06-01 18:16:58 +08:00 |
|
18401019693
|
3aa85ca9bb
|
直播间房间号加ID
|
2023-06-01 15:56:06 +08:00 |
|
|
|
9486a1a572
|
修复下播页面关注按钮在英文状态下自动换行问题
|
2023-06-01 15:12:17 +08:00 |
|
18401019693
|
3488da27f0
|
盲盒加判断是不是本人
|
2023-06-01 10:26:08 +08:00 |
|
18401019693
|
282790ead5
|
Merge remote-tracking branch 'origin/master'
|
2023-05-31 13:59:28 +08:00 |
|
18401019693
|
db165cc05d
|
盲盒礼物开箱动画
|
2023-05-31 13:22:14 +08:00 |
|
|
|
49313ca326
|
修复PK滑动直播间可能画面错乱问题
|
2023-05-29 15:25:15 +08:00 |
|
18401019693
|
b0008405e2
|
Merge branch 'master' into dev_blind_box
|
2023-05-29 11:35:17 +08:00 |
|
18401019693
|
9c32c6af25
|
添加盲盒礼物蒙版
|
2023-05-29 11:34:34 +08:00 |
|
|
|
baa2ec127f
|
调整播放器在停止播放时把play2也一并停止
|
2023-05-29 11:25:30 +08:00 |
|
18401019693
|
c3b5f17f44
|
Merge branch 'master' into dev_blind_box
# Conflicts:
# common/src/main/res/values-zh/strings.xml
# common/src/main/res/values/strings.xml
|
2023-05-27 18:25:14 +08:00 |
|
18401019693
|
66290323d8
|
盲盒全服通知逻辑
|
2023-05-27 11:40:09 +08:00 |
|
|
|
9526a14ca2
|
调整聊天区高度
|
2023-05-27 11:24:28 +08:00 |
|
|
|
27715cda2c
|
新增投票创建失败时的提示语
|
2023-05-26 14:24:29 +08:00 |
|
|
|
65bfc77376
|
修复直播结束数据界面，直播时长未对齐问题
|
2023-05-25 14:34:39 +08:00 |
|
|
|
99618a2779
|
新增IM消息：endPK，用于显示最终单人PK数据
|
2023-05-25 14:25:57 +08:00 |
|
|
|
6ee678bd74
|
开播频道屏蔽【男神】
|
2023-05-25 13:41:39 +08:00 |
|
18401019693
|
b4dc035a1b
|
盲盒礼物具体业务逻辑的构建，IM消息的构建
|
2023-05-25 13:40:49 +08:00 |
|
18401019693
|
1f7aef91a8
|
礼物盲盒基本逻辑
|
2023-05-24 14:50:39 +08:00 |
|
18401019693
|
4f103dadc9
|
修改防抖点击问题
|
2023-05-22 16:48:55 +08:00 |
|
18401019693
|
055d002a34
|
Merge remote-tracking branch 'origin/master'
|
2023-05-19 13:33:17 +08:00 |
|
18401019693
|
426f7450a2
|
修复心愿单问题
|
2023-05-19 13:33:09 +08:00 |
|
|
|
435dc1c4fb
|
调整投票UI
|
2023-05-19 10:36:06 +08:00 |
|
|
|
070312ff53
|
投票修复测试回报问题
|
2023-05-18 15:02:11 +08:00 |
|
|
|
bd8cf94171
|
调整投票隐藏按钮触控范围
|
2023-05-18 11:21:53 +08:00 |
|
|
|
98bb182d56
|
调整投票展示效果
|
2023-05-18 10:52:59 +08:00 |
|
|
|
3454b6f924
|
调整投票展示效果
|
2023-05-18 10:31:52 +08:00 |
|
|
|
5af061c26f
|
update
|
2023-05-17 17:37:34 +08:00 |
|
|
|
c1c8921f59
|
Merge branch 'dev_6.5.2'
# Conflicts:
# common/src/main/java/com/yunbao/common/http/PDLiveApi.java
# common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
# common/src/main/res/values-en-rUS/string.xml
# common/src/main/res/values-zh/strings.xml
# common/src/main/res/values/strings.xml
# live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
|
2023-05-17 16:20:10 +08:00 |
|
