18401019693
|
d0b7b065b2
|
修改 测试问题
|
2023-12-07 18:18:27 +08:00 |
|
18401019693
|
32d0fe497d
|
修改 测试问题
|
2023-12-07 16:29:28 +08:00 |
|
18401019693
|
3396ca63d0
|
修改 测试问题
|
2023-12-07 13:17:12 +08:00 |
|
18401019693
|
484891cfe7
|
修改 测试问题
|
2023-12-06 17:13:14 +08:00 |
|
18401019693
|
5c00e065d2
|
Merge remote-tracking branch 'origin/dev_6.6.3'
# Conflicts:
# common/src/main/java/com/yunbao/common/bean/IMLoginModel.java
# config.gradle
|
2023-12-06 15:20:39 +08:00 |
|
18401019693
|
79c1c01003
|
修改 测试问题
|
2023-12-06 13:45:37 +08:00 |
|
|
|
0c7ae4e4f7
|
update
|
2023-12-04 18:19:22 +08:00 |
|
|
|
b8264997f4
|
修复礼物弹框闪退问题
|
2023-12-01 13:11:08 +08:00 |
|
18401019693
|
f1645cf72c
|
修改 测试问题
|
2023-11-30 15:18:28 +08:00 |
|
18401019693
|
1f8025599b
|
小礼物逻辑上传
|
2023-11-30 10:45:45 +08:00 |
|
hch
|
238181deca
|
lib_google
lib_huawei
|
2023-11-27 17:12:27 +08:00 |
|
18401019693
|
71a7b47d42
|
修改语音连麦的逻辑
|
2023-11-27 17:00:30 +08:00 |
|
18401019693
|
59446d2518
|
小礼物逻辑第4次上传
|
2023-11-27 15:40:10 +08:00 |
|
18401019693
|
8a8a7a8326
|
小礼物逻辑第san次上传
|
2023-11-27 10:38:20 +08:00 |
|
18401019693
|
089b1881f1
|
小礼物逻辑第er次上传
|
2023-11-25 13:54:31 +08:00 |
|
18401019693
|
7b1f3ddd79
|
小礼物逻辑第一次上传
|
2023-11-24 13:41:21 +08:00 |
|
18401019693
|
82c1d15ca5
|
修改测试问题
|
2023-11-14 16:05:43 +08:00 |
|
18401019693
|
aff5a178a0
|
普通公屏聊天把之前的限制50个字 修改成 100个字。其他两个个不变
|
2023-11-14 11:31:20 +08:00 |
|
18401019693
|
076f7130c8
|
修改测试问题
|
2023-11-13 14:24:07 +08:00 |
|
18401019693
|
d7bc2615d6
|
主播端不关闭连麦直接下播导致的问题。修复，用户端因为主播下播没关连麦导致的连麦状态不对的修复
|
2023-11-01 18:09:55 +08:00 |
|
18401019693
|
21473b1d69
|
修改已经连麦列表无名称问题，修改连麦列表覆盖问题，添加主播关播强制关闭连麦权限
|
2023-11-01 16:05:22 +08:00 |
|
18401019693
|
9bdee649d8
|
修改已经连麦列表无名称问题，修改连麦列表覆盖问题
|
2023-11-01 14:07:23 +08:00 |
|
18401019693
|
f1a8cd3a68
|
Android连麦申请列表重构，申请列表重构，连麦列表重构，按钮判断逻辑修改，主播断开连麦接口重构
|
2023-11-01 09:55:42 +08:00 |
|
18401019693
|
a39005b1a9
|
2、安卓主播开播， 安卓用户申请连麦后 ，安卓用户这边底部画面不全
|
2023-10-30 15:12:00 +08:00 |
|
18401019693
|
ec1197e5da
|
遊戲bug修復
|
2023-10-30 11:23:46 +08:00 |
|
18401019693
|
45372f37b8
|
遊戲bug修復
|
2023-10-28 17:55:36 +08:00 |
|
18401019693
|
df93b9495a
|
遊戲bug修復
|
2023-10-28 17:13:25 +08:00 |
|
18401019693
|
86d730cdf1
|
遊戲bug修復
|
2023-10-28 14:19:11 +08:00 |
|
18401019693
|
f356446c03
|
小遊戲bug修改
|
2023-10-27 16:20:19 +08:00 |
|
18401019693
|
b191dfb1be
|
小遊戲提醒
|
2023-10-26 14:42:09 +08:00 |
|
18401019693
|
192b0cb417
|
小遊戲提醒
|
2023-10-25 10:09:38 +08:00 |
|
18401019693
|
926de0463c
|
小遊戲修改
|
2023-10-24 15:46:47 +08:00 |
|
18401019693
|
e15953dc64
|
修改中英文
|
2023-10-18 17:26:37 +08:00 |
|
18401019693
|
4ff529ace9
|
修改中英文
|
2023-10-17 17:59:10 +08:00 |
|
18401019693
|
530622c72c
|
修改中英文
|
2023-10-17 17:47:32 +08:00 |
|
18401019693
|
bc549d52f6
|
修改中英文
|
2023-10-17 15:00:20 +08:00 |
|
18401019693
|
14f0de093e
|
修改中英文
|
2023-10-16 18:23:59 +08:00 |
|
18401019693
|
51457738d2
|
修改中英文
|
2023-10-16 17:01:46 +08:00 |
|
18401019693
|
d8a0427791
|
修改中英文
|
2023-10-16 16:30:54 +08:00 |
|
18401019693
|
8abf92d42c
|
修改中英文
|
2023-10-14 17:05:14 +08:00 |
|
18401019693
|
fc2d700a31
|
修改中英文
|
2023-10-13 17:48:42 +08:00 |
|
18401019693
|
867029fa3a
|
修改中英文
|
2023-10-13 16:06:07 +08:00 |
|
18401019693
|
52e199b901
|
修改中英文
|
2023-10-13 14:09:34 +08:00 |
|
18401019693
|
c5d537fb4d
|
修改中英文
|
2023-10-12 16:19:27 +08:00 |
|
18401019693
|
e081f1e058
|
修改中英文
|
2023-10-12 14:26:10 +08:00 |
|
18401019693
|
7bedf93dd5
|
修改中英文
|
2023-10-11 17:26:07 +08:00 |
|
18401019693
|
000929fd02
|
修改中英文
|
2023-10-11 15:40:39 +08:00 |
|
18401019693
|
3e5ba2ba19
|
修改中英文
|
2023-10-11 13:39:31 +08:00 |
|
18401019693
|
a25ce2034f
|
修改中英文
|
2023-10-10 17:03:51 +08:00 |
|
18401019693
|
1625135d0c
|
修改中英文
|
2023-10-10 14:15:52 +08:00 |
|
18401019693
|
add3589683
|
修改中英文
|
2023-10-09 17:57:03 +08:00 |
|
18401019693
|
45a5d6ad61
|
修改中英文
|
2023-10-09 17:24:05 +08:00 |
|
18401019693
|
7b62409bf1
|
中英文修改
|
2023-10-09 16:27:54 +08:00 |
|
18401019693
|
45ad8a9810
|
盲盒头条英文图
|
2023-10-07 16:14:59 +08:00 |
|
18401019693
|
a788c347de
|
修改游戏的new图标展示，网页中英文检测
|
2023-10-07 15:20:13 +08:00 |
|
18401019693
|
c3d4cb8d62
|
Merge branch 'master' into master_sud
# Conflicts:
# common/src/main/java/com/yunbao/common/http/PDLiveApi.java
# common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
# common/src/main/res/values-en-rUS/string.xml
# 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
# config.gradle
|
2023-10-07 14:46:22 +08:00 |
|
18401019693
|
cf169e9a4e
|
修改游戏的new图标展示，网页中英文检测
|
2023-10-07 10:31:13 +08:00 |
|
18401019693
|
ea0ff70595
|
网页拼接中英文字段
|
2023-10-06 17:04:52 +08:00 |
|
18401019693
|
12482b6624
|
修改游戏问题
|
2023-10-06 13:45:47 +08:00 |
|
18401019693
|
d541a4d506
|
游戏修改，粉丝团提示修改
|
2023-10-05 10:52:54 +08:00 |
|
18401019693
|
4b46c72f5a
|
中英文页面适配修改
|
2023-09-28 14:47:10 +08:00 |
|
18401019693
|
c94f549531
|
修改随机开始，修改游戏的上座和结束的逻辑，添加中英文
|
2023-09-27 16:28:43 +08:00 |
|
18401019693
|
210e755fed
|
游戏列表跳转游戏
|
2023-09-26 14:56:55 +08:00 |
|
|
|
b40abb9bc0
|
fix 修复PK过程中挂后台导致摄像头关闭问题
|
2023-09-25 09:54:39 +08:00 |
|
18401019693
|
37217e529e
|
创建游戏，游戏界面完成
|
2023-09-25 09:52:31 +08:00 |
|
18401019693
|
eedbbb5304
|
创建游戏房
|
2023-09-23 17:44:16 +08:00 |
|
|
|
4b3b47b65f
|
update 布局&中英文
|
2023-09-23 10:31:06 +08:00 |
|
|
|
c015459cf1
|
fix 播放器url為空時不播放
|
2023-09-22 14:27:23 +08:00 |
|
|
|
18970c22cf
|
update 餘額不足時彈框
|
2023-09-22 13:38:34 +08:00 |
|
|
|
00db8a00c7
|
fix 修复一些反馈的问题
|
2023-09-22 11:05:02 +08:00 |
|
18401019693
|
0756dd9560
|
游戏房入口对接
|
2023-09-21 17:58:53 +08:00 |
|
|
|
f3195bbcf8
|
Merge branch 'dev_6.5.6' into master_tmp1
|
2023-09-21 13:28:01 +08:00 |
|
|
|
3150489384
|
update 中英文
fix 播放器监测
|
2023-09-20 18:26:59 +08:00 |
|
|
|
9ff382e35b
|
update 排位赛中英文IM消息
|
2023-09-16 18:22:51 +08:00 |
|
|
|
bcd8f7af52
|
Merge branch 'master' into dev_6.5.6
|
2023-09-16 14:38:28 +08:00 |
|
|
|
3595b89672
|
fix 调整英文PK惩罚倒计时过长问题
|
2023-09-16 14:24:06 +08:00 |
|
|
|
7b5cd9b797
|
update 中英文
|
2023-09-16 10:53:08 +08:00 |
|
|
|
9ec241f2a3
|
update 弹窗
|
2023-09-15 18:28:46 +08:00 |
|
|
|
a475e5dc2f
|
update 中英文
|
2023-09-15 16:15:51 +08:00 |
|
|
|
54258c3f13
|
新增【弹框功能优化】
|
2023-09-15 14:54:45 +08:00 |
|
|
|
d383a08013
|
新增【弹框功能优化】
|
2023-09-15 10:04:02 +08:00 |
|
|
|
d1edf6bdd8
|
新增主播关播时，用户端调用离开房间
|
2023-09-11 10:41:56 +08:00 |
|
18401019693
|
7ca8694aed
|
修复在直播间内跳转自己的直播间问题
|
2023-09-11 10:29:16 +08:00 |
|
18401019693
|
d643df72bc
|
埋点配置
|
2023-09-08 15:57:33 +08:00 |
|
|
|
a3dacf1f59
|
调整盲盒说明页面地址
|
2023-09-06 18:28:10 +08:00 |
|
|
|
37605f46b7
|
調整中英文
|
2023-09-06 15:27:03 +08:00 |
|
18401019693
|
a4895df622
|
埋点配置
|
2023-09-06 14:40:45 +08:00 |
|
|
|
b7ba717cb9
|
Merge branch 'dev_6.5.5'
# Conflicts:
# common/src/main/res/values-en-rUS/string.xml
# 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/views/LiveRoomViewHolder.java
|
2023-09-06 10:42:05 +08:00 |
|
|
|
0c5ef0befe
|
跳转七日留存：新增点击打开用户卡片，新增@用户名颜色
|
2023-09-05 17:59:29 +08:00 |
|
18401019693
|
0721ff4f37
|
Merge branch 'master_umeng'
# Conflicts:
# app/proguard-rules.pro
# common/src/main/res/values/strings.xml
# live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
|
2023-09-05 14:18:42 +08:00 |
|
|
|
a5b0ee757c
|
新增H5网页跳转直播间并打开礼物栏选中礼物功能
|
2023-09-05 13:52:45 +08:00 |
|
18401019693
|
82fd35305a
|
埋点配置
|
2023-09-05 13:24:21 +08:00 |
|
|
|
e89e82483b
|
调整中英文
调整开播频道接口
|
2023-09-04 16:25:06 +08:00 |
|
|
|
57bda40a82
|
调整中英文
调整开播频道接口
|
2023-09-02 11:16:01 +08:00 |
|
18401019693
|
93aa8e55e5
|
埋点配置
|
2023-09-02 10:10:50 +08:00 |
|
|
|
2e907bc1ed
|
移除重复点击事件监听
|
2023-08-31 16:16:36 +08:00 |
|
|
|
8d984951c3
|
新增主動PK結束通知
|
2023-08-31 15:14:15 +08:00 |
|
|
|
357ece2ebe
|
补充Android13权限问题
|
2023-08-30 13:28:42 +08:00 |
|
18401019693
|
72e9633045
|
埋点配置
|
2023-08-30 13:21:40 +08:00 |
|
18401019693
|
33930f3e32
|
埋点配置
|
2023-08-29 13:35:38 +08:00 |
|
|
|
8e19ddcc99
|
兼容Android13 连麦权限问题
|
2023-08-29 09:54:21 +08:00 |
|
18401019693
|
1a58311e26
|
埋点配置
|
2023-08-28 16:52:19 +08:00 |
|
|
|
fa8d8a7421
|
调整红包倒计时范围
|
2023-08-28 10:14:38 +08:00 |
|
18401019693
|
bebf0820ca
|
埋点配置
|
2023-08-25 15:12:48 +08:00 |
|
|
|
e1f4e8dde4
|
update 6.5.5
|
2023-08-24 16:31:14 +08:00 |
|
|
|
2b59b1b4fe
|
Merge branch 'master' into dev_6.5.5
|
2023-08-24 15:02:05 +08:00 |
|
|
|
cee1476ab1
|
update 6.5.5
|
2023-08-24 14:26:38 +08:00 |
|
|
|
b6732adfd2
|
调整礼物栏触碰事件拦截
|
2023-08-24 10:54:12 +08:00 |
|
|
|
bec031688e
|
调整礼物栏触碰事件拦截
|
2023-08-24 10:46:40 +08:00 |
|
|
|
7f11195ede
|
update 6.5.5
|
2023-08-24 09:43:33 +08:00 |
|
|
|
52f1a78e36
|
update 红包优化
|
2023-08-23 16:37:53 +08:00 |
|
18401019693
|
75b176a81e
|
6.5.4礼物冠名
|
2023-08-22 14:10:09 +08:00 |
|
18401019693
|
95252f2f02
|
6.5.4礼物冠名
|
2023-08-22 13:31:32 +08:00 |
|
18401019693
|
3b351ffad8
|
6.5.4礼物冠名
|
2023-08-22 10:13:57 +08:00 |
|
|
|
2332255b37
|
礼物栏等级页面补充中英文标识
|
2023-08-21 17:38:41 +08:00 |
|
18401019693
|
90c2f3e2da
|
6.5.4礼物冠名
|
2023-08-21 17:20:29 +08:00 |
|
18401019693
|
644615ffc0
|
6.5.4礼物冠名
|
2023-08-21 15:28:29 +08:00 |
|
18401019693
|
345c9067aa
|
6.5.4礼物冠名
|
2023-08-19 16:05:30 +08:00 |
|
18401019693
|
c20312b982
|
6.5.4礼物冠名
|
2023-08-18 18:43:47 +08:00 |
|
18401019693
|
643568f63b
|
6.5.4礼物冠名
|
2023-08-18 18:08:15 +08:00 |
|
18401019693
|
f03ba293b5
|
6.5.4礼物冠名
|
2023-08-18 17:43:13 +08:00 |
|
|
|
a2f954b28a
|
Merge remote-tracking branch 'origin/master'
|
2023-08-18 14:48:41 +08:00 |
|
|
|
d4549793d1
|
调整头像相关
|
2023-08-18 14:48:33 +08:00 |
|
18401019693
|
5da8855948
|
6.5.4礼物冠名
|
2023-08-18 14:17:46 +08:00 |
|
18401019693
|
5afed0ee43
|
6.5.4礼物冠名
|
2023-08-18 11:04:21 +08:00 |
|
18401019693
|
d065726274
|
6.5.4礼物冠名
|
2023-08-17 18:20:53 +08:00 |
|
18401019693
|
8f9d558043
|
6.5.4礼物冠名
|
2023-08-17 18:15:25 +08:00 |
|
|
|
c594364574
|
调整关注逻辑
|
2023-08-17 17:17:06 +08:00 |
|
18401019693
|
68140c8a3a
|
6.5.4礼物冠名
|
2023-08-17 15:38:59 +08:00 |
|
|
|
5a4001c858
|
调整退出粉丝团逻辑
|
2023-08-17 13:45:40 +08:00 |
|
18401019693
|
d5953bd651
|
6.5.4礼物冠名
|
2023-08-17 13:19:04 +08:00 |
|
18401019693
|
17a2f5e091
|
6.5.4礼物冠名
|
2023-08-16 20:01:46 +08:00 |
|
18401019693
|
b2297b062e
|
6.5.4礼物冠名
|
2023-08-16 18:17:26 +08:00 |
|
|
|
b53472de28
|
調整文案
|
2023-08-16 17:32:29 +08:00 |
|
18401019693
|
9bce235817
|
6.5.4礼物冠名
|
2023-08-16 16:23:28 +08:00 |
|
18401019693
|
60ce5572cf
|
6.5.4礼物冠名
|
2023-08-16 15:37:07 +08:00 |
|
18401019693
|
3761cad653
|
6.5.4礼物冠名
|
2023-08-16 14:50:50 +08:00 |
|
|
|
41c8783b53
|
调整一处英文UI下字数过长问题
|
2023-08-15 14:00:36 +08:00 |
|
18401019693
|
7226add482
|
6.5.4礼物冠名
|
2023-08-15 11:29:39 +08:00 |
|
|
|
09e5f9b984
|
Merge remote-tracking branch 'origin/master'
|
2023-08-15 10:37:25 +08:00 |
|
|
|
83ee1f94df
|
修复一处闪退bug
|
2023-08-15 10:37:06 +08:00 |
|
18401019693
|
7e1b054a98
|
6.5.4礼物冠名
|
2023-08-14 21:05:15 +08:00 |
|
18401019693
|
0ea9ffc2e8
|
6.5.4礼物冠名
|
2023-08-14 17:40:52 +08:00 |
|
18401019693
|
defb5fdd02
|
6.5.4礼物冠名
|
2023-08-14 15:50:35 +08:00 |
|
18401019693
|
c11c66f56f
|
6.5.4礼物冠名
|
2023-08-14 13:47:09 +08:00 |
|
18401019693
|
a618bee6b7
|
6.5.4礼物冠名
|
2023-08-14 11:18:33 +08:00 |
|
|
|
399bedb874
|
调整购买守护页面英文UI
|
2023-08-14 10:57:38 +08:00 |
|
18401019693
|
3b6e2d47f4
|
6.5.4礼物冠名
|
2023-08-14 10:31:01 +08:00 |
|
18401019693
|
96daf73a5c
|
6.5.4礼物冠名
|
2023-08-14 10:16:06 +08:00 |
|
18401019693
|
55cbd0ff5b
|
6.5.4礼物冠名
|
2023-08-11 14:37:35 +08:00 |
|
18401019693
|
a3ab9ff03e
|
6.5.4礼物冠名
|
2023-08-11 14:19:15 +08:00 |
|
18401019693
|
92ed82ea2a
|
6.5.4礼物冠名
|
2023-08-11 13:59:54 +08:00 |
|
18401019693
|
6d262d0c94
|
6.5.4礼物冠名
|
2023-08-11 09:42:18 +08:00 |
|
18401019693
|
ce1174a88c
|
6.5.4礼物冠名
|
2023-08-10 17:40:57 +08:00 |
|
18401019693
|
2406e9bede
|
6.5.4礼物冠名
|
2023-08-10 17:38:06 +08:00 |
|
|
|
9b3a011499
|
修复英文say hi下格式问题#131
|
2023-08-10 17:25:53 +08:00 |
|
18401019693
|
7859e7cb29
|
6.5.4礼物冠名
|
2023-08-10 17:16:14 +08:00 |
|
18401019693
|
1fd36e3ba0
|
6.5.4礼物冠名
|
2023-08-10 17:04:26 +08:00 |
|
|
|
ec3722b7d0
|
新增粉丝团任务红点提示
|
2023-08-10 16:53:00 +08:00 |
|
18401019693
|
35917a5848
|
6.5.4礼物冠名
|
2023-08-10 15:40:13 +08:00 |
|
18401019693
|
7ea6bb570d
|
6.5.4礼物冠名
|
2023-08-10 14:20:40 +08:00 |
|
18401019693
|
43f95260e6
|
6.5.4礼物冠名
|
2023-08-10 13:51:49 +08:00 |
|
18142669586
|
54a4c0b590
|
Merge remote-tracking branch 'origin/master'
|
2023-08-10 11:15:31 +08:00 |
|
18142669586
|
2057a3575f
|
修改融云结束连麦还有对方画面的问题
|
2023-08-10 11:15:06 +08:00 |
|
18401019693
|
aa809ebaf4
|
6.5.4礼物冠名
|
2023-08-10 10:03:01 +08:00 |
|
18401019693
|
dffa71e346
|
6.5.4礼物冠名
|
2023-08-09 18:11:42 +08:00 |
|
18401019693
|
fea46aab1f
|
6.5.4礼物冠名
|
2023-08-09 17:05:51 +08:00 |
|
18401019693
|
e032e0807b
|
6.5.4礼物冠名
|
2023-08-09 14:38:33 +08:00 |
|
18142669586
|
02b70d559d
|
Merge remote-tracking branch 'origin/master'
|
2023-08-09 14:14:11 +08:00 |
|
18142669586
|
7a26e81f67
|
修改融云合流不成功的问题，退出画面有问题
|
2023-08-09 14:13:52 +08:00 |
|
|
|
d07439efcf
|
update 主播端点礼物墙按钮置灰
|
2023-08-09 13:53:16 +08:00 |
|
18401019693
|
7bca817633
|
6.5.4礼物冠名
|
2023-08-09 13:31:31 +08:00 |
|
18401019693
|
bad2b3689a
|
6.5.4礼物冠名
|
2023-08-09 11:01:28 +08:00 |
|
18401019693
|
e32e6f95b0
|
6.5.4礼物冠名
|
2023-08-08 17:09:35 +08:00 |
|
|
|
40e744a533
|
修复粉丝团包裹为空时会关掉对话框的情况
|
2023-08-08 13:32:42 +08:00 |
|
18401019693
|
994bd2a3aa
|
6.5.4礼物冠名
|
2023-08-08 09:34:15 +08:00 |
|
18142669586
|
d899975495
|
修改融云合流不成功的问题
|
2023-08-07 18:06:46 +08:00 |
|
|
|
7ce0bb3a7c
|
修复#93测试问题
|
2023-08-07 15:18:34 +08:00 |
|
|
|
37fd1e9f47
|
调整粉丝团入场英文翻译
|
2023-08-07 14:39:35 +08:00 |
|
18401019693
|
97ad28ba62
|
6.5.4礼物冠名
|
2023-08-07 13:36:59 +08:00 |
|
|
|
e7daabe588
|
Merge branch 'dev_6.5.4'
|
2023-08-05 16:53:13 +08:00 |
|
|
|
d912ad6119
|
update 粉丝团
|
2023-08-05 16:52:48 +08:00 |
|
18401019693
|
dfeb1c246b
|
6.5.4礼物冠名
|
2023-08-05 15:22:49 +08:00 |
|
18401019693
|
6ba71508ca
|
6.5.4礼物冠名
|
2023-08-04 16:28:43 +08:00 |
|
|
|
c8f443c105
|
Merge branch 'master' into dev_6.5.4_tmp
|
2023-08-04 16:15:25 +08:00 |
|
18401019693
|
ebcfddf450
|
6.5.4礼物冠名
|
2023-08-04 16:14:36 +08:00 |
|
|
|
e43fb5e479
|
Merge branch 'master' into dev_6.5.4_tmp
|
2023-08-04 16:13:14 +08:00 |
|
18401019693
|
545c69ff8b
|
6.5.4礼物冠名
|
2023-08-04 15:50:32 +08:00 |
|
|
|
bf8d88608d
|
Merge branch 'master' into dev_6.5.4_tmp
# Conflicts:
# 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/JavascriptInterfaceUtils.java
# common/src/main/res/values-en-rUS/string.xml
# 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/views/LiveRoomViewHolder.java
|
2023-08-04 15:41:11 +08:00 |
|
18401019693
|
45c256cbbb
|
6.5.4礼物冠名
|
2023-08-04 15:18:06 +08:00 |
|
|
|
fe921e25bb
|
update 粉丝团
|
2023-08-04 14:25:49 +08:00 |
|
18401019693
|
d5ca010ec7
|
6.5.4礼物冠名
|
2023-08-04 13:57:36 +08:00 |
|
18401019693
|
04259472a1
|
Merge remote-tracking branch 'origin/dev_gift_6.5.4'
|
2023-08-04 10:19:18 +08:00 |
|
18401019693
|
d6032a0a0a
|
6.5.4礼物冠名
|
2023-08-04 10:18:05 +08:00 |
|
18401019693
|
4a7790d968
|
6.5.4礼物冠名
|
2023-08-04 10:11:03 +08:00 |
|
18401019693
|
49810407ce
|
6.5.4礼物冠名
|
2023-08-04 09:47:42 +08:00 |
|
18401019693
|
fa086dc5cb
|
6.5.4礼物冠名
|
2023-08-03 17:54:14 +08:00 |
|
18401019693
|
3f8d6ed4af
|
6.5.4礼物冠名
|
2023-08-03 16:08:43 +08:00 |
|
18401019693
|
986902886a
|
6.5.4礼物冠名
|
2023-08-03 14:29:04 +08:00 |
|
18401019693
|
8ed7595aec
|
6.5.4礼物冠名
|
2023-08-02 17:47:00 +08:00 |
|
18401019693
|
b78fef6adc
|
6.5.4礼物冠名
|
2023-08-02 16:55:36 +08:00 |
|
|
|
fae0d01dc2
|
update 粉丝团
|
2023-08-02 15:48:51 +08:00 |
|
|
|
2705342e18
|
修复#249问题
|
2023-08-02 14:39:56 +08:00 |
|
18401019693
|
5afa3bd30b
|
6.5.4礼物冠名
|
2023-08-02 13:23:37 +08:00 |
|
18401019693
|
54458bd0c0
|
6.5.4礼物冠名
|
2023-07-31 18:25:32 +08:00 |
|
|
|
c53b9a6064
|
update 粉丝团相关
|
2023-07-31 16:28:42 +08:00 |
|
|
|
92d4130c45
|
update 粉丝团相关
|
2023-07-28 10:01:41 +08:00 |
|
18401019693
|
a353e51ba8
|
6.5.4礼物栏优化
|
2023-07-25 15:25:01 +08:00 |
|
18401019693
|
0646f245b6
|
6.5.4礼物栏优化
|
2023-07-25 14:08:52 +08:00 |
|
|
|
7e3ca79a01
|
调整随机PK弹框UI
|
2023-07-21 14:19:20 +08:00 |
|
|
|
dfeb3a78c1
|
修复英文模式下，购买是守护文案超长问题
|
2023-07-21 13:34:31 +08:00 |
|
|
|
e32d450ca1
|
修复随机PK文案在英文模式下过长问题
|
2023-07-21 09:45:11 +08:00 |
|
|
|
f29766731c
|
修复#232问题
|
2023-07-20 18:12:09 +08:00 |
|
|
|
736592b4e1
|
新增头像选择界面
|
2023-07-19 18:30:32 +08:00 |
|
|
|
fdbbc3b224
|
修復紅點檢測
|
2023-07-19 10:25:11 +08:00 |
|
|
|
1e4b0bb536
|
补充信箱角标点亮和防抖
|
2023-07-18 18:09:27 +08:00 |
|
|
|
4729f93515
|
新增获取联系方式的弹框新样式
|
2023-07-18 15:40:15 +08:00 |
|
18401019693
|
3376a57f9d
|
6.5.4版本更新-“@”功能优化
|
2023-07-18 13:48:37 +08:00 |
|
18401019693
|
0a4425d705
|
修复
|
2023-07-14 10:18:50 +08:00 |
|
18401019693
|
7184b147d9
|
修复
|
2023-07-12 15:32:44 +08:00 |
|
18401019693
|
dd657e9918
|
修复
|
2023-07-12 13:50:00 +08:00 |
|
|
|
09cef4ade6
|
6.5.3 更新发送红包说明图片
|
2023-07-12 13:11:19 +08:00 |
|
|
|
6cf68838f8
|
修改红包样式和文案
|
2023-07-11 17:25:51 +08:00 |
|
|
|
c3a08974d1
|
修改发红包样式
|
2023-07-11 14:14:33 +08:00 |
|
18401019693
|
20c25a51ef
|
修复
|
2023-07-11 11:44:02 +08:00 |
|
18401019693
|
9dfb772224
|
修复
|
2023-07-11 11:43:12 +08:00 |
|
18401019693
|
f5f68f16b7
|
Merge remote-tracking branch 'origin/master'
|
2023-07-11 11:34:47 +08:00 |
|
18401019693
|
7672cea263
|
修复
|
2023-07-11 11:34:40 +08:00 |
|
|
|
0a02b39c12
|
根据产品需求修改英文翻译
根据产品需求修改UI样式
|
2023-07-11 10:51:03 +08:00 |
|
18401019693
|
e786ae16c2
|
修复
|
2023-07-11 10:13:29 +08:00 |
|
18401019693
|
1d447b0a90
|
修复
|
2023-07-10 16:36:48 +08:00 |
|
18401019693
|
4918f9ba20
|
修复
|
2023-07-08 15:52:18 +08:00 |
|
18401019693
|
124b18dcb0
|
修复
|
2023-07-08 15:15:40 +08:00 |
|
18401019693
|
f55e9c0cfe
|
修复
|
2023-07-08 13:40:50 +08:00 |
|
18401019693
|
84c43f74bc
|
修复
|
2023-07-07 16:14:28 +08:00 |
|
18401019693
|
674346b6de
|
修复
|
2023-07-07 16:01:29 +08:00 |
|
18401019693
|
64f40d52da
|
修复
|
2023-07-07 10:34:25 +08:00 |
|
18401019693
|
75e342975c
|
修复
|
2023-07-07 10:15:11 +08:00 |
|
18401019693
|
dd4172fc3d
|
修复
|
2023-07-07 09:51:29 +08:00 |
|
|
|
3807ff8916
|
修复红包出现在联系方式选项里
|
2023-07-06 17:00:02 +08:00 |
|
|
|
36b85c15f5
|
修复飘屏弹幕被禁言没提示问题
|
2023-07-06 16:44:07 +08:00 |
|
18401019693
|
4d61c7e176
|
添加翻译
|
2023-07-06 10:17:14 +08:00 |
|
18401019693
|
c6d9dbc118
|
添加翻译
|
2023-07-06 10:02:18 +08:00 |
|
|
|
6743ec3cf6
|
调整红包查看手气的UI
|
2023-07-06 10:02:04 +08:00 |
|
18401019693
|
addab80997
|
添加翻译
|
2023-07-05 18:15:18 +08:00 |
|
18401019693
|
12bedd630e
|
修复问题
|
2023-07-05 17:07:11 +08:00 |
|
18401019693
|
003c7f9e12
|
修复问题
|
2023-07-05 16:19:30 +08:00 |
|
18401019693
|
9089e96856
|
修复问题
|
2023-07-05 13:29:46 +08:00 |
|
18401019693
|
c139b03417
|
修复问题
|
2023-07-04 17:02:05 +08:00 |
|
|
|
b3fb6e62ae
|
Merge remote-tracking branch 'origin/master'
|
2023-07-04 16:37:34 +08:00 |
|
|
|
613185db40
|
修复红包记录样式问题
|
2023-07-04 16:36:46 +08:00 |
|
18401019693
|
291492f2d0
|
修复问题
|
2023-07-04 16:29:34 +08:00 |
|
18401019693
|
cbe91c84e9
|
红包全服通知
|
2023-07-04 16:02:45 +08:00 |
|
18401019693
|
08bc6d554a
|
Merge remote-tracking branch 'origin/dev_red_packet'
# Conflicts:
# common/src/main/java/com/yunbao/common/http/PDLiveApi.java
# common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
# common/src/main/res/values/strings.xml
|
2023-07-03 17:57:35 +08:00 |
|
18401019693
|
895a1c6951
|
红包中奖列表
|
2023-07-03 17:48:02 +08:00 |
|
18401019693
|
58508ca0ae
|
红包中奖列表
|
2023-07-03 13:05:29 +08:00 |
|
18401019693
|
5736265388
|
展示红包，领取红包接口逻辑对接
|
2023-06-30 16:03:37 +08:00 |
|
18401019693
|
e68d20252a
|
创建接口，红包展示接口
|
2023-06-30 10:17:33 +08:00 |
|
|
|
44b4b06592
|
退出直播间时移除加载错误的提示
|
2023-06-29 15:09:46 +08:00 |
|
|
|
fb7551f7d0
|
Merge branch 'master' into 6.5.3
|
2023-06-29 14:09:33 +08:00 |
|
18401019693
|
40455fffc9
|
红包打开创建领取的样式逻辑构建
|
2023-06-29 10:15:24 +08:00 |
|
|
|
492003ff01
|
update 调整禁言对话框的文案
|
2023-06-28 17:37:30 +08:00 |
|
|
|
710cddd3a7
|
Merge branch 'dev_6.5.3_红包' into 6.5.3
|
2023-06-28 16:49:23 +08:00 |
|
|
|
da7ebb2663
|
add 新增红包专区
add 新增红包专区进去是只有发放红包的直播间
add 新增首页红包浮窗
add 新增红包记录
|
2023-06-28 16:44:42 +08:00 |
|
|
|
6a6696f355
|
fix 修复测试服ios发消息安卓端收不到问题
|
2023-06-28 16:43:26 +08:00 |
|
|
|
368b002db6
|
update 直播间超时进入的提示
|
2023-06-27 14:19:34 +08:00 |
|
18401019693
|
279575d80b
|
红包直播间展示样式构建
|
2023-06-26 18:04:58 +08:00 |
|
|
|
e0312eedd1
|
update 禁言弹框ui标题
|
2023-06-26 10:17:45 +08:00 |
|
|
|
abbb8c524c
|
新增被禁言的提示
|
2023-06-25 16:19:55 +08:00 |
|
|
|
9741be743c
|
新增直播播放器报错时提示
新增观众端看异常下播直播间提示
|
2023-06-25 14:18:40 +08:00 |
|
|
|
beb566b294
|
新增期间禁言功能
|
2023-06-25 09:51:29 +08:00 |
|
18401019693
|
6889828c00
|
消息中心新增【系统消息】类型
|
2023-06-20 17:46:31 +08:00 |
|
18401019693
|
1198a8f1d8
|
送礼交互优化
|
2023-06-15 15:27:46 +08:00 |
|
|
|
ae9c050ae6
|
Merge remote-tracking branch 'origin/master'
|
2023-06-08 17:02:32 +08:00 |
|
|
|
7b61e8c562
|
修复Ranking.getAnchorRankData多次调用问题
|
2023-06-08 17:02:20 +08:00 |
|
18142669586
|
23a396864f
|
修改全服
|
2023-06-08 17:02:11 +08:00 |
|
|
|
af8052f65b
|
修复Ranking.getAnchorRankData多次调用问题
|
2023-06-08 15:21:24 +08:00 |
|
|
|
6603a2dbb5
|
修复Ranking.getAnchorRankData多次调用问题
|
2023-06-08 14:33:44 +08:00 |
|
|
|
f3a0b4d145
|
修复Ranking.getAnchorRankData多次调用问题
|
2023-06-08 14:20:15 +08:00 |
|
|
|
0c99324904
|
Merge remote-tracking branch 'origin/master'
|
2023-06-08 11:13:55 +08:00 |
|
|
|
8d077e8062
|
修复PK结束时会隐藏投票问题
|
2023-06-08 11:13:38 +08:00 |
|
18401019693
|
3aaafdbbbe
|
修改完善资料和礼物点击
|
2023-06-08 10:12:37 +08:00 |
|
18401019693
|
f4016089a1
|
修改完善资料和礼物点击
|
2023-06-06 15:28:00 +08:00 |
|
18401019693
|
cd2e176f0a
|
Merge branch 'dev_6.5.3'
|
2023-06-05 14:09:42 +08:00 |
|
|
|
e6d92ffc86
|
调整投票ui
|
2023-06-05 13:24:13 +08:00 |
|
|
|
ea0a3375e4
|
修复非粉丝通过送礼打开的粉丝团url不正确问题
|
2023-06-05 11:42:56 +08:00 |
|
18401019693
|
06357088c1
|
修改礼物类型
|
2023-06-05 10:36:27 +08:00 |
|
18401019693
|
fa24d226ee
|
6.5.2
|
2023-06-03 18:30:08 +08:00 |
|
18401019693
|
35f16bdcae
|
修改盲盒问题
|
2023-06-03 15:20:18 +08:00 |
|
18401019693
|
aacd8b8735
|
修改盲盒问题
|
2023-06-03 14:35:39 +08:00 |
|
18142669586
|
6e595ff1e4
|
Merge remote-tracking branch 'origin/master'
|
2023-06-03 11:48:37 +08:00 |
|
18142669586
|
fbc50229e8
|
修改关播页面英文显示问题
|
2023-06-03 11:45:57 +08:00 |
|
|
|
1edb07d76c
|
调整投票主播二次点击关闭按钮后直接关闭浮窗
|
2023-06-03 11:45:23 +08:00 |
|
18401019693
|
067bbc70c5
|
修改盲盒问题
|
2023-06-03 10:35:52 +08:00 |
|
18401019693
|
0bab58d507
|
修改盲盒问题
|
2023-06-02 13:52:29 +08:00 |
|
18401019693
|
f4b5cdfed3
|
修改直播间展示ID
|
2023-06-02 13:13:07 +08:00 |
|
18142669586
|
a7a9a28c09
|
Merge remote-tracking branch 'origin/master'
|
2023-06-02 10:27:48 +08:00 |
|
18142669586
|
bbd394044f
|
修改关播页面英文显示问题
|
2023-06-02 10:27:36 +08:00 |
|
18401019693
|
49df393781
|
Merge remote-tracking branch 'origin/master'
|
2023-06-02 10:04:40 +08:00 |
|
18401019693
|
f0a8c17401
|
修改盲盒连宋
|
2023-06-02 10:04:32 +08:00 |
|
|
|
a01ddd310b
|
新增投票观众端的中英文切换
|
2023-06-02 09:56:24 +08:00 |
|
18401019693
|
26ec74932f
|
修改盲盒蒙版
|
2023-06-01 18:16:58 +08:00 |
|
18401019693
|
3aa85ca9bb
|
直播间房间号加ID
|
2023-06-01 15:56:06 +08:00 |
|
|
|
9486a1a572
|
修复下播页面关注按钮在英文状态下自动换行问题
|
2023-06-01 15:12:17 +08:00 |
|
18401019693
|
3488da27f0
|
盲盒加判断是不是本人
|
2023-06-01 10:26:08 +08:00 |
|
18401019693
|
282790ead5
|
Merge remote-tracking branch 'origin/master'
|
2023-05-31 13:59:28 +08:00 |
|
18401019693
|
db165cc05d
|
盲盒礼物开箱动画
|
2023-05-31 13:22:14 +08:00 |
|
|
|
49313ca326
|
修复PK滑动直播间可能画面错乱问题
|
2023-05-29 15:25:15 +08:00 |
|
18401019693
|
b0008405e2
|
Merge branch 'master' into dev_blind_box
|
2023-05-29 11:35:17 +08:00 |
|
18401019693
|
9c32c6af25
|
添加盲盒礼物蒙版
|
2023-05-29 11:34:34 +08:00 |
|
|
|
baa2ec127f
|
调整播放器在停止播放时把play2也一并停止
|
2023-05-29 11:25:30 +08:00 |
|
18401019693
|
c3b5f17f44
|
Merge branch 'master' into dev_blind_box
# Conflicts:
# common/src/main/res/values-zh/strings.xml
# common/src/main/res/values/strings.xml
|
2023-05-27 18:25:14 +08:00 |
|
18401019693
|
66290323d8
|
盲盒全服通知逻辑
|
2023-05-27 11:40:09 +08:00 |
|
|
|
9526a14ca2
|
调整聊天区高度
|
2023-05-27 11:24:28 +08:00 |
|
|
|
27715cda2c
|
新增投票创建失败时的提示语
|
2023-05-26 14:24:29 +08:00 |
|
|
|
65bfc77376
|
修复直播结束数据界面，直播时长未对齐问题
|
2023-05-25 14:34:39 +08:00 |
|
|
|
99618a2779
|
新增IM消息：endPK，用于显示最终单人PK数据
|
2023-05-25 14:25:57 +08:00 |
|
|
|
6ee678bd74
|
开播频道屏蔽【男神】
|
2023-05-25 13:41:39 +08:00 |
|
18401019693
|
b4dc035a1b
|
盲盒礼物具体业务逻辑的构建，IM消息的构建
|
2023-05-25 13:40:49 +08:00 |
|
18401019693
|
1f7aef91a8
|
礼物盲盒基本逻辑
|
2023-05-24 14:50:39 +08:00 |
|
18401019693
|
4f103dadc9
|
修改防抖点击问题
|
2023-05-22 16:48:55 +08:00 |
|
18401019693
|
055d002a34
|
Merge remote-tracking branch 'origin/master'
|
2023-05-19 13:33:17 +08:00 |
|
18401019693
|
426f7450a2
|
修复心愿单问题
|
2023-05-19 13:33:09 +08:00 |
|
|
|
435dc1c4fb
|
调整投票UI
|
2023-05-19 10:36:06 +08:00 |
|
|
|
070312ff53
|
投票修复测试回报问题
|
2023-05-18 15:02:11 +08:00 |
|
|
|
bd8cf94171
|
调整投票隐藏按钮触控范围
|
2023-05-18 11:21:53 +08:00 |
|
|
|
98bb182d56
|
调整投票展示效果
|
2023-05-18 10:52:59 +08:00 |
|
|
|
3454b6f924
|
调整投票展示效果
|
2023-05-18 10:31:52 +08:00 |
|
|
|
5af061c26f
|
update
|
2023-05-17 17:37:34 +08:00 |
|
|
|
c1c8921f59
|
Merge branch 'dev_6.5.2'
# Conflicts:
# common/src/main/java/com/yunbao/common/http/PDLiveApi.java
# common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
# common/src/main/res/values-en-rUS/string.xml
# common/src/main/res/values-zh/strings.xml
# common/src/main/res/values/strings.xml
# live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
|
2023-05-17 16:20:10 +08:00 |
|
|
|
82b3b23470
|
提交主播投票功能
|
2023-05-17 16:14:50 +08:00 |
|
18401019693
|
e28c6228ad
|
清晰度选择提示弹窗问题修复
|
2023-05-17 16:14:42 +08:00 |
|
|
|
df0f5f31e0
|
提交主播投票功能
|
2023-05-17 15:12:51 +08:00 |
|
18401019693
|
8611817a6a
|
修改礼物界面的切换逻辑
|
2023-05-17 13:26:15 +08:00 |
|
|
|
0d86d142c9
|
修复从侧边栏任务进去的邀请任务无法唤起邀请对话框的问题
|
2023-05-13 14:47:35 +08:00 |
|
|
|
a6b5c102d2
|
新增【非贵族，守护，粉丝牌送礼交互优化】功能
|
2023-05-10 14:31:15 +08:00 |
|
18401019693
|
229c8e72cf
|
完善个人资料，我的页面修改，红点提示逻辑
|
2023-05-10 13:09:46 +08:00 |
|
18401019693
|
4b8dd546ce
|
修改密码房退出页面问题
|
2023-04-27 11:05:06 +08:00 |
|
|
|
1953b5a776
|
update 调整say关注边距（陈浩反馈）
|
2023-04-25 15:51:02 +08:00 |
|
18401019693
|
43deb95435
|
修改，中英文问题（聊天框的中英文修改）
|
2023-04-25 15:24:57 +08:00 |
|
18401019693
|
097528f97a
|
修改，中英文问题（默认加载系统语言）
|
2023-04-24 17:31:28 +08:00 |
|
|
|
59508a45cb
|
修复粉丝徽章帮助按钮点击没反应问题
|
2023-04-24 17:00:43 +08:00 |
|
18401019693
|
5dcdd3fc5f
|
多语言切换
|
2023-04-19 16:38:56 +08:00 |
|
|
|
47c3282861
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# 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
# main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java
|
2023-04-19 10:58:02 +08:00 |
|
|
|
181ff4274c
|
新增字号设置
|
2023-04-19 10:54:22 +08:00 |
|
18401019693
|
dc5633bcb9
|
多语言切换
|
2023-04-19 10:16:56 +08:00 |
|
18401019693
|
293c9dcf9e
|
多语言切换
|
2023-04-18 14:51:26 +08:00 |
|
18401019693
|
098ef7aa36
|
多语言切换
|
2023-04-18 10:30:55 +08:00 |
|
18401019693
|
32e3584fef
|
修改侧边栏跳转问题
|
2023-04-14 16:09:02 +08:00 |
|
18142669586
|
90c7483dbc
|
修改关注点击问题
|
2023-04-14 13:41:52 +08:00 |
|
