|
|
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
|
04259472a1
|
Merge remote-tracking branch 'origin/dev_gift_6.5.4'
|
2023-08-04 10:19:18 +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 |
|
|
|
dfeb3a78c1
|
修复英文模式下，购买是守护文案超长问题
|
2023-07-21 13:34:31 +08:00 |
|
18401019693
|
895a1c6951
|
红包中奖列表
|
2023-07-03 17:48:02 +08:00 |
|
18401019693
|
40455fffc9
|
红包打开创建领取的样式逻辑构建
|
2023-06-29 10:15:24 +08:00 |
|
18401019693
|
279575d80b
|
红包直播间展示样式构建
|
2023-06-26 18:04:58 +08:00 |
|
18401019693
|
66290323d8
|
盲盒全服通知逻辑
|
2023-05-27 11:40:09 +08:00 |
|
|
|
df0f5f31e0
|
提交主播投票功能
|
2023-05-17 15:12:51 +08:00 |
|
18401019693
|
0ed37aee11
|
心愿单位置移动
|
2023-04-14 10:40:14 +08:00 |
|
18142669586
|
eb21a17475
|
修改连麦样试
|
2023-04-13 17:22:05 +08:00 |
|
18142669586
|
8507fc1bb7
|
修改连麦样试
|
2023-04-13 16:44:41 +08:00 |
|
18142669586
|
db8dc2a781
|
修改连麦样试
|
2023-04-13 15:57:11 +08:00 |
|
18401019693
|
4ae1b12be0
|
心愿单设置加限制
|
2023-04-13 15:45:51 +08:00 |
|
18401019693
|
32fa77be39
|
心愿单逻辑修改，ui修改
|
2023-04-13 13:04:12 +08:00 |
|
18401019693
|
b305ba925b
|
修改热度加成逻辑展示方式
|
2023-04-11 14:14:42 +08:00 |
|
18401019693
|
28ef982b74
|
心愿单修改
|
2023-04-08 16:42:43 +08:00 |
|
|
|
b44524b25f
|
修复女神说不隐藏的问题
|
2023-04-08 16:27:33 +08:00 |
|
|
|
a8178c51a0
|
调整直播间UI
修复进入直播间快速退出导致的闪退问题
|
2023-04-08 14:57:22 +08:00 |
|
|
|
f201e0978e
|
修复主播端开播后点击屏幕无效问题
|
2023-04-07 16:23:10 +08:00 |
|
18401019693
|
63c2891650
|
心愿单修改，
|
2023-04-07 16:07:08 +08:00 |
|
|
|
33034ce4d6
|
调整心愿单浮标大小
修复注册默认值没香港标识
调整小助手图片位置
|
2023-04-07 15:37:51 +08:00 |
|
18401019693
|
9d38ff7c8f
|
心愿单修改，
|
2023-04-07 15:28:19 +08:00 |
|
|
|
16caf60f77
|
更换心愿单浮标背景图
优化分享字符过多显示不全问题
优化女神说浮窗字数过多超过背景图问题
|
2023-04-07 14:45:12 +08:00 |
|
18142669586
|
b0ed276e23
|
修改新人任务的展示
|
2023-04-07 14:42:07 +08:00 |
|
|
|
36410ddcaa
|
调整女神说6字改回4字
|
2023-04-06 14:29:12 +08:00 |
|
18401019693
|
e5a07613aa
|
修改随机pk轮播背景展示问题
|
2023-04-02 17:22:10 +08:00 |
|
|
|
97ad5c2d92
|
update 调整女神说布局大小
|
2023-04-01 11:14:24 +08:00 |
|
|
|
6d83c6f8ae
|
Merge branch 'dev_6.5.0_anchor_call_me'
# Conflicts:
# common/src/main/java/com/yunbao/common/manager/IMLoginManager.java
# common/src/main/res/values/strings.xml
# live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
|
2023-03-30 11:31:32 +08:00 |
|
|
|
ce2048b9a5
|
update 女神说主播端显示
update 联系方式改成svga
update PK时隐藏女神说和联系方式
|
2023-03-30 11:23:11 +08:00 |
|
|
|
c78bb79633
|
update 联系方式
update 女神说
|
2023-03-29 13:32:15 +08:00 |
|
18401019693
|
c02f24fdcd
|
修改礼物图标
|
2023-03-27 15:29:43 +08:00 |
|
18401019693
|
86c5334ab4
|
高等级入场提示
|
2023-03-27 14:22:29 +08:00 |
|
|
|
6ef8c3778b
|
update 女神说
|
2023-03-27 11:09:03 +08:00 |
|
18401019693
|
085f19c3ca
|
修改直播间聊天界面（横竖屏聊天框高度，关注消息修改）直播间头部布局样式修改
|
2023-03-23 16:36:16 +08:00 |
|
|
|
f4d23c57df
|
新增女神说相关UI
|
2023-03-23 14:26:52 +08:00 |
|
18401019693
|
8455d1253c
|
修改界面的中英文
|
2023-03-17 10:19:35 +08:00 |
|
|
|
fdd30aa52a
|
修复多人连麦第三位麦克风位置不正确的问题
|
2023-02-23 16:54:01 +08:00 |
|
|
|
ddf56963bb
|
调整PK天梯图标大小
|
2023-01-07 16:54:05 +08:00 |
|
18401019693
|
112bec58df
|
修改热度加成问题
|
2023-01-07 14:53:12 +08:00 |
|
|
|
0b7a3cc50e
|
修复直播聊天室抽搐问题
|
2023-01-07 14:43:35 +08:00 |
|
|
|
9f517199fe
|
优化天梯PK连胜标识大小
|
2023-01-07 14:24:57 +08:00 |
|
18142669586
|
43c22fca7c
|
主播PK名字头像新增
|
2022-12-29 15:17:34 +08:00 |
|
18401019693
|
af5d8dbf19
|
修复：直播间内遮盖问题
|
2022-12-20 15:45:24 +08:00 |
|
18401019693
|
b5247df69b
|
完成全服通知功能
|
2022-12-12 14:10:09 +08:00 |
|
|
|
b56368412c
|
Merge branch 'dev_random_pk'
# Conflicts:
# common/src/main/res/values/strings.xml
# config.gradle
# live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
# live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
# live/src/main/java/com/yunbao/live/socket/SocketRyClient.java
|
2022-12-09 09:30:17 +08:00 |
|
|
|
3fa259c5b9
|
优化：调整天梯赛左右下角连胜字样大小
update 随机PK
|
2022-12-08 17:45:21 +08:00 |
|
18401019693
|
4cd4939c58
|
zb端多人Pk合流完成，Pk结束完成
|
2022-12-08 17:29:29 +08:00 |
|
|
|
28b4a36800
|
完成随机PK模块
|
2022-12-07 15:36:23 +08:00 |
|
