|
49167f332d
|
update 隨機/自由PK
|
2022-12-12 16:30:32 +08:00 |
|
|
fdbf5aee04
|
Merge branch 'dev_prank'
# Conflicts:
# common/src/main/java/com/yunbao/common/http/PDLiveApi.java
# common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
|
2022-12-12 14:14:06 +08:00 |
|
|
d39ee17cc4
|
update 整蛊
|
2022-12-12 13:45:41 +08:00 |
|
|
285a33ff9a
|
update 随机PK拒绝对话框
|
2022-12-08 11:34:31 +08:00 |
|
|
9ead9a6fb8
|
Merge branch 'master' into dev_random_pk
# Conflicts:
# live/src/main/res/values/strings.xml
|
2022-12-05 17:46:57 +08:00 |
|
18401019693
|
ae3ac93248
|
主播,是否在播
|
2022-12-01 16:45:20 +08:00 |
|
18142669586
|
f43ccea32a
|
版本更新問題
|
2022-12-01 16:15:16 +08:00 |
|
18401019693
|
73684b9962
|
在线用户弹窗粉丝牌修改,我的等级页面边距修改
|
2022-12-01 14:51:29 +08:00 |
|
18401019693
|
5cc521d93c
|
新增搜索主播等级标志,
|
2022-11-30 09:44:37 +08:00 |
|
18401019693
|
e9fa533e5a
|
修复多次调用检查直播间接口问题
|
2022-11-28 18:09:20 +08:00 |
|
|
733678532a
|
修复首页Banner进直播间没有弹新人特惠问题
|
2022-11-28 15:57:50 +08:00 |
|
|
ecbfa57276
|
Merge remote-tracking branch 'origin/master'
|
2022-11-28 14:55:55 +08:00 |
|
|
83039d7b29
|
修复连麦小窗再进直播间会闪退问题
|
2022-11-28 14:52:39 +08:00 |
|
18401019693
|
e405965298
|
修复多次调用检查直播间接口问题
|
2022-11-28 14:42:24 +08:00 |
|
18401019693
|
e6766dc5eb
|
修复直播间滚动,横竖屏展示错误问题
|
2022-11-28 14:36:29 +08:00 |
|
|
4acba02c6a
|
补充更多跳转直播间前连麦检测
|
2022-11-28 10:10:21 +08:00 |
|
18401019693
|
96eee88c82
|
合并接口第七次次上传,跳轉統一性
|
2022-11-26 17:01:40 +08:00 |
|
18401019693
|
3bdee09402
|
合并接口第五次次上传
|
2022-11-26 16:12:22 +08:00 |
|
18401019693
|
03a4054ee5
|
合并接口第四次上传
|
2022-11-26 11:37:03 +08:00 |
|
18401019693
|
450047aae2
|
合并接口第一次上传
|
2022-11-25 16:26:56 +08:00 |
|
|
9b17c1225a
|
update 随机Pk
|
2022-11-24 13:34:09 +08:00 |
|
18401019693
|
32881d3f35
|
修复主播发动态身份判断问题
|
2022-11-24 10:40:27 +08:00 |
|
18401019693
|
6e36e15ef3
|
删除埋点(adjust-android)
|
2022-11-23 17:16:45 +08:00 |
|
18401019693
|
1972144384
|
贵族点击
|
2022-11-22 17:12:15 +08:00 |
|
18401019693
|
a9d323354b
|
Js接口整合后续更改
|
2022-11-21 15:22:54 +08:00 |
|
18401019693
|
3deb3693b3
|
测试更改
|
2022-11-18 17:40:37 +08:00 |
|
18401019693
|
859d884941
|
测试更改
|
2022-11-18 15:49:24 +08:00 |
|
|
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 |
|
|
527bb0f1d9
|
调整通知权限的弹出位置
|
2022-11-18 15:29:10 +08:00 |
|
18401019693
|
e8f13d7590
|
测试更改
|
2022-11-18 15:18:50 +08:00 |
|
|
c99d139940
|
修复首页排行榜需要点击两次才能关注的问题
修复首页排行榜top3点击直播进个人中心问题
|
2022-11-18 14:38:54 +08:00 |
|
18401019693
|
c08cf6ea57
|
测试更改
|
2022-11-18 13:42:02 +08:00 |
|
18401019693
|
6654fe0434
|
测试更改
|
2022-11-18 10:34:51 +08:00 |
|
|
324917672c
|
调整排行榜点击正在直播的主播直接跳到直播间
|
2022-11-17 18:26:29 +08:00 |
|
|
c949667b94
|
修复排行榜没有位置时依旧显示钻石图标的问题
|
2022-11-17 17:32:51 +08:00 |
|
|
a61a41a068
|
新增检测通知权限弹窗
|
2022-11-17 17:21:05 +08:00 |
|
|
06d241c66c
|
修复首页排行榜闪退问题
|
2022-11-17 17:20:26 +08:00 |
|
|
1ee335abf2
|
调整用户卡片的主播判断
|
2022-11-17 16:55:04 +08:00 |
|
|
e8f9884365
|
修复一处登录时空指针错误
|
2022-11-16 17:08:10 +08:00 |
|
|
7d63869d44
|
调整 隐藏我的-我的等级,webview的title
|
2022-11-12 17:52:01 +08:00 |
|
18401019693
|
ed300eec30
|
Js调用原生整改
|
2022-11-12 17:08:48 +08:00 |
|
18401019693
|
9f0b6897f1
|
Js调用原生整改,主播踢人不退出房间问题修改
|
2022-11-12 16:05:04 +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 |
|
|
fe124dad0c
|
调整支付页面H5可缩放
|
2022-11-11 11:39:49 +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 |
|
|
88e27df986
|
调整融云推流参数
|
2022-11-09 09:44:18 +08:00 |
|
18401019693
|
d0d36ef207
|
语音转文字,上拉加载
|
2022-11-08 13:12:08 +08:00 |
|
|
ab953b4785
|
update
|
2022-11-07 16:48:16 +08:00 |
|
|
eae7f3d1a0
|
排行榜圆角
|
2022-11-03 14:55:10 +08:00 |
|
|
41fb743bda
|
调整排行榜图标大小,隐藏性别图标
|
2022-11-03 10:18:33 +08:00 |
|
|
8b3b0ce2ea
|
补充排行榜颜色
|
2022-11-02 17:19:45 +08:00 |
|
|
e3f9f21287
|
Merge branch 'dev_rank_test'
|
2022-11-02 16:54:40 +08:00 |
|
|
b10d9ada46
|
首页排行榜改成可伸缩的模式
|
2022-11-02 16:53:28 +08:00 |
|
|
b48ceea571
|
完成排行榜页面
|
2022-11-02 14:27:38 +08:00 |
|
|
1623743b26
|
update
|
2022-11-02 13:25:09 +08:00 |
|
|
703f542abf
|
update
|
2022-11-01 18:27:49 +08:00 |
|
|
a2de293e10
|
update
|
2022-11-01 18:18:58 +08:00 |
|
18401019693
|
2102acd9e5
|
测试修改
|
2022-11-01 16:10:58 +08:00 |
|
18401019693
|
ba81a46e2f
|
红点通知
|
2022-11-01 14:51:39 +08:00 |
|
18401019693
|
6841f47ac3
|
修改主播等级
|
2022-11-01 14:46:06 +08:00 |
|
18401019693
|
7e9d2917b6
|
修改图片
|
2022-10-29 13:44:48 +08:00 |
|
|
b394a8f9b5
|
修复firebase反馈的空指针问题
|
2022-10-28 13:50:34 +08:00 |
|
18401019693
|
4be0148324
|
测试修改
|
2022-10-28 11:14:02 +08:00 |
|
|
025c8d74aa
|
修复firebase反馈的MainActivity.forward空指针问题
|
2022-10-28 10:51:48 +08:00 |
|
|
6efcb75c31
|
修复首页周星榜svga会消失的问题
修复Firebase可能没uid的问题
新增其他事件统计
|
2022-10-27 15:28:43 +08:00 |
|
18401019693
|
8b180ce664
|
测试修改
|
2022-10-27 14:48:07 +08:00 |
|
18401019693
|
787d50c5b4
|
直播间UI调整,修改悬浮
|
2022-10-26 15:28:03 +08:00 |
|
18142669586
|
d8d29dd2ad
|
新增更新区分潘多拉和pd,拉黑不感兴趣首页消失,谷歌支付页面修改
|
2022-10-26 13:40:17 +08:00 |
|
18401019693
|
0b601738f7
|
直播间UI调整
|
2022-10-26 10:39:54 +08:00 |
|
18401019693
|
b0ba5b7d57
|
权限判断
|
2022-10-25 16:10:50 +08:00 |
|
18401019693
|
1ce5ac2c5f
|
语音转文字
|
2022-10-25 15:29:21 +08:00 |
|
18401019693
|
7e00a5e71e
|
语音转文字
|
2022-10-25 14:41:08 +08:00 |
|
18401019693
|
172b37ece2
|
语音转文字
|
2022-10-25 14:05:33 +08:00 |
|
18401019693
|
7fabc4f1b6
|
语音转文字
|
2022-10-24 18:18:39 +08:00 |
|
18401019693
|
ab6e578336
|
删除不必要文件,修改设置页面
|
2022-10-24 10:58:56 +08:00 |
|
18401019693
|
60a132489a
|
悬浮窗修改
|
2022-10-22 16:27:12 +08:00 |
|
|
ed97955d90
|
修复一处闪退问题
|
2022-10-22 15:00:21 +08:00 |
|
|
be0f81e059
|
Merge branch 'dev_20221020'
|
2022-10-22 14:48:25 +08:00 |
|
18401019693
|
90e249e2d7
|
根据后端需求修改上报日志接口参数
|
2022-10-22 14:40:35 +08:00 |
|
18401019693
|
1ecad0f89f
|
设定页面修改
|
2022-10-22 11:23:24 +08:00 |
|
18401019693
|
c2d2687441
|
设定页面修改
|
2022-10-22 10:04:05 +08:00 |
|
18401019693
|
5f27031620
|
设置页面修改
|
2022-10-21 18:28:50 +08:00 |
|
18401019693
|
05d4b29991
|
直播内播放
|
2022-10-21 15:52:53 +08:00 |
|
18142669586
|
11aeb95fd7
|
谷歌包强制不获取推广码
|
2022-10-21 13:23:16 +08:00 |
|
|
be735d9ca6
|
压缩资源文件
|
2022-10-21 09:33:06 +08:00 |
|
18401019693
|
f25f61b78c
|
语音听写
|
2022-10-20 17:49:04 +08:00 |
|
|
79aadad668
|
Merge branch 'master' into dev_20221020
# Conflicts:
# settings.gradle
|
2022-10-20 11:17:52 +08:00 |
|
|
ca03a8f23e
|
排除美颜so
压缩图片资源
|
2022-10-20 10:49:08 +08:00 |
|
18401019693
|
4b5f3a9560
|
修改悬浮窗样式,添加悬浮设置
|
2022-10-20 10:48:58 +08:00 |
|
|
00dfd38be5
|
重新启用美颜sdk
调整美颜sdk只使用美颜功能
|
2022-10-19 16:19:50 +08:00 |
|
18401019693
|
91743ecd3d
|
修改测试问题
|
2022-10-18 13:11:14 +08:00 |
|
18401019693
|
5bf95c28d2
|
直播结束,悬浮窗
|
2022-10-17 16:00:27 +08:00 |
|
18401019693
|
5f44473c49
|
直播结束,悬浮窗
|
2022-10-17 14:58:36 +08:00 |
|
18401019693
|
842ef05dc7
|
直播结束,悬浮窗
|
2022-10-17 14:48:19 +08:00 |
|
18401019693
|
47b6f9b45f
|
直播结束,悬浮窗
|
2022-10-17 10:13:17 +08:00 |
|
|
fd038da6d7
|
fix:修复Banner重复点击会进入两次直播间的问题
|
2022-10-14 10:35:24 +08:00 |
|
|
d86e68060c
|
调整礼物UI
新增新人签到弹框
|
2022-10-12 16:05:33 +08:00 |
|
18401019693
|
9b1e182fbd
|
老用户回归
|
2022-10-11 14:44:40 +08:00 |
|
|
f2a3f55e52
|
新增Banner进入直播间直接唤起新人特惠
修复新人特惠URL为null时依旧打开弹框
调整新人特惠红点入口
调整用户手动下载svga如网络失败时的操作
|
2022-10-11 14:11:12 +08:00 |
|
|
8f37f3cc6d
|
更新SVGA库:新增获取动画持续时间方法
|
2022-10-10 16:10:15 +08:00 |
|
|
f202fdd08d
|
update
|
2022-10-10 14:57:26 +08:00 |
|
|
1435848f2a
|
调整礼物包裹UI
|
2022-10-10 13:44:31 +08:00 |
|
|
5060d647fb
|
根据文档修改新礼物UI
移除主界面预下载所有礼物svga入口
获取直播间状态后开始下载所有礼物svga
GiftCacheUtil改为单例并支持顺序下载所有礼物及插队下载
预处理新人特惠红点显示/隐藏接口
获取svga播放时间统一由SVGAViewUtils处理
|
2022-10-10 11:00:46 +08:00 |
|
|
3a87583340
|
Merge remote-tracking branch 'origin/master'
|
2022-10-10 10:58:27 +08:00 |
|
18401019693
|
8cf76a13e0
|
@消息界面删除逻辑
|
2022-10-08 18:09:37 +08:00 |
|
|
bc553a1b1d
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# common/src/main/res/values/strings.xml
|
2022-10-08 11:10:12 +08:00 |
|
18401019693
|
80655a8662
|
@消息界面
|
2022-10-08 10:01:58 +08:00 |
|
18142669586
|
a1633e3456
|
新增注册第三方注册的来源字段
|
2022-10-07 16:58:49 +08:00 |
|
|
2f97839619
|
优化视觉:第三方登录点击后弹出loading
更新svga库
|
2022-10-06 17:34:45 +08:00 |
|
|
92e435f6b6
|
更新FacebookSDK版本
修复Facebook登录成功后无反应问题
第三方登录新增三秒内不允许重复点击功能
|
2022-10-06 14:08:12 +08:00 |
|
|
dd97d35851
|
退出Activity时清理bitmap
退出LiveActivity时,清理SVGA
新增检测到触发未捕获异常闪退时,直接退出不再重新加载
优化一处LiveActivity所持有的静态view,防止内存泄漏
更新SVGAPlayer库
|
2022-10-06 11:43:06 +08:00 |
|
18401019693
|
b7129bcbfa
|
TOKEN失效
|
2022-09-29 16:26:10 +08:00 |
|
18401019693
|
c7b81a5185
|
6.4.2打包提版
|
2022-09-28 18:04:21 +08:00 |
|
18142669586
|
a066d3f4ff
|
Merge remote-tracking branch 'origin/master'
|
2022-09-28 16:26:13 +08:00 |
|
18142669586
|
45d9b914a9
|
1
|
2022-09-28 16:25:57 +08:00 |
|
18401019693
|
3953b0c285
|
测试修改
|
2022-09-28 16:06:59 +08:00 |
|
18401019693
|
b9c6b4afec
|
修改测试问题
|
2022-09-28 15:07:41 +08:00 |
|
18401019693
|
e2a151a5af
|
贡献榜神秘人修改
|
2022-09-28 14:42:15 +08:00 |
|
|
c45cc7a990
|
取消Banner和开盘图片的裁切
修复主播直播间合集名字、图标错误
调整直播准备间文案
调整直播准备心愿单列表
调整直播间遮罩
调整进场动画svga动画
修复观众及个人中心头像svga闪烁和消失问题
|
2022-09-28 14:08:05 +08:00 |
|
18401019693
|
8d98c6b5cc
|
google支付修改
|
2022-09-28 13:43:53 +08:00 |
|
18401019693
|
0d473bdd9f
|
搜索进直播间
|
2022-09-28 11:45:55 +08:00 |
|
|
51c6ed3456
|
调整Glide设置高宽的方法
隐藏直播间右侧贵族头条之类的view
取消首页进入密码房输入密码,不然会弹两次密码输入框
密码输入框响应取消按钮
|
2022-09-27 17:38:12 +08:00 |
|
18401019693
|
79a4c560df
|
隐藏聊天界面
|
2022-09-27 16:35:43 +08:00 |
|
18142669586
|
cadbf53086
|
Merge remote-tracking branch 'origin/master'
|
2022-09-27 14:53:40 +08:00 |
|
18142669586
|
9e527d6a5d
|
1
|
2022-09-27 14:53:31 +08:00 |
|
18142669586
|
2490c6bdd1
|
1
|
2022-09-27 14:53:01 +08:00 |
|
|
25252b013b
|
恢复momo美颜
调整进场svga动画填充类型
|
2022-09-26 17:59:54 +08:00 |
|
|
683f1d5835
|
恢复momo美颜
调整进场svga动画填充类型
|
2022-09-26 17:55:49 +08:00 |
|
|
ec730e850a
|
恢复momo美颜
调整进场svga动画填充类型
|
2022-09-26 17:18:07 +08:00 |
|
18401019693
|
20bd0d884c
|
新增修改字体颜色的js接口
|
2022-09-26 12:00:04 +08:00 |
|
|
7f423a9ae2
|
Merge branch 'master' into dev_test
|
2022-09-22 15:27:41 +08:00 |
|
18142669586
|
f52e10b96f
|
谷歌敏感权限和新的更新包逻辑
|
2022-09-22 15:21:15 +08:00 |
|
|
ff7bfc040d
|
Merge branch 'dev_Memory' into dev_test
# Conflicts:
# app/src/main/java/com/shayu/phonelive/AppContext.java
# common/src/main/java/com/yunbao/common/glide/ImgLoader.java
# dependencies.gradle
# live/src/main/java/com/yunbao/live/adapter/UserMoreInfoAdapter.java
# live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
# main/src/main/java/com/yunbao/main/activity/ZhuangBanActivity.java
# main/src/main/java/com/yunbao/main/adapter/MainListAdapter.java
|
2022-09-22 14:43:57 +08:00 |
|
|
0b0967f84d
|
Merge branch 'dev_FaceUnity'
# Conflicts:
# live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
# live/src/main/res/layout/view_live_room.xml
|
2022-09-22 13:41:13 +08:00 |
|
|
1e98de9931
|
补充注释及移除部分未用到代码
|
2022-09-22 13:35:45 +08:00 |
|
18401019693
|
ab2991a999
|
网页标题兼容,周星榜图片样式裁剪,推荐卡加标签
|
2022-09-22 13:30:24 +08:00 |
|
18401019693
|
6bc3019b02
|
指导员背景文字改动
|
2022-09-22 10:39:34 +08:00 |
|
18401019693
|
f8826d0239
|
网页标题整改
|
2022-09-21 16:28:00 +08:00 |
|
18401019693
|
362dff002f
|
隱身榜單修改
|
2022-09-21 15:08:56 +08:00 |
|
18401019693
|
a5826b2dc3
|
新增h5功能全服喇叭修改
|
2022-09-21 14:55:24 +08:00 |
|
18401019693
|
83aed0bedb
|
新增h5功能
|
2022-09-21 14:13:59 +08:00 |
|
|
d1d31da6be
|
完成美颜UI 90%
|
2022-09-20 18:29:05 +08:00 |
|
18401019693
|
a555019561
|
直播间开通贵族结束
|
2022-09-19 18:20:29 +08:00 |
|
18401019693
|
1935ac14f0
|
直播间开通贵族结束
|
2022-09-19 17:07:59 +08:00 |
|
18401019693
|
f531fd4d0e
|
隐身榜单的更改
|
2022-09-19 16:22:57 +08:00 |
|
18401019693
|
0de802bf3c
|
贵族开通的动画横幅
|
2022-09-19 15:35:37 +08:00 |
|
|
333e4fc1e6
|
新接入FaceUnity美颜SDK
|
2022-09-17 16:54:58 +08:00 |
|
18401019693
|
0cafd76035
|
首页贡献榜添加隐身
|
2022-09-16 17:27:41 +08:00 |
|
18401019693
|
bebf19215e
|
首页贡献榜添加隐身
|
2022-09-16 17:04:45 +08:00 |
|
18142669586
|
5e581dd65e
|
Merge remote-tracking branch 'origin/master'
|
2022-09-16 14:21:50 +08:00 |
|
18142669586
|
3225cf5d5f
|
首页皇帝推荐边框
|
2022-09-16 14:21:21 +08:00 |
|
18401019693
|
1c16a673fd
|
直播间开通贵族
|
2022-09-16 11:03:46 +08:00 |
|
18401019693
|
bf9d573727
|
直播间开通贵族
|
2022-09-16 11:02:54 +08:00 |
|
|
c6770c1d51
|
Merge remote-tracking branch 'origin/master'
|
2022-09-15 16:11:28 +08:00 |
|
18142669586
|
01ea24c66c
|
修复版本号有一些用户无上报的问题
|
2022-09-15 16:10:08 +08:00 |
|
|
56d790082a
|
Merge branch 'dev_new_anchor'
|
2022-09-15 16:06:36 +08:00 |
|
18142669586
|
ada42b1981
|
修改充值的webview兼容性
|
2022-09-15 15:52:20 +08:00 |
|
|
7ef6c95c63
|
改版直播准备间UI
修复心愿单多出一个的BUG
|
2022-09-15 11:20:20 +08:00 |
|
18401019693
|
5bd0f455bb
|
待提交
|
2022-09-14 16:34:26 +08:00 |
|
|
7d72a65f89
|
替换优化后SVGA库
调整部分图片加载大小:如小图标没必要加载原图,设为32x32即可
更新kotlin和gradle依赖版本
|
2022-09-13 17:15:33 +08:00 |
|
|
dd39064ca5
|
update
|
2022-09-09 15:20:59 +08:00 |
|
|
89ed3f5121
|
update
|
2022-09-09 13:36:01 +08:00 |
|
18401019693
|
16bffa1f15
|
添加用戶刷新機制
|
2022-09-07 17:40:29 +08:00 |
|
18401019693
|
6c9ac9807f
|
添加用戶刷新機制
|
2022-09-07 16:42:53 +08:00 |
|
18401019693
|
5df1b21551
|
添加用戶刷新機制
|
2022-09-07 15:12:26 +08:00 |
|
18401019693
|
a4007e555b
|
測試問題修改
|
2022-09-07 13:37:59 +08:00 |
|
|
e7ac583f77
|
fix:去除【我的】红点提醒
fix:私信悬浮头像改为默认熊猫头
|
2022-09-07 13:35:25 +08:00 |
|
|
e8e1186498
|
fix:保留首次进入跳转直播间功能,但在弹对话框前判断Activity是否销毁
|
2022-09-07 13:27:56 +08:00 |
|
|
818e04c687
|
fix:修复首次进入随机进密码房弹dialog导致闪退问题
|
2022-09-07 13:09:40 +08:00 |
|
18401019693
|
8b626dedd8
|
修改消息中心红点
|
2022-09-07 10:27:55 +08:00 |
|
18401019693
|
2bc5c8aeb6
|
修改消息中心红点
|
2022-09-06 18:18:17 +08:00 |
|
18401019693
|
5d7370e5dc
|
界面修改,指导员可以点击头像进主页
|
2022-09-06 17:45:59 +08:00 |
|
|
4560c00810
|
fix:调整开启私聊浮窗时,下方私聊不显示红点
fix:调整新人任务布局间距
fix:修复搜索栏一直搜索会空指针闪退问题
|
2022-09-06 16:18:22 +08:00 |
|
18401019693
|
9b3483457f
|
修复遮罩问题
|
2022-09-06 15:53:42 +08:00 |
|
18401019693
|
cb50c00a06
|
私聊页面添加直播飞机票
|
2022-09-06 14:35:46 +08:00 |
|
|
64c37e6ff4
|
Merge branch 'master' into dev_room_chat
# Conflicts:
# live/src/main/java/com/yunbao/live/activity/PDLIiveChatActivity.java
# main/src/main/java/com/yunbao/main/manager/imrongcloud/ConversationIMListManager.java
|
2022-09-05 17:54:51 +08:00 |
|
|
02af777192
|
add:新增悬浮窗开关设置
|
2022-09-05 17:46:43 +08:00 |
|
|
5bcbe7cd9a
|
add:直播间新增私信悬浮窗
update:会话页面适配半屏模式
|
2022-09-05 16:49:10 +08:00 |
|
18401019693
|
a969abc2bf
|
直播间聊天框修改
|
2022-09-05 16:44:30 +08:00 |
|
18401019693
|
7281296d8e
|
消息中心遮罩修改
|
2022-09-05 15:57:43 +08:00 |
|
18401019693
|
7c287e2abf
|
清除全部未读数(隐藏图标,功能下线)
|
2022-09-05 15:23:03 +08:00 |
|
18401019693
|
ef9c218f87
|
清除全部未读数
|
2022-09-05 14:54:21 +08:00 |
|
18401019693
|
52363a887d
|
消息中心引导页面,清除全部未读数
|
2022-09-05 14:34:18 +08:00 |
|
18401019693
|
f1d49653b5
|
消息中心修改
|
2022-09-03 16:49:01 +08:00 |
|
18142669586
|
07ce36e549
|
111
|
2022-08-31 20:33:23 +08:00 |
|
|
ba92e34b7d
|
update:调整Banner高度
update:调整守护席位置
update:调整观众边距
|
2022-08-31 14:31:51 +08:00 |
|
18142669586
|
736f448cf8
|
111
|
2022-08-30 10:09:50 +08:00 |
|
18142669586
|
49ef55bfee
|
111
|
2022-08-26 15:58:31 +08:00 |
|
18142669586
|
036f27a415
|
111
|
2022-08-26 13:00:45 +08:00 |
|
18401019693
|
97d7f23daf
|
网络请求报错提示去除
|
2022-08-24 11:33:58 +08:00 |
|
18401019693
|
b377d01ca3
|
修复:礼物,坐骑显示问题
|
2022-08-24 11:10:27 +08:00 |
|
18401019693
|
af396f9fa4
|
修复:
|
2022-08-23 16:25:17 +08:00 |
|
18401019693
|
80b5127832
|
修复:
首页或者搜索结果页面进入密码直播间要输两次密码
主播名称缩写错误
|
2022-08-23 14:45:22 +08:00 |
|
18142669586
|
c303ad1f83
|
111
|
2022-08-22 18:15:47 +08:00 |
|
18401019693
|
18d62e5d56
|
直播间的滚动
|
2022-08-20 15:33:41 +08:00 |
|
18142669586
|
3ae14ed506
|
111
|
2022-08-20 14:48:09 +08:00 |
|
18401019693
|
b5aa768f5b
|
界面修改
|
2022-08-19 10:04:50 +08:00 |
|
18142669586
|
2c248681ca
|
111
|
2022-08-17 13:34:29 +08:00 |
|
18401019693
|
121e07f915
|
直播间修改
|
2022-08-17 09:51:38 +08:00 |
|
18401019693
|
f8f1f4e647
|
直播间修改
|
2022-08-17 09:29:24 +08:00 |
|
18401019693
|
a453a526fa
|
防抖,主播私聊修复
|
2022-08-15 09:19:11 +08:00 |
|
18401019693
|
892aaab6c0
|
防抖,主播私聊修复
|
2022-08-12 15:58:09 +08:00 |
|
18401019693
|
0c4448f1f2
|
防抖
|
2022-08-12 13:26:21 +08:00 |
|
18142669586
|
8fb0f7a4e6
|
111
|
2022-08-12 11:25:22 +08:00 |
|
18401019693
|
f03a1a4eb1
|
首页推荐小点
|
2022-08-12 10:31:08 +08:00 |
|
18401019693
|
ac3f1cf846
|
Merge remote-tracking branch 'origin/master'
|
2022-08-11 18:06:12 +08:00 |
|
18401019693
|
ee410650f7
|
首页推荐优化
|
2022-08-11 18:06:01 +08:00 |
|
18142669586
|
c4e2e96185
|
111
|
2022-08-11 17:51:13 +08:00 |
|
18401019693
|
01d0def52d
|
修改测试问题,shouye ytuijian
|
2022-08-11 00:01:04 +08:00 |
|
18401019693
|
b1b5be9976
|
修改测试问题,shouye ytuijian
|
2022-08-10 23:49:46 +08:00 |
|
18401019693
|
743f06115d
|
修改测试问题,shouye ytuijian
|
2022-08-10 23:45:34 +08:00 |
|
18401019693
|
2279823780
|
修改测试问题,shouye ytuijian
|
2022-08-10 23:32:11 +08:00 |
|
18401019693
|
94b795213a
|
修改测试问题,shouye ytuijian
|
2022-08-10 22:51:40 +08:00 |
|
18401019693
|
425030cd47
|
修改测试问题,shouye ytuijian
|
2022-08-10 22:36:09 +08:00 |
|
18401019693
|
270bf2786e
|
修改测试问题,shouye ytuijian
|
2022-08-10 21:42:09 +08:00 |
|
18401019693
|
94343c17c6
|
修改测试问题,shouye ytuijian
|
2022-08-10 21:34:59 +08:00 |
|
18401019693
|
2016d43cb1
|
修改测试问题,shouye ytuijian
|
2022-08-10 20:51:33 +08:00 |
|
18401019693
|
89e725a73f
|
修改测试问题,shouye ytuijian
|
2022-08-10 19:36:15 +08:00 |
|
18401019693
|
2424fd1e06
|
修改测试问题,shouye ytuijian
|
2022-08-10 19:04:43 +08:00 |
|
18401019693
|
59678be822
|
修改测试问题,shouye ytuijian
|
2022-08-10 18:31:14 +08:00 |
|
18401019693
|
8330d7f808
|
修改测试问题,shouye ytuijian
|
2022-08-10 18:05:52 +08:00 |
|
18401019693
|
0643209e8e
|
修改测试问题,shouye ytuijian
|
2022-08-10 18:00:32 +08:00 |
|
18401019693
|
6f8768025c
|
修改测试问题,shouye ytuijian
|
2022-08-10 17:28:48 +08:00 |
|
18401019693
|
0a36dc99f3
|
修改测试问题,shouye ytuijian
|
2022-08-10 16:44:30 +08:00 |
|
18401019693
|
5b47d0b930
|
修改测试问题,shouye ytuijian
|
2022-08-10 16:21:38 +08:00 |
|
18401019693
|
7bb3f2d5f7
|
修改测试问题,shouye ytuijian
|
2022-08-10 15:29:41 +08:00 |
|
18401019693
|
8c6b04685a
|
修改测试问题,shouye ytuijian
|
2022-08-10 15:15:18 +08:00 |
|
18401019693
|
6c18b2f806
|
修改测试问题,shouye ytuijian
|
2022-08-10 15:09:47 +08:00 |
|
18401019693
|
9e5e998f70
|
修改测试问题,shouye ytuijian
|
2022-08-10 14:48:51 +08:00 |
|
18401019693
|
3efd35f897
|
修改测试问题,shouye ytuijian
|
2022-08-10 14:45:07 +08:00 |
|
18142669586
|
6b4bbcf93e
|
111
|
2022-08-10 14:29:34 +08:00 |
|
18142669586
|
dfe1cb4500
|
111
|
2022-08-10 14:25:56 +08:00 |
|
18401019693
|
28cd3e5798
|
修改测试问题,shouye ytuijian
|
2022-08-10 14:10:49 +08:00 |
|
18401019693
|
e96d0e7bf4
|
修改测试问题,shouye ytuijian
|
2022-08-10 13:40:58 +08:00 |
|
18401019693
|
2b5d3b51f4
|
修改测试问题,shouye ytuijian
|
2022-08-10 13:07:35 +08:00 |
|
18401019693
|
28a1169a89
|
修改测试问题,shouye ytuijian
|
2022-08-10 09:34:56 +08:00 |
|
18401019693
|
192e12fe19
|
修改测试问题,shouye ytuijian
|
2022-08-10 09:14:40 +08:00 |
|
18401019693
|
220ecebc4c
|
修改测试问题,shouye ytuijian
|
2022-08-10 08:56:51 +08:00 |
|
18401019693
|
aa3be0a4e9
|
修改测试问题,shouye ytuijian
|
2022-08-09 19:56:22 +08:00 |
|
18401019693
|
cec82501db
|
修改测试问题
|
2022-08-09 17:56:24 +08:00 |
|
18401019693
|
c3a4b57e18
|
修改测试问题
|
2022-08-09 17:44:44 +08:00 |
|
18401019693
|
a3e647d74b
|
Merge remote-tracking branch 'origin/master'
|
2022-08-09 17:25:28 +08:00 |
|
18401019693
|
971feb9f18
|
修改测试问题
|
2022-08-09 17:25:15 +08:00 |
|
18142669586
|
74b3ec08d9
|
111
|
2022-08-09 17:18:31 +08:00 |
|
18401019693
|
2db6115534
|
直播关闭
|
2022-08-09 16:54:30 +08:00 |
|
18401019693
|
6ce970df07
|
完善搜索功能模块
|
2022-08-08 13:08:15 +08:00 |
|
18401019693
|
ea333b24a4
|
Merge remote-tracking branch 'origin/master'
|
2022-08-08 10:39:07 +08:00 |
|
18401019693
|
b05ab47822
|
删除历史记录,搜索优化完成
|
2022-08-08 10:38:47 +08:00 |
|
18142669586
|
0d38cd7c67
|
111
|
2022-08-08 10:37:23 +08:00 |
|
18401019693
|
04b720311c
|
猜你喜欢跳转
|
2022-08-08 10:33:57 +08:00 |
|
18401019693
|
76a0d9ec8c
|
历史检索记录完善
|
2022-08-08 10:26:45 +08:00 |
|
18401019693
|
90bc939a61
|
界面优化,数据整理
|
2022-08-08 09:51:47 +08:00 |
|
18401019693
|
43133e503d
|
关注主播
|
2022-08-06 18:18:48 +08:00 |
|
18401019693
|
ae9f15d963
|
界面优化,数据整理
|
2022-08-06 17:08:41 +08:00 |
|
18401019693
|
19dfe093af
|
滚动问题修复
|
2022-08-06 16:43:58 +08:00 |
|
18401019693
|
c15a420307
|
全部检索界面优化
|
2022-08-06 15:46:11 +08:00 |
|
18401019693
|
fadf7c5655
|
猜你喜欢功能完成
|
2022-08-06 14:58:25 +08:00 |
|
18401019693
|
b0a1014cf3
|
11111
|
2022-08-05 18:16:48 +08:00 |
|
18142669586
|
254f3af3c7
|
111
|
2022-08-04 13:30:22 +08:00 |
|
18401019693
|
805ca91637
|
喇叭,个人中心贵族添加中心
|
2022-08-03 18:24:52 +08:00 |
|
18401019693
|
84c8ecde30
|
新贵族喇叭
|
2022-08-01 17:28:21 +08:00 |
|
18401019693
|
5a5528594d
|
11111
|
2022-08-01 11:33:15 +08:00 |
|
18401019693
|
00de2169b9
|
11111
|
2022-07-29 16:04:12 +08:00 |
|
18142669586
|
41f07f2e3d
|
111
|
2022-07-29 15:58:18 +08:00 |
|
18401019693
|
0cb1ed9b71
|
11111
|
2022-07-28 11:22:16 +08:00 |
|
18142669586
|
1fc6a3adfe
|
111
|
2022-07-27 20:44:55 +08:00 |
|
18401019693
|
8b9d10ca92
|
11111
|
2022-07-27 18:48:22 +08:00 |
|
18142669586
|
28efafcd44
|
111
|
2022-07-27 17:53:23 +08:00 |
|
18142669586
|
966e8bbddb
|
111
|
2022-07-27 17:08:00 +08:00 |
|
18401019693
|
754b8639ae
|
11111
|
2022-07-27 16:47:12 +08:00 |
|
18401019693
|
28464d56a1
|
11111
|
2022-07-27 16:28:59 +08:00 |
|
18401019693
|
cc438af7ca
|
11111
|
2022-07-27 16:13:07 +08:00 |
|
18142669586
|
aac51d423c
|
111
|
2022-07-27 15:14:19 +08:00 |
|
18401019693
|
5c42767ea3
|
11111
|
2022-07-27 13:48:58 +08:00 |
|
18401019693
|
838ae0815b
|
11111
|
2022-07-27 13:18:32 +08:00 |
|
18142669586
|
133e45bc63
|
111
|
2022-07-27 11:21:34 +08:00 |
|
18401019693
|
d4cc6f747b
|
11111
|
2022-07-27 11:12:02 +08:00 |
|
18401019693
|
9f30e724e9
|
11111
|
2022-07-27 10:52:14 +08:00 |
|
18401019693
|
8216efaba6
|
11111
|
2022-07-27 10:12:41 +08:00 |
|
18401019693
|
69977483d2
|
11111
|
2022-07-27 09:37:17 +08:00 |
|
18401019693
|
4ea1758595
|
11111
|
2022-07-27 09:29:23 +08:00 |
|
18401019693
|
18cf3c9ba3
|
11111
|
2022-07-26 18:52:42 +08:00 |
|
18401019693
|
f00fcac663
|
11111
|
2022-07-26 18:28:47 +08:00 |
|
18142669586
|
a4153da415
|
111
|
2022-07-26 17:45:20 +08:00 |
|
18401019693
|
021429a60d
|
11111
|
2022-07-26 17:40:57 +08:00 |
|
18401019693
|
202c265e71
|
11111
|
2022-07-26 16:21:00 +08:00 |
|
18401019693
|
d3c37e4ec4
|
11111
|
2022-07-26 14:47:38 +08:00 |
|
18401019693
|
1b53016056
|
11111
|
2022-07-26 13:14:43 +08:00 |
|
18401019693
|
69ad6efb65
|
11111
|
2022-07-26 10:43:27 +08:00 |
|
18142669586
|
8a9083f9b5
|
Merge remote-tracking branch 'origin/master'
|
2022-07-26 10:01:46 +08:00 |
|
18142669586
|
01373a64af
|
111
|
2022-07-26 10:01:19 +08:00 |
|
18401019693
|
b6c80f095d
|
11111
|
2022-07-25 17:56:21 +08:00 |
|
18142669586
|
708257a289
|
111
|
2022-07-25 16:06:39 +08:00 |
|
18401019693
|
97660b2b04
|
11111
|
2022-07-25 16:04:16 +08:00 |
|
18401019693
|
b264001a44
|
11111
|
2022-07-25 15:54:47 +08:00 |
|
18401019693
|
1007e2ab20
|
11111
|
2022-07-25 14:06:35 +08:00 |
|
18401019693
|
47030425cd
|
11111
|
2022-07-23 18:14:42 +08:00 |
|
18401019693
|
cc35227b56
|
11111
|
2022-07-23 16:31:33 +08:00 |
|
18401019693
|
18aabb85a7
|
11111
|
2022-07-23 10:05:15 +08:00 |
|
18142669586
|
1219b77e2d
|
111
|
2022-07-23 09:46:55 +08:00 |
|
18401019693
|
a97dcbbb5b
|
11111
|
2022-07-22 18:51:07 +08:00 |
|
18142669586
|
701f1c6dc1
|
111
|
2022-07-22 17:49:50 +08:00 |
|
18401019693
|
cbf43a3aa3
|
11111
|
2022-07-22 16:27:19 +08:00 |
|
18401019693
|
0cd6ab5e9d
|
11111
|
2022-07-21 18:35:06 +08:00 |
|
18401019693
|
01bdab01f6
|
11111
|
2022-07-21 15:05:35 +08:00 |
|
18142669586
|
821bd863c8
|
111
|
2022-07-21 11:33:08 +08:00 |
|
18401019693
|
e1dbc9d38c
|
11111
|
2022-07-21 11:24:15 +08:00 |
|
18142669586
|
42138777e3
|
1
|
2022-07-20 18:03:51 +08:00 |
|
18142669586
|
31cf3c4e71
|
1
|
2022-07-20 16:57:42 +08:00 |
|
18142669586
|
d150d8d599
|
1
|
2022-07-20 15:18:42 +08:00 |
|
18142669586
|
c7e03f576c
|
1
|
2022-07-20 14:40:44 +08:00 |
|
18142669586
|
4490fb158d
|
1
|
2022-07-20 14:22:26 +08:00 |
|
18401019693
|
1791a114e3
|
androidx版本首次提交
|
2022-07-18 15:31:45 +08:00 |
|