yutou/pandorapan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,144 Commits 18 Branches 0 Tags 419 MiB
6fcb194995
Commit Graph

506 Commits

Author SHA1 Message Date
zlzw
26f02065df update 随机PK 新增请求连麦超时管理 2022-12-10 16:08:04 +08:00
zlzw
eef852c283 Merge branch 'dev_random_pk' 2022-12-10 15:03:00 +08:00
zlzw
e0287899f8 update 随机PK RTC控制器新增超时管理 2022-12-10 15:01:24 +08:00
zlzw
ae020b105a update 随机PK 修复返回uid为空时未进行下一轮PK问题 2022-12-10 15:00:48 +08:00
zlzw
3a75e24601 update 随机PK 补充拒绝PK后的对话框 2022-12-10 14:58:50 +08:00
zlzw
e28c393f88 update 随机PK 移除测试延迟代码 2022-12-10 14:58:01 +08:00
zlzw
c056dfe246 update 自由PK 2022-12-10 14:55:03 +08:00
zlzw
3747f214b1 *新增长按随机PK【开始匹配】按钮可输入指定UIDPk的测试模式 2022-12-10 14:47:37 +08:00
zlzw
4a84283000 update 随机PK 调整拒绝PK回报服务器的时机 2022-12-09 17:19:50 +08:00
zlzw
8d3ac7761f update 随机PK 移除测试延迟代码 2022-12-09 16:58:20 +08:00
18401019693
afed0c8833 修改用户端多人PK视频顺序 2022-12-09 16:40:42 +08:00
zlzw
415ed2fc9b update 自由PK 2022-12-09 16:39:41 +08:00
zlzw
1bbc78fb32 *新增长按随机PK【开始匹配】按钮可输入指定UIDPk的测试模式 2022-12-09 09:50:47 +08:00
zlzw
b56368412c Merge branch 'dev_random_pk' 
# Conflicts:
#	common/src/main/res/values/strings.xml
#	config.gradle
#	live/src/main/java/com/yunbao/live/activity/LiveRyAnchorActivity.java
#	live/src/main/java/com/yunbao/live/presenter/LiveRyLinkMicPkPresenter.java
#	live/src/main/java/com/yunbao/live/socket/SocketRyClient.java
 2022-12-09 09:30:17 +08:00
zlzw
3fa259c5b9 优化：调整天梯赛左右下角连胜字样大小 
update 随机PK
 2022-12-08 17:45:21 +08:00
zlzw
9eff246f06 update 随机PK&自由PK 2022-12-08 13:32:26 +08:00
zlzw
285a33ff9a update 随机PK拒绝对话框 2022-12-08 11:34:31 +08:00
18401019693
7ebd935eba 多人Pk开播 2022-12-07 17:59:10 +08:00
zlzw
28b4a36800 完成随机PK模块 2022-12-07 15:36:23 +08:00
zlzw
e134ef8d54 update 随机PK 2022-12-06 17:40:44 +08:00
zlzw
29ddc68870 优化：WebViewActivity.java 兼容三按键导航栏 2022-12-06 16:58:30 +08:00
zlzw
9ead9a6fb8 Merge branch 'master' into dev_random_pk 
# Conflicts:
#	live/src/main/res/values/strings.xml
 2022-12-05 17:46:57 +08:00
zlzw
98122c25d8 优化LiveUserMoreDialogFragment.activity强引用导致的内存泄漏 2022-12-05 17:41:42 +08:00
zlzw
6336eab32a 移除AliPay代码 2022-12-05 17:41:42 +08:00
zlzw
f91a3f3fc1 优化对话框可能闪退的BUG 2022-12-05 17:41:41 +08:00
zlzw
a489a6d00d 移除AliPay代码 2022-12-05 14:18:17 +08:00
18401019693
72f7e00dd5 修复退出直播间问题 2022-12-01 17:25:41 +08:00
zlzw
8b4f88c766 新增开屏图 2022-12-01 16:58:05 +08:00
18142669586
f43ccea32a 版本更新問題 2022-12-01 16:15:16 +08:00
18401019693
80a1508dfc 修复手机开播Pk界面问题，直播间聊天滚动至底部优化 2022-12-01 13:34:25 +08:00
18401019693
4481b102ef 侧边栏任务领取问题修复 2022-11-30 19:05:00 +08:00
18142669586
4d4c251ebd Merge remote-tracking branch 'origin/master' 2022-11-30 18:41:34 +08:00
18142669586
6a416aaba1 多人pk问题 2022-11-30 18:41:10 +08:00
18401019693
70b05b85d7 直播间闪烁问题 2022-11-30 17:37:20 +08:00
18401019693
8e7de87c6b 侧边栏数据请求前移 2022-11-30 15:46:38 +08:00
zlzw
a965a83653 优化在连麦中禁止直播间滑动 2022-11-30 10:18:54 +08:00
18401019693
5cc521d93c 新增搜索主播等级标志， 2022-11-30 09:44:37 +08:00
zlzw
1548b6f252 修复测试反馈的问题：上下滑动直播间会带着PK提示 2022-11-29 17:45:08 +08:00
zlzw
9934d53390 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
 2022-11-29 14:44:34 +08:00
18401019693
cf4948a3e2 悬浮窗视频调整，主播离开下滑直播间离开画面不消失问题修复 2022-11-29 14:34:23 +08:00
zlzw
7f001ba887 修复多人连麦回到桌面再返回直播间丢失连麦图标问题 2022-11-29 11:38:35 +08:00
18401019693
744de267dd 优化新人任务的判断逻辑，贵族通知切换直播间的逻辑优化 2022-11-29 10:18:48 +08:00
18401019693
e9fa533e5a 修复多次调用检查直播间接口问题 2022-11-28 18:09:20 +08:00
zlzw
733678532a 修复首页Banner进直播间没有弹新人特惠问题 2022-11-28 15:57:50 +08:00
zlzw
83039d7b29 修复连麦小窗再进直播间会闪退问题 2022-11-28 14:52:39 +08:00
18401019693
546d9b5728 第十次接口合并，手机开播横屏展示修复 2022-11-28 10:46:49 +08:00
zlzw
1fc8977f99 补充连麦API注释 2022-11-28 10:12:18 +08:00
18401019693
7005895d90 合并接口第liu次次上传 2022-11-26 16:52:11 +08:00
18401019693
3bdee09402 合并接口第五次次上传 2022-11-26 16:12:22 +08:00
zlzw
2843131151 修复连麦看观众列表json转换丢失数据问题 2022-11-26 14:36:50 +08:00
18401019693
082c9d7d12 合并接口第三次上传 2022-11-26 11:07:56 +08:00
18401019693
5e631652a9 合并接口第er次上传 2022-11-25 17:58:15 +08:00
zlzw
4eb9adad78 调整检测连麦对话框位置 
修复一处闪退问题
 2022-11-25 17:48:47 +08:00
18401019693
450047aae2 合并接口第一次上传 2022-11-25 16:26:56 +08:00
zlzw
6bd29ec63e 调整在线列表-守护-空列表时的图片显示 2022-11-25 14:55:56 +08:00
zlzw
47b9487e13 调整连麦主播邀请用户时，用户的弹框样式 2022-11-24 17:08:38 +08:00
zlzw
a2ad006a7e 修复心愿单高度异常问题 2022-11-24 13:45:59 +08:00
zlzw
1eca5b0309 Merge remote-tracking branch 'origin/master' 2022-11-23 17:41:44 +08:00
zlzw
08906e028a 修复三按键导航模式下，首页Banner进去可能网页底部显示不全的问题 2022-11-23 17:41:34 +08:00
18401019693
6e36e15ef3 删除埋点（adjust-android） 2022-11-23 17:16:45 +08:00
zlzw
3d117dbcb4 Merge remote-tracking branch 'origin/master' 2022-11-23 14:14:34 +08:00
zlzw
202aedbcf3 新增多人连麦主播端 2022-11-23 14:14:02 +08:00
18401019693
011322dd8e 贵族开通全服通知 2022-11-23 13:42:55 +08:00
18401019693
0d219e4b6d act进入退出动画 2022-11-22 18:15:25 +08:00
zlzw
4a637d0a69 创建随机PK分支 2022-11-21 15:39:12 +08:00
18401019693
a9d323354b Js接口整合后续更改 2022-11-21 15:22:54 +08:00
zlzw
009efc2c86 屏蔽点击版本号分享日志的功能 2022-11-18 17:02:55 +08:00
18401019693
859d884941 测试更改 2022-11-18 15:49:24 +08:00
zlzw
4a28abf5b7 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	main/src/main/java/com/yunbao/main/activity/MainActivity.java
 2022-11-18 15:30:42 +08:00
zlzw
0429e7ca36 修改直播间左上角靓字 2022-11-18 15:25:56 +08:00
18401019693
e8f13d7590 测试更改 2022-11-18 15:18:50 +08:00
zlzw
7eb3e567f6 调整个人卡片UI 2022-11-18 15:14:32 +08:00
zlzw
d0a373123a Merge remote-tracking branch 'origin/master' 2022-11-17 17:54:39 +08:00
zlzw
86b7ad6d92 修复通知栏布局显示不全的问题 2022-11-17 17:54:31 +08:00
zlzw
62ed0ae78e 调整天梯赛大小 2022-11-17 17:12:41 +08:00
18401019693
fffa7cdabd 测试更改 2022-11-17 16:01:56 +08:00
18401019693
8c11818b49 侧边栏修改,直播关播页面BUg修改 2022-11-16 18:16:20 +08:00
18401019693
1d50f8e4f5 侧边栏修改,直播关播页面BUg修改 2022-11-16 17:22:34 +08:00
zlzw
a664ff7464 调整天梯排位赛UI位置 
新增排位赛轮播点击事件
 2022-11-16 16:31:48 +08:00
zlzw
0a090301df Merge branch 'dev_pkrank' 2022-11-16 15:03:51 +08:00
18401019693
897a47bee7 侧边栏修改 2022-11-16 14:30:11 +08:00
18401019693
09a9e023d3 侧边栏修改 2022-11-16 13:16:46 +08:00
zlzw
9b37374066 新增PK TOP 2022-11-16 11:27:44 +08:00
zlzw
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
zlzw
749ac197de 新增PK TOP 2022-11-15 11:35:03 +08:00
zlzw
d20210f291 创建PK排位赛分支 2022-11-15 09:53:15 +08:00
18401019693
da3398f1f9 侧边栏修改 2022-11-14 16:54:42 +08:00
18401019693
362cc3814e 领取任务奖励逻辑 2022-11-14 15:20:12 +08:00
zlzw
37dfa05a25 调整靓号icon 2022-11-14 13:57:28 +08:00
18401019693
cceb697739 充值逻辑 2022-11-12 18:00:00 +08:00
zlzw
3b1cecf8a3 Merge remote-tracking branch 'origin/master' 2022-11-12 17:09:20 +08:00
zlzw
e52ec4a2b8 调整日志收集 2022-11-12 17:08:58 +08:00
18401019693
ed300eec30 Js调用原生整改 2022-11-12 17:08:48 +08:00
18401019693
9f0b6897f1 Js调用原生整改,主播踢人不退出房间问题修改 2022-11-12 16:05:04 +08:00
zlzw
c4f3d10419 补充日志分享为打包压缩文件 2022-11-12 13:35:29 +08:00
zlzw
3f9cf21b8f 全量日志采集系统改为保存三天内的 2022-11-12 11:32:11 +08:00
zlzw
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