|
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
|
eb9f615f70
|
将支付相关的异常抛出,改为异常输出
|
2024-07-09 11:11:05 +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
|
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 |
|