Martin
|
152848a04f
|
Merge branch 'master' into dev_680_礼物展馆
# Conflicts:
# 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
# gradle.properties
# live/build.gradle
|
2024-07-17 09:53:22 +08:00 |
|
|
|
7fc1c2e712
|
update 礼物墙
|
2024-07-16 17:24:42 +08:00 |
|
|
|
7a6dfe5a3d
|
update 礼物墙
|
2024-07-16 16:39:30 +08:00 |
|
Martin
|
96c45820b0
|
荣誉成就
|
2024-07-16 16:11:27 +08:00 |
|
|
|
ac18150503
|
update 礼物墙
|
2024-07-16 11:15:12 +08:00 |
|
Martin
|
22b208bcd9
|
新增直播间冠名礼物特效
|
2024-07-16 10:31:18 +08:00 |
|
Martin
|
484069dac7
|
冠名礼物
|
2024-07-15 10:13:36 +08:00 |
|
|
|
ade837e85c
|
update 礼物墙 调整间距
|
2024-07-15 10:06:06 +08:00 |
|
|
|
12a1f24101
|
update 礼物墙 布局
|
2024-07-15 09:47:12 +08:00 |
|
|
|
250d4832a3
|
update 礼物墙 布局文件
|
2024-07-13 21:45:10 +08:00 |
|
Martin
|
93db808f8b
|
佈局
|
2024-07-13 17:49:07 +08:00 |
|
Martin
|
59f0fa4acb
|
佈局
|
2024-07-13 17:02:59 +08:00 |
|
|
|
8fe6130c81
|
update 礼物墙
|
2024-07-13 16:51:37 +08:00 |
|
18142669586
|
90bc70ebf7
|
Merge remote-tracking branch 'origin/master'
|
2024-07-13 10:38:03 +08:00 |
|
18142669586
|
4618c0a4f1
|
升级34 grd8.0
|
2024-07-13 10:37:37 +08:00 |
|
|
|
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
|
eb9f615f70
|
将支付相关的异常抛出，改为异常输出
|
2024-07-09 11:11:05 +08:00 |
|
Martin
|
3dcc801331
|
1、開通守護-使用優惠券
|
2024-07-05 13:58:35 +08:00 |
|
Martin
|
963fe2c110
|
1、好友邀请守护内容修改
|
2024-07-04 17:59:56 +08:00 |
|
|
|
9c38f40098
|
调整礼物墙tab
|
2024-07-04 15:02:41 +08:00 |
|
|
|
8cae89e7cd
|
新增礼物墙弹窗主题
|
2024-07-04 13:41:37 +08:00 |
|
Martin
|
a68bee94a9
|
直播间侧边栏美化
|
2024-07-03 15:21:32 +08:00 |
|
Martin
|
40a2843696
|
守护榜页面需美化
|
2024-07-03 11:21:25 +08:00 |
|
|
|
2cefd50ac3
|
配合H5调整部分webView页面
|
2024-07-02 18:06:56 +08:00 |
|
Martin
|
833b58d311
|
1、游戏房间界面需美化
|
2024-07-02 14:40:36 +08:00 |
|
Martin
|
f14fb4612b
|
1、直播间-互动游戏角标优化
|
2024-07-01 16:55:46 +08:00 |
|
|
|
3510a565f2
|
调整HTTP日志输出
|
2024-07-01 09:57:39 +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
|
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 |
|
|
|
5ae55f87fa
|
修复声网直播间会白屏问题
调整模块间的引用
|
2024-06-11 14:08:45 +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
|
419e3a7ab5
|
fix[修复BUG]
|
2024-06-05 13:27:22 +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 |
|
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 |
|
|
|
599e88acc6
|
替换友盟为本地aar
调整小游戏为繁体中文
|
2024-05-08 09:52:35 +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 |
|
|
|
d28d0dd3d7
|
修复测试反馈问题
|
2024-04-29 11:02:23 +08:00 |
|
|
|
150bdba795
|
完成小游戏直播间半屏内容
|
2024-04-26 18:04:16 +08:00 |
|
|
|
651fe12edd
|
新增小助手中英文图标判定
新增消息页图标中英文判定
|
2024-04-26 14:47:58 +08:00 |
|
