|
|
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 |
|
18401019693
|
84d4423069
|
埋点配置
|
2023-09-05 14:25:50 +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
|
dd6600a89e
|
埋点配置
|
2023-08-31 09:56:41 +08:00 |
|
18401019693
|
72e9633045
|
埋点配置
|
2023-08-30 13:21:40 +08:00 |
|
18401019693
|
1a58311e26
|
埋点配置
|
2023-08-28 16:52:19 +08:00 |
|
18401019693
|
bebf0820ca
|
埋点配置
|
2023-08-25 15:12:48 +08:00 |
|
|
|
2b59b1b4fe
|
Merge branch 'master' into dev_6.5.5
|
2023-08-24 15:02:05 +08:00 |
|
|
|
bec031688e
|
调整礼物栏触碰事件拦截
|
2023-08-24 10:46:40 +08:00 |
|
|
|
0a442e7df9
|
兼容Android13权限问题
|
2023-08-23 17:02:16 +08:00 |
|
|
|
52f1a78e36
|
update 红包优化
|
2023-08-23 16:37:53 +08:00 |
|
18401019693
|
6bcaf2ba9c
|
埋点配置
|
2023-08-23 15:05:32 +08:00 |
|
18401019693
|
3de972d12c
|
6.5.4礼物冠名
|
2023-08-22 14:03:04 +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 |
|
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
|
f03ba293b5
|
6.5.4礼物冠名
|
2023-08-18 17:43:13 +08:00 |
|
18401019693
|
348dca8474
|
6.5.4礼物冠名
|
2023-08-18 13:49:20 +08:00 |
|
18401019693
|
8f9d558043
|
6.5.4礼物冠名
|
2023-08-17 18:15:25 +08:00 |
|
|
|
c594364574
|
调整关注逻辑
|
2023-08-17 17:17:06 +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
|
9bce235817
|
6.5.4礼物冠名
|
2023-08-16 16:23:28 +08:00 |
|
|
|
fd0ad36a58
|
补充英文
|
2023-08-15 14:07:33 +08:00 |
|
18401019693
|
7226add482
|
6.5.4礼物冠名
|
2023-08-15 11:29:39 +08:00 |
|
18401019693
|
7e1b054a98
|
6.5.4礼物冠名
|
2023-08-14 21:05:15 +08:00 |
|
18401019693
|
9e0c437af5
|
6.5.4礼物冠名
|
2023-08-14 19:55:58 +08:00 |
|
18401019693
|
ad26ae7db8
|
6.5.4礼物冠名
|
2023-08-14 19:16:02 +08:00 |
|
18401019693
|
84230e517e
|
6.5.4礼物冠名
|
2023-08-14 18:40:25 +08:00 |
|
|
|
9818a1af74
|
新增关注的code提示
|
2023-08-14 18:05:55 +08:00 |
|
|
|
f91ba79c5c
|
新增关注的code提示
|
2023-08-14 17:54:27 +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 |
|
|
|
b443fdd683
|
调整页面英文UI
|
2023-08-14 14:58:13 +08:00 |
|
18401019693
|
a618bee6b7
|
6.5.4礼物冠名
|
2023-08-14 11:18:33 +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 |
|
|
|
9b3a011499
|
修复英文say hi下格式问题#131
|
2023-08-10 17:25:53 +08:00 |
|
|
|
ec3722b7d0
|
新增粉丝团任务红点提示
|
2023-08-10 16:53:00 +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 |
|
