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