Commit Graph

2529 Commits

Author SHA1 Message Date
45257e8fe1 Merge branch 'master' into dev_pkrank
# Conflicts:
#	common/src/main/java/com/yunbao/common/http/PDLiveApi.java
2022-11-16 11:22:35 +08:00
18401019693
85971339d4 侧边栏修改 2022-11-15 16:03:41 +08:00
18401019693
383e8c0859 悬浮窗修改 2022-11-15 13:54:28 +08:00
749ac197de 新增PK TOP 2022-11-15 11:35:03 +08:00
d20210f291 创建PK排位赛分支 2022-11-15 09:53:15 +08:00
18401019693
da3398f1f9 侧边栏修改 2022-11-14 16:54:42 +08:00
81763110d7 Merge remote-tracking branch 'origin/master' 2022-11-14 15:38:34 +08:00
6ac610e1aa Merge branch 'dev_room'
# Conflicts:
#	live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
2022-11-14 15:27:55 +08:00
18401019693
362cc3814e 领取任务奖励逻辑 2022-11-14 15:20:12 +08:00
37dfa05a25 调整靓号icon 2022-11-14 13:57:28 +08:00
18401019693
2df205218c 用户等级和粉丝团的更改 2022-11-14 11:44:10 +08:00
18401019693
cceb697739 充值逻辑 2022-11-12 18:00:00 +08:00
7d63869d44 调整 隐藏我的-我的等级,webview的title 2022-11-12 17:52:01 +08:00
3b1cecf8a3 Merge remote-tracking branch 'origin/master' 2022-11-12 17:09:20 +08:00
e52ec4a2b8 调整日志收集 2022-11-12 17:08:58 +08:00
18401019693
ed300eec30 Js调用原生整改 2022-11-12 17:08:48 +08:00
8455c360fc 调整日志收集的参数 2022-11-12 16:56:02 +08:00
059bfaf1d9 调整日志收集的参数 2022-11-12 16:44:06 +08:00
18401019693
9f0b6897f1 Js调用原生整改,主播踢人不退出房间问题修改 2022-11-12 16:05:04 +08:00
2119d75e5b 补充个人名片主播端踢人选项 2022-11-12 15:48:45 +08:00
af39c4bac0 调整日志输出格式
调整个人名片-工会大小
2022-11-12 15:09:49 +08:00
93ac837148 调整礼物支付默认跳转页面为【钻石】 2022-11-12 13:44:28 +08:00
c4f3d10419 补充日志分享为打包压缩文件 2022-11-12 13:35:29 +08:00
3f9cf21b8f 全量日志采集系统改为保存三天内的 2022-11-12 11:32:11 +08:00
e9a8a4dc02 Merge remote-tracking branch 'origin/master' 2022-11-12 09:58:35 +08:00
18401019693
84f352a7fb Js调用原生整改 2022-11-11 18:32:35 +08:00
834170e272 新增全量日志采集系统 2022-11-11 17:47:28 +08:00
042f53e134 tmp 2022-11-11 15:04:02 +08:00
0b041bad7b 修复多人PK接收方次数用完依旧会加入的问题 2022-11-11 14:04:58 +08:00
fe124dad0c 调整支付页面H5可缩放 2022-11-11 11:39:49 +08:00
18401019693
7fe7178b27 小菜单的展开 2022-11-11 11:38:46 +08:00
18401019693
9dcc23960e 小菜单的展开 2022-11-11 09:53:10 +08:00
18401019693
140e5740e6 任务 2022-11-10 17:04:06 +08:00
18401019693
752fae680c 趣味活动 2022-11-10 16:41:27 +08:00
e2f8e52583 修复一处PK中的空指针问题 2022-11-10 15:14:17 +08:00
4d573767f7 Merge remote-tracking branch 'origin/master' 2022-11-10 15:04:59 +08:00
56475e729c 禁止PK过程中主播点离开按钮 2022-11-10 15:04:42 +08:00
8f0a1a09a6 修复关闭小窗时部分机型闪退问题 2022-11-10 14:55:27 +08:00
18401019693
c6b8b61b1e 权益 2022-11-10 14:40:06 +08:00
862295ff03 修复热度加gif不播放问题 2022-11-10 14:30:54 +08:00
18401019693
d13e42e33d 猜你喜欢 2022-11-10 13:48:08 +08:00
134cdf2e2a 调整个人名片 2022-11-10 13:22:40 +08:00
44a05ea0d5 调整个人名片 2022-11-10 11:17:04 +08:00
7f34c50b71 Merge remote-tracking branch 'origin/master' 2022-11-10 11:12:22 +08:00
18401019693
77682d310a 语音听写修改 2022-11-10 10:56:51 +08:00
2b0846f939 Merge remote-tracking branch 'origin/master' 2022-11-09 18:30:59 +08:00
18401019693
0b6c188e0a 侧边栏:侧边栏界面完成,文字消息更改 2022-11-09 18:27:41 +08:00
f51f440b43 Merge remote-tracking branch 'origin/master' 2022-11-09 17:42:55 +08:00
18401019693
f74a01efc0 侧边栏:权益 2022-11-09 17:02:02 +08:00
6dafa64e0b Merge remote-tracking branch 'origin/master' 2022-11-09 16:19:07 +08:00