Commit Graph

592 Commits

Author SHA1 Message Date
9b37374066 新增PK TOP 2022-11-16 11:27:44 +08:00
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
749ac197de 新增PK TOP 2022-11-15 11:35:03 +08:00
d20210f291 创建PK排位赛分支 2022-11-15 09:53:15 +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
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
18401019693
ed300eec30 Js调用原生整改 2022-11-12 17:08:48 +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
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
18401019693
7fe7178b27 小菜单的展开 2022-11-11 11:38:46 +08:00
18401019693
9dcc23960e 小菜单的展开 2022-11-11 09:53:10 +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
18401019693
c6b8b61b1e 权益 2022-11-10 14:40:06 +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
8eae2c29ae 修复:直播准备页面切换摄像头可能失效问题
修复:直播准备页面美颜-美肤可能无效问题
2022-11-09 15:09:37 +08:00
1eee54fef1 修复:多人PK次数已用完再接受PK邀请会闪退问题 2022-11-09 13:43:04 +08:00
1fc417ec25 Merge branch 'dev_userCard'
# Conflicts:
#	main/src/main/java/com/yunbao/main/activity/MainActivity.java
2022-11-09 11:01:45 +08:00
71713e5b37 完成新个人名片
完成直播间主播靓号标识
2022-11-09 11:00:49 +08:00
18401019693
ef4c377990 侧边栏 2022-11-09 09:47:04 +08:00
88e27df986 调整融云推流参数 2022-11-09 09:44:18 +08:00
5ed5b15737 udpate 2022-11-08 16:50:37 +08:00
783685942c 调整推流设置 2022-11-08 16:11:14 +08:00
30c09b0e26 修复开播后直播准备界面还存在的问题 2022-11-08 14:07:17 +08:00
96f21643b4 update 2022-11-08 13:53:24 +08:00
977067eda5 Merge remote-tracking branch 'origin/master' 2022-11-08 13:28:05 +08:00
3e7279b4de 修复直播设置密码房无反应问题 2022-11-08 13:27:56 +08:00
34dd3ca883 update 2022-11-08 13:17:35 +08:00
18401019693
d0d36ef207 语音转文字,上拉加载 2022-11-08 13:12:08 +08:00
a66a32038c update 2022-11-08 11:38:20 +08:00
80d5bf3007 修复主播端开播Banner没活动问题 2022-11-08 11:03:06 +08:00
cb39253785 优化主播端更新心愿单刷新banner 2022-11-08 10:57:06 +08:00
3ec3350c97 Merge remote-tracking branch 'origin/master' 2022-11-08 10:16:40 +08:00
7a01f62490 优化room为空时开播的提示 2022-11-08 10:15:55 +08:00
4a6bb9fd56 修复美颜卡住问题 2022-11-08 10:12:57 +08:00
40532a0972 update 个人名片 2022-11-07 17:39:52 +08:00
18401019693
e059d9bbb2 手机开播问题修复 2022-11-07 17:33:42 +08:00
ab953b4785 update 2022-11-07 16:48:16 +08:00
18401019693
6e38ef2962 发送和进入房间错误弹出 2022-11-07 14:51:44 +08:00
18401019693
6656aebff9 悬浮窗和开播离开 2022-11-04 14:58:40 +08:00
50b598d8a1 移除主播直播间观众列表与守护列表的购买界面 2022-11-03 17:28:50 +08:00
cf08f8197b 主播直播间新增右下角Banner 2022-11-03 16:06:18 +08:00
b3e9836d7c Merge remote-tracking branch 'origin/master' 2022-11-03 14:47:24 +08:00
c3c91ba9a2 修复滑动直播间不显示离开图 2022-11-03 14:47:06 +08:00
18401019693
1075f7252a 修改主题颜色 2022-11-03 14:45:51 +08:00
302435c068 修复开播时可能的空指针错误 2022-11-03 10:39:18 +08:00
18401019693
c57486b69c 修改用户等级 2022-11-02 18:11:38 +08:00
18401019693
0f2fbeb114 修改粉丝团 2022-11-02 14:20:25 +08:00
18401019693
a50abb5b2c 主播等级 2022-11-01 16:38:38 +08:00
18401019693
2102acd9e5 测试修改 2022-11-01 16:10:58 +08:00
18401019693
b8ee197e52 红点通知 2022-11-01 14:52:44 +08:00
18401019693
6841f47ac3 修改主播等级 2022-11-01 14:46:06 +08:00
a2fef0990a Merge branch '6.4.4_fix_wish'
# Conflicts:
#	config.gradle
2022-11-01 11:28:38 +08:00
9e411ecd71 修复送礼主播会闪退问题(心愿单id冲突) 2022-11-01 11:26:49 +08:00
8d14c06284 播放前移除播放尾帧 2022-11-01 11:00:17 +08:00
8b3f8d783e 修复自动消息重复发送的问题 2022-10-31 17:53:31 +08:00
b5ebc085b4 还原成腾讯播放器 2022-10-31 17:53:09 +08:00
7e169e882d 直播间内存优化稳定到0.7G左右 2022-10-31 16:41:28 +08:00
50f83939cc test 2022-10-31 15:55:52 +08:00
f856188a68 改为EXOPlayer 2022-10-31 15:48:42 +08:00
18401019693
12f78dc3b8 添加版本号 2022-10-31 10:06:26 +08:00
73fb523ddc 修改礼物弹框高度 2022-10-31 10:00:49 +08:00
09687fb318 幸运天使点击气泡弹名牌框 2022-10-29 16:54:17 +08:00
18401019693
a632e48d38 关播页面 2022-10-29 15:58:14 +08:00
18401019693
6efd2898d7 关播页面 2022-10-29 14:31:53 +08:00
18401019693
a7c48675af 修改图片 2022-10-29 13:49:14 +08:00
18401019693
7e9d2917b6 修改图片 2022-10-29 13:44:48 +08:00
18401019693
cb118e4a9f 测试修改 2022-10-28 18:09:52 +08:00
18401019693
6e582829b2 测试修改 2022-10-28 18:06:05 +08:00
30902825d6 恢复新人特惠代码,从banner进直播间需要打开新人特惠 2022-10-28 17:51:59 +08:00
40cd824389 Merge remote-tracking branch 'origin/master' 2022-10-28 16:03:27 +08:00
fd687ab2d5 修复Banner连点多开问题 2022-10-28 16:03:12 +08:00
18401019693
bab377a202 测试修改 2022-10-28 15:59:56 +08:00
f1554f8201 修复心愿单Banner连点多开问题 2022-10-28 15:50:10 +08:00
81933f0ad7 修复活动Banner加载框不消失的问题 2022-10-28 15:45:05 +08:00
18401019693
a16ae482a8 测试修改 2022-10-28 15:03:50 +08:00
18401019693
b688e671c1 测试修改 2022-10-28 15:00:56 +08:00
476caa4be3 修复心愿单链接 2022-10-28 14:26:03 +08:00
d04a44044c 修复活动tab没带活动id 2022-10-28 13:55:51 +08:00
b394a8f9b5 修复firebase反馈的空指针问题 2022-10-28 13:50:34 +08:00
07ae094bed 修复firebase反馈的空指针问题 2022-10-28 13:12:39 +08:00
18401019693
4be0148324 测试修改 2022-10-28 11:14:02 +08:00