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 |
|
