Martin
|
1a2db91ceb
|
Merge branch 'master' into dev_6.7.0
|
2024-06-17 10:55:47 +08:00 |
|
|
a7421ba1a6
|
修复暂时离开功能无效问题
调整购买守护的动画效果
|
2024-06-16 11:09:10 +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 |
|
Martin
|
45ae3b1624
|
add[轮盘整蛊]
|
2024-06-14 17:39:42 +08:00 |
|
Martin
|
e874c2ee16
|
add[修復BUG,新增整蛊IM消息类型]
|
2024-06-14 15:40:51 +08:00 |
|
|
020b5c1025
|
同步潘多拉修复代码
|
2024-06-13 16:06:21 +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 |
|
Martin
|
f131fcf546
|
add[主播端,整蛊礼物,待完成项完成]
|
2024-06-12 16:44:46 +08:00 |
|
Martin
|
0425b56106
|
add[整蛊翻译]
|
2024-06-11 16:55:07 +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 |
|
余前卫
|
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 |
|
|
73847c46a3
|
修复游戏房发言重复/不显示问题
修复贵族不显示英文问题
|
2024-06-07 14:50:39 +08:00 |
|
Martin
|
b7c53a3b21
|
add[整蛊礼物接口调用、整蛊说明]
|
2024-06-06 18:29:31 +08:00 |
|
|
c91947ce71
|
配置化声网AppId
|
2024-06-05 16:37:24 +08:00 |
|
Martin
|
62e50ae310
|
fix[声网APPId]
|
2024-06-05 16:06:04 +08:00 |
|
Martin
|
5baea0f156
|
fix[修复-游戏房消息问题]
|
2024-06-05 15:12:35 +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
|
6132338c6c
|
fix[声望升级-同步弹窗功能]
|
2024-06-01 14:33:27 +08:00 |
|
Martin
|
a061637492
|
fix[声望升级-去掉多人PK,展示主播信息延迟代码]
|
2024-06-01 14:24:10 +08:00 |
|
|
98095e07ee
|
调整弹窗
|
2024-06-01 14:00:48 +08:00 |
|
|
9764b3370e
|
调整弹窗
|
2024-06-01 13:13:33 +08:00 |
|
18142669586
|
ce9336737f
|
新增声网正式服环境
|
2024-06-01 11:07:00 +08:00 |
|
|
0396e2d06d
|
调整弹窗
|
2024-06-01 11:06:40 +08:00 |
|
Martin
|
39cf76439f
|
fix[声望升级-APPID 更换存储位置]
|
2024-06-01 10:32:32 +08:00 |
|
Martin
|
c4d378daba
|
fix[声望升级-修复BUG]
|
2024-05-31 20:59:16 +08:00 |
|
18142669586
|
d3de01666c
|
修改上下滑动黑
|
2024-05-31 19:01:41 +08:00 |
|
|
186b9d61ee
|
調整主播端設置整蠱UI
|
2024-05-31 15:06:35 +08:00 |
|
|
b7c0f5d3ec
|
调整战令图标改为通过接口获取
|
2024-05-31 10:31:14 +08:00 |
|
|
949c0ab759
|
调整弹窗、签到弹窗、更新弹窗优先级
|
2024-05-31 10:31:14 +08:00 |
|
|
ab24348f72
|
调整弹窗展示逻辑
|
2024-05-30 15:14:52 +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 |
|
|
c92e8dd8bc
|
调整弹窗逻辑
|
2024-05-28 17:12:38 +08:00 |
|
18142669586
|
01dfb81a46
|
点击【邀请】加上防抖的功能
|
2024-05-28 16:58:39 +08:00 |
|
|
8d5990c25b
|
调整弹窗逻辑
|
2024-05-28 15:02:15 +08:00 |
|
Martin
|
cf48be7d15
|
fix[声望升级-修复BUG]
|
2024-05-28 13:44:44 +08:00 |
|
|
bc63a3e601
|
新增【全服公告优化】
|
2024-05-27 13:48:52 +08:00 |
|
|
c33975fe67
|
优化首页右下角悬浮层隐藏显示问题
调整直播间购买推荐的UI显示不合设计问题
|
2024-05-24 15:45:06 +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
|
6a4ac35203
|
add[声望升级-AB面]
|
2024-05-18 14:36:35 +08:00 |
|
Martin
|
93dbee14b3
|
add[声望升级-修复BUG]
|
2024-05-15 15:55:31 +08:00 |
|