|
|
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
|
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 |
|
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 |
|
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
|
f131fcf546
|
add[主播端，整蛊礼物，待完成项完成]
|
2024-06-12 16:44:46 +08:00 |
|
Martin
|
0425b56106
|
add[整蛊翻译]
|
2024-06-11 16:55:07 +08:00 |
|
|
|
b5417f90b4
|
调整弹窗
|
2024-06-03 09:41:51 +08:00 |
|
Martin
|
6132338c6c
|
fix[声望升级-同步弹窗功能]
|
2024-06-01 14:33:27 +08:00 |
|
|
|
98095e07ee
|
调整弹窗
|
2024-06-01 14:00:48 +08:00 |
|
|
|
0396e2d06d
|
调整弹窗
|
2024-06-01 11:06:40 +08:00 |
|
|
|
186b9d61ee
|
調整主播端設置整蠱UI
|
2024-05-31 15:06:35 +08:00 |
|
|
|
8d5990c25b
|
调整弹窗逻辑
|
2024-05-28 15:02:15 +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
|
93dbee14b3
|
add[声望升级-修复BUG]
|
2024-05-15 15:55:31 +08:00 |
|
|
|
2093306d36
|
修复测试反馈问题
调整小助手、机器人图标
调整PD一号的IM消息
调整PD一号的红包UI
调整翻译
|
2024-05-05 16:13:28 +08:00 |
|
|
|
d28d0dd3d7
|
修复测试反馈问题
|
2024-04-29 11:02:23 +08:00 |
|
|
|
34e4765e13
|
修改帮助反馈的UI
|
2024-04-24 17:48:21 +08:00 |
|
18401019693
|
f88356cea2
|
修改问题
|
2024-04-10 10:31:21 +08:00 |
|
18401019693
|
a100ab1a4a
|
修改问题
|
2024-04-09 13:04:42 +08:00 |
|
18401019693
|
490c558e03
|
自测修复，全服添加主播端
|
2024-04-07 14:39:48 +08:00 |
|
hch
|
a0294a8405
|
Merge remote-tracking branch 'origin/master'
|
2024-04-07 10:05:51 +08:00 |
|
hch
|
756cbb1ce1
|
add [首页新增短剧入口]
|
2024-04-07 10:05:40 +08:00 |
|
18401019693
|
f626ab03d4
|
添加短剧签到
|
2024-04-07 09:40:32 +08:00 |
|
18401019693
|
0d7bdce4f0
|
修改守护问题，添加全服通知功能
|
2024-04-03 16:05:53 +08:00 |
|
18401019693
|
4a4a52aa61
|
修改守护列表页标签展示
|
2024-03-29 15:16:27 +08:00 |
|
18401019693
|
de11b5123d
|
ui修改
|
2024-03-26 15:03:08 +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
|
0317b339f8
|
修改测试问题,新增直播列表页面的神龙送财的图标
|
2024-03-20 15:19:53 +08:00 |
|
18401019693
|
4fabf3aba3
|
修改测试问题
|
2024-03-20 13:40:30 +08:00 |
|
18401019693
|
859810f1f6
|
守护的全服通知，修改测试问题
|
2024-03-19 15:32:04 +08:00 |
|
18401019693
|
53f389ddc8
|
守護等級的檢查接口，領取接口。相關頁面的請求添加。h5方法新鄭
|
2024-03-18 14:52:24 +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 |
|
hch
|
85b4facfe8
|
调整UI
|
2024-01-26 17:04:11 +08:00 |
|
|
|
f99641ed35
|
战令相关UI调整
|
2024-01-26 13:42:38 +08:00 |
|
18401019693
|
7ab4081f0b
|
優化頁面
|
2024-01-26 10:45:15 +08:00 |
|
hch
|
e7ef492015
|
调整UI
|
2024-01-26 10:18:58 +08:00 |
|
18401019693
|
dfca615735
|
优化
|
2024-01-23 17:50:31 +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
|
004a5b2a53
|
优化
|
2024-01-23 11:14:58 +08:00 |
|
18401019693
|
64f9cee3af
|
优化
|
2024-01-23 09:50:34 +08:00 |
|
|
|
45f471055e
|
調整戰令相關UI
|
2024-01-18 16:20:55 +08:00 |
|
hch
|
5b813aff88
|
修改UI
|
2024-01-17 11:12:53 +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 |
|
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 |
|
18401019693
|
a036e5eff6
|
语音房接口添加
|
2024-01-11 15:15:21 +08:00 |
|
18401019693
|
926a1a3cb6
|
语音房添加
|
2024-01-10 15:48:10 +08:00 |
|
hch
|
661c2fd334
|
推送管理
|
2024-01-09 14:52:27 +08:00 |
|
|
|
0a6b210a76
|
修复合并重复问题
|
2024-01-05 14:09:08 +08:00 |
|
|
|
43d1abbae0
|
Merge branch 'dev_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
# config.gradle
|
2024-01-05 14:00:39 +08:00 |
|
|
|
4a5e581978
|
新增战令购买经验对话框经验条上加入经验文本
|
2024-01-05 13:57:55 +08:00 |
|
hch
|
dcf3f5c308
|
推送管理
|
2024-01-03 18:28:49 +08:00 |
|
18401019693
|
44601c74b4
|
隐藏测试按钮
|
2023-12-23 16:39:58 +08:00 |
|
|
|
2808e41288
|
修复测试反馈问题
|
2023-12-23 14:14:32 +08:00 |
|
|
|
05aea2448f
|
修复测试反馈问题
|
2023-12-23 11:01:28 +08:00 |
|
|
|
34986d6897
|
修复测试反馈问题
|
2023-12-23 09:59:30 +08:00 |
|
|
|
48dcfd4a04
|
新增战令系统
|
2023-12-22 14:32:18 +08:00 |
|
|
|
e06f944def
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-22 10:08:35 +08:00 |
|
18401019693
|
a5d546d1d1
|
兑换奖励接口
|
2023-12-22 10:07:47 +08:00 |
|
|
|
1304ec6cde
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-21 16:26:04 +08:00 |
|
18401019693
|
f46d14ce28
|
购买经验
|
2023-12-21 15:24:43 +08:00 |
|
|
|
a56a5849fe
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-20 17:49:30 +08:00 |
|
18401019693
|
1495bfee99
|
兌換詳情弹窗
|
2023-12-20 17:37:18 +08:00 |
|
|
|
61ee585ae9
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-20 16:27:44 +08:00 |
|
18401019693
|
9eba98f709
|
添加开通接口弹窗回调添加
|
2023-12-20 16:26:24 +08:00 |
|
|
|
dea3264577
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-20 16:17:37 +08:00 |
|
18401019693
|
42cfcce1dc
|
添加开通接口弹窗回调添加
|
2023-12-20 15:28:41 +08:00 |
|
hch
|
f697e650a8
|
更新
|
2023-12-19 18:29:48 +08:00 |
|
18401019693
|
ac78268a85
|
活动结束弹窗
|
2023-12-19 15:59:55 +08:00 |
|
|
|
d001712067
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-18 16:54:05 +08:00 |
|
18401019693
|
dc28a3d81e
|
zhanling dengji
|
2023-12-18 16:53:37 +08:00 |
|
