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
|
94156e2984
|
Merge branch '直播间提示优化'
# Conflicts:
# config.gradle
|
2024-07-09 13:49:31 +08:00 |
|
Martin
|
eb9f615f70
|
将支付相关的异常抛出，改为异常输出
|
2024-07-09 11:11:05 +08:00 |
|
Martin
|
963fe2c110
|
1、好友邀请守护内容修改
|
2024-07-04 17:59:56 +08:00 |
|
|
|
8cae89e7cd
|
新增礼物墙弹窗主题
|
2024-07-04 13:41:37 +08:00 |
|
|
|
2cefd50ac3
|
配合H5调整部分webView页面
|
2024-07-02 18:06:56 +08:00 |
|
|
|
e0669e98cf
|
新增上报日志功能
|
2024-06-29 10:11:42 +08:00 |
|
Martin
|
8f82c7c785
|
1.直播间游戏提示优化
2.战令经验值购买优化
|
2024-06-28 17:52:41 +08:00 |
|
Martin
|
8c9cf4e3a8
|
[修复首页English分类下，下拉刷新没有数据问题]
|
2024-06-20 17:00:49 +08:00 |
|
|
|
a154f480f6
|
增强配置化打包程序，可有效防止手动打包配置错误
|
2024-06-20 14:02:15 +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 |
|
|
|
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 |
|
Martin
|
419e3a7ab5
|
fix[修复BUG]
|
2024-06-05 13:27:22 +08:00 |
|
Martin
|
6132338c6c
|
fix[声望升级-同步弹窗功能]
|
2024-06-01 14:33:27 +08:00 |
|
Martin
|
19c270ad22
|
fix[声望升级-秒开]
|
2024-06-01 11:16:26 +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
|
ff8e75768e
|
fix[声望升级-修复BUG]
|
2024-05-28 17:12:52 +08:00 |
|
|
|
8d5990c25b
|
调整弹窗逻辑
|
2024-05-28 15:02:15 +08:00 |
|
|
|
c33975fe67
|
优化首页右下角悬浮层隐藏显示问题
调整直播间购买推荐的UI显示不合设计问题
|
2024-05-24 15:45:06 +08:00 |
|
|
|
c033340aad
|
优化首页右下角悬浮层隐藏显示问题
|
2024-05-24 14:49:14 +08:00 |
|
|
|
e36fbdc6b8
|
调整【我的】个性签名中英文判断
|
2024-05-22 13:49: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 |
|
|
|
0ff0cb52f6
|
修复主页战令悬浮问题
调整获取验证码接口设置语言
|
2024-05-14 17:16:28 +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 |
|
|
|
d28d0dd3d7
|
修复测试反馈问题
|
2024-04-29 11:02:23 +08:00 |
|
|
|
651fe12edd
|
新增小助手中英文图标判定
新增消息页图标中英文判定
|
2024-04-26 14:47:58 +08:00 |
|
|
|
d0c0f8f82e
|
新增戰令一鍵領取按鈕
|
2024-04-26 11:11:48 +08:00 |
|
|
|
1f12187766
|
根据测试反馈修改帮助反馈问题
新增小游戏跳一跳回血和必中的回调
新增关闭发红包页面后自动打开礼物栏的功能
调整小游戏跳一跳回调防抖
|
2024-04-26 10:08:19 +08:00 |
|
|
|
1c9493d7c8
|
修改帮助反馈的UI
|
2024-04-24 18:00:46 +08:00 |
|
|
|
34e4765e13
|
修改帮助反馈的UI
|
2024-04-24 17:48:21 +08:00 |
|
|
|
d4d191fad6
|
新增帮助与反馈功能
|
2024-04-24 16:26:47 +08:00 |
|
Martin
|
583740e866
|
add[声望升级-接入美颜]
|
2024-04-18 09:47:38 +08:00 |
|
Martin
|
3f68e2a3aa
|
add[声望升级]
|
2024-04-12 18:29:26 +08:00 |
|
18401019693
|
320584769d
|
修改问题
|
2024-04-11 16:32:21 +08:00 |
|
Martin
|
5922f4c08b
|
add[声望升级]
|
2024-04-10 18:31:00 +08:00 |
|
18401019693
|
2a67cf7228
|
修改问题
|
2024-04-10 09:51:28 +08:00 |
|
hch
|
09bef7afa6
|
add [新增短剧埋点]
|
2024-04-08 13:08:56 +08:00 |
|
18401019693
|
490c558e03
|
自测修复，全服添加主播端
|
2024-04-07 14:39:48 +08:00 |
|
18401019693
|
bbf5d159b4
|
自测修复，全服添加主播端
|
2024-04-07 14:15:41 +08:00 |
|
hch
|
e982994ecd
|
add [首页新增短剧入口]
|
2024-04-07 10:54:24 +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 |
|
|
|
9e5427bd35
|
update 登录接口加中英文标识
|
2024-04-07 09:54:45 +08:00 |
|
18401019693
|
f626ab03d4
|
添加短剧签到
|
2024-04-07 09:40:32 +08:00 |
|
|
|
1f1ac71bb0
|
update 客服webview新增isZh判断
|
2024-04-01 10:56:44 +08:00 |
|
18401019693
|
1e466ac13d
|
Merge branch 'dev_6.6.6_开通守护'
|
2024-03-27 16:19:31 +08:00 |
|
18401019693
|
d37b490088
|
修改测试问题，添加代理和vpn检测的开播检测
|
2024-03-27 16:19:08 +08:00 |
|
18401019693
|
a61bc8fbb8
|
Merge branch 'dev_6.6.6_开通守护'
|
2024-03-27 09:44:56 +08:00 |
|
|
|
9db23a32d1
|
fix [修复直播数量不足且战令关闭情况下，显示角标Banner白屏问题]
update [替换战令角标]
add [从首页Banner进入战令入口]
add [从弹窗进入战令入口]
|
2024-03-26 17:37:26 +08:00 |
|
18401019693
|
5f1eadc47b
|
ui修改
|
2024-03-26 17:27:42 +08:00 |
|
18401019693
|
f94b3f27e3
|
守护团新增红点
|
2024-03-22 14:53:33 +08:00 |
|
18401019693
|
61a966ea41
|
修改直播间内红包和神龙送财的位置首页的位置
|
2024-03-22 11:23:30 +08:00 |
|
18401019693
|
5dff64ec99
|
修改测试问题，对接H5页面
|
2024-03-21 18:13:24 +08:00 |
|
18401019693
|
d72a9a39c6
|
修改测试问题
|
2024-03-20 16:29:37 +08:00 |
|
18401019693
|
0317b339f8
|
修改测试问题,新增直播列表页面的神龙送财的图标
|
2024-03-20 15:19:53 +08:00 |
|
18401019693
|
3b6d586b58
|
神龙送财开启接口。展示直播间神龙送财点击参与的图标
|
2024-03-14 10:44:40 +08:00 |
|
18401019693
|
50b6deaf01
|
對接開通接口神龍送財的im消息
|
2024-03-13 11:18:26 +08:00 |
|
18401019693
|
6870037683
|
新版守护，空页面，列表页面。守护类型开通页面。开通时间页面
|
2024-03-06 14:24:04 +08:00 |
|
hch
|
8af7f907eb
|
守护弹窗
|
2024-03-04 14:51:07 +08:00 |
|
|
|
f7845dde6f
|
修复找回密码后无法登陆的问题
|
2024-02-26 16:04:47 +08:00 |
|
|
|
ae9ef1f8a1
|
新增守护测试页面
|
2024-02-26 14:41:01 +08:00 |
|
|
|
df735af252
|
新增短剧页面的开播提醒浮窗
|
2024-02-17 13:43:30 +08:00 |
|
18401019693
|
b3a02f8c2c
|
短剧页面关闭直播小窗
|
2024-02-16 10:30:35 +08:00 |
|
|
|
22769b981d
|
移除埋点空格
|
2024-01-31 10:25:54 +08:00 |
|
|
|
aef0435b93
|
战令相关UI调整
|
2024-01-26 16:18:23 +08:00 |
|
|
|
9cc30186cd
|
战令相关UI调整
|
2024-01-26 14:10:54 +08:00 |
|
|
|
f99641ed35
|
战令相关UI调整
|
2024-01-26 13:42:38 +08:00 |
|
hch
|
e7ef492015
|
调整UI
|
2024-01-26 10:18:58 +08:00 |
|
|
|
1aa6cb8f55
|
修复测试反馈问题
|
2024-01-25 16:38:44 +08:00 |
|
|
|
dc87fc7048
|
修复测试反馈问题
|
2024-01-25 14:15:46 +08:00 |
|
|
|
a4ce44d9ba
|
提交战令英文版入口图标
修复测试反馈问题
移除测试点
|
2024-01-25 11:40:13 +08:00 |
|
|
|
469e3e30ad
|
调整战令首页入口图片
|
2024-01-24 18:27:15 +08:00 |
|
|
|
50fb801cf7
|
新增一个测试点
|
2024-01-24 14:52:44 +08:00 |
|
|
|
5a32047c6d
|
调整客服WebView
新增客服url判断链接
|
2024-01-24 14:43:31 +08:00 |
|
|
|
0c07e8c2be
|
Merge remote-tracking branch 'origin/master'
|
2024-01-24 11:30:26 +08:00 |
|
|
|
78d870ed89
|
update
|
2024-01-24 10:45:07 +08:00 |
|
18401019693
|
c00afb1db0
|
优化
|
2024-01-24 09:53:13 +08:00 |
|
hch
|
a920b61bc4
|
Merge remote-tracking branch 'origin/master'
|
2024-01-23 17:49:44 +08:00 |
|
hch
|
3effb630c5
|
去掉短剧页面的顶部状态栏，修复闪退bug
|
2024-01-23 17:49:37 +08:00 |
|
|
|
0e596e9be9
|
修复测试反馈BUG
|
2024-01-23 17:33:55 +08:00 |
|
hch
|
0a70cc027f
|
埋点-短剧
|
2024-01-23 16:09:51 +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 |
|
|
|
feb08e1759
|
调整webView
调整客服页面
|
2024-01-19 10:51:44 +08:00 |
|
|
|
16755a9c8c
|
调整webView
调整客服页面
|
2024-01-19 10:43:40 +08:00 |
|
|
|
52c561fa08
|
修改战令入口颜色
|
2024-01-18 18:22:41 +08:00 |
|
|
|
45f471055e
|
調整戰令相關UI
|
2024-01-18 16:20:55 +08:00 |
|
hch
|
6ff6cbbe6b
|
Merge branch 'master' into pdlive_samsung
# Conflicts:
# config.gradle
# live/src/main/java/com/yunbao/live/views/SystemMessageViewHolder.java
|
2024-01-18 14:56:27 +08:00 |
|
hch
|
65d38de73c
|
修复 点击去支付无反应 问题
|
2024-01-18 14:48:49 +08:00 |
|
|
|
a8a1aa2e71
|
调整战令奖励列表的渲染
更改战令获取金币接口
|
2024-01-18 10:57:21 +08:00 |
|
|
|
2857127285
|
调整战令页面间距
修复【战令余额不足未跳转充值页面】问题
修复【战令开通等级时弹框金额偶尔不显示问题】
调整战令获取金额接口
调整战令item名字显示模式
调整战令购买经验弹框显示
|
2024-01-17 16:21:25 +08:00 |
|
hch
|
a307e6f864
|
修复 点击去支付无反应 问题
|
2024-01-15 17:24:07 +08:00 |
|
hch
|
b5c8f14994
|
Merge remote-tracking branch 'origin/master'
|
2024-01-15 17:11:40 +08:00 |
|
hch
|
34323fd983
|
修复首页直播通行证展示问题
|
2024-01-15 17:11:24 +08:00 |
|
|
|
54693c0d37
|
修复【升级战令未刷新钻石余额】的问题
|
2024-01-15 13:33:53 +08:00 |
|
hch
|
27f136d6ca
|
修复首页直播通行证展示问题
|
2024-01-15 10:49:23 +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
|
a036e5eff6
|
语音房接口添加
|
2024-01-11 15:15:21 +08:00 |
|
|
|
d629ee3f9f
|
修复切到其他页面后短剧不会暂停播放的问题
修复短剧购买卷重复弹出对话框问题
|
2024-01-09 17:31:13 +08:00 |
|
|
|
df0d9795ed
|
调整客服页面返回键交给h5处理（含系统按键/手势）
统一客服页面为同一个WebView
调整短剧与社区使用原生分开加载
调整送礼-包裹接口为新接口
调整粉丝团礼物送礼为新接口
修复战令-兑换-列表页面在名字过长晴空下高度不统一
|
2024-01-09 16:42:09 +08:00 |
|
|
|
1759757176
|
调整客服页面返回键交给h5处理（含系统按键/手势）
统一客服页面为同一个WebView
调整短剧与社区使用原生分开加载
调整送礼-包裹接口为新接口
调整粉丝团礼物送礼为新接口
修复战令-兑换-列表页面在名字过长晴空下高度不统一
|
2024-01-09 16:37:43 +08:00 |
|
|
|
b175e42ee1
|
新增戰令入口
調整戰令UI顯示不全問題
|
2024-01-05 17:30:11 +08:00 |
|
|
|
6cdc648ea9
|
修复战令购买后未刷新UI问题
|
2024-01-05 16:37:04 +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 |
|
18401019693
|
aad607ace8
|
删除老的用户等级主播等级的图标
|
2024-01-04 15:07:12 +08:00 |
|
18401019693
|
418073f07e
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2024-01-04 10:35:51 +08:00 |
|
18401019693
|
319295de57
|
接口 改造
|
2024-01-04 10:35:42 +08:00 |
|
|
|
fbb801bf62
|
调整战令接口
调整战令购买等级最大值
新增战令统计直播间发送消息接口
|
2023-12-26 18:24:46 +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 |
|
|
|
924afce81e
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-22 14:32:33 +08:00 |
|
|
|
48dcfd4a04
|
新增战令系统
|
2023-12-22 14:32:18 +08:00 |
|
18401019693
|
163ab1c80d
|
隐藏测试按钮
|
2023-12-22 13:36:09 +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 |
|
|
|
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
|
7b103aaf7c
|
添加开通接口弹窗回调添加
|
2023-12-20 16:27:22 +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 |
|
hch
|
9d543f2211
|
Merge remote-tracking branch 'origin/master' into pdlive_samsung
# Conflicts:
# config.gradle
# main/src/main/java/com/yunbao/main/activity/GoogleFragment.java
|
2023-12-19 09:41:04 +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 |
|
|
|
728dec9d97
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-18 16:34:19 +08:00 |
|
18401019693
|
f65c698602
|
短剧 CookieManager cookieManager = CookieManager.getInstance(); if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
{
cookieManager.setAcceptThirdPartyCookies(mainWv, true);
} else{
cookieManager.setAcceptCookie(true);
}
|
2023-12-18 15:30:29 +08:00 |
|
18401019693
|
215a2f8927
|
战令等级
|
2023-12-18 15:18:42 +08:00 |
|
hch
|
a21352302b
|
三星内购调用
|
2023-12-15 18:29:12 +08:00 |
|
18401019693
|
302b789970
|
多人Pk问题
|
2023-12-15 14:03:42 +08:00 |
|
|
|
58ace7d613
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-15 09:49:17 +08:00 |
|
hch
|
c723e14182
|
三星内购调用
|
2023-12-14 18:28:39 +08:00 |
|
18401019693
|
3982afb0d3
|
弹窗整合
|
2023-12-14 17:39:05 +08:00 |
|
