Max
|
d0fe8e892e
|
Merge branch 'v2.2.0/red_package' into v2.2.0/test
|
2023-11-01 14:59:05 +08:00 |
|
Max
|
b9120dca54
|
feat：调整红包打开按钮动画时长
feat：调整红包入口图标
|
2023-11-01 14:58:47 +08:00 |
|
Max
|
8ebaddad07
|
Merge branch 'v2.1.1/fix' into v2.2.0/test_old_fix
|
2023-11-01 11:34:52 +08:00 |
|
Max
|
b63b4ba07a
|
fix:修复幸运礼物重复动效（去掉本地自己播的一个svga）
|
2023-11-01 11:34:43 +08:00 |
|
Max
|
a211267517
|
fix:修复麦位魅力值展示问题（主麦）
|
2023-11-01 11:22:04 +08:00 |
|
Max
|
d0e88440e3
|
Merge branch 'v2.1.1/fix' into v2.2.0/test_old_fix
|
2023-10-31 19:19:32 +08:00 |
|
Max
|
260ed56c99
|
Merge branch 'v2.2.0/test' into v2.2.0/test_old_fix
|
2023-10-31 19:19:22 +08:00 |
|
Max
|
505917b70f
|
Merge branch 'v2.2.0/float_gift' into v2.2.0/test
|
2023-10-31 19:19:05 +08:00 |
|
Max
|
03d013fcba
|
fix：修复合并导致的礼物飘窗未展示房间名称问题
|
2023-10-31 19:18:57 +08:00 |
|
Max
|
19301bbd84
|
fix：修复公屏相册条目的等级icon加载模糊问题
|
2023-10-31 19:07:08 +08:00 |
|
Max
|
694a73931b
|
Merge branch 'v2.1.1/fix' into v2.2.0/test_old_fix
|
2023-10-31 18:06:49 +08:00 |
|
Max
|
d34929d7c7
|
fix:修复礼物信令解析时未判空导致的解析中断
|
2023-10-31 18:06:40 +08:00 |
|
Max
|
73eccecfc9
|
Merge branch 'v2.2.0/test' into v2.2.0/test_old_fix
|
2023-10-31 17:26:18 +08:00 |
|
Max
|
eb1546570a
|
Merge branch 'v2.2.0/float_gift' into v2.2.0/test
# Conflicts:
# app/src/main/res/layout/dialog_gift_all_service_level2.xml
|
2023-10-31 17:26:06 +08:00 |
|
Max
|
7ba43a51d4
|
fix:调整礼物飘窗弹窗-去围观位置
|
2023-10-31 17:25:22 +08:00 |
|
Max
|
bae4660840
|
Merge branch 'v2.2.0/red_package' into v2.2.0/test
|
2023-10-31 17:19:15 +08:00 |
|
Max
|
b9fd24e0ff
|
fix:红包过期时间动态展示（发布、小秘书）
fix:调整全服红包文案字数限制
|
2023-10-31 17:19:06 +08:00 |
|
Max
|
4bef25e1e3
|
Merge branch 'v2.2.0/test' into v2.2.0/test_old_fix
|
2023-10-31 15:54:47 +08:00 |
|
Max
|
72480daa98
|
Merge branch 'v2.2.0/float_gift' into v2.2.0/test
|
2023-10-31 15:54:35 +08:00 |
|
Max
|
1defcb0d28
|
fix：修复礼物飘窗与其他特效飘窗重叠问题（加顶部间距：之前版本是这么解决的，应该是之前版本没做完善这块需求）
|
2023-10-31 15:54:26 +08:00 |
|
Max
|
4885a0bdbd
|
Merge branch 'v2.1.1/fix' into v2.2.0/test_old_fix
|
2023-10-31 15:14:14 +08:00 |
|
Max
|
5900702ca6
|
fix：修复公屏历史消息未查询相册类型消息问题
|
2023-10-31 15:14:04 +08:00 |
|
Max
|
9e6928580f
|
Merge branch 'v2.1.1/fix' into v2.2.0/test_old_fix
|
2023-10-31 11:25:46 +08:00 |
|
Max
|
e644ced1ed
|
fix:去除聊天页-语音&图片时的WRITE_EXTERNAL_STORAGE权限
|
2023-10-31 11:25:16 +08:00 |
|
Max
|
1667dd3863
|
Merge branch 'v2.2.0/red_package' into v2.2.0/test
|
2023-10-31 11:11:59 +08:00 |
|
Max
|
c04d3e283b
|
fix:点击红包图标 已领取且领取完时 增加提示并更新入口
|
2023-10-31 11:10:51 +08:00 |
|
Max
|
2b6d66c31e
|
Merge branch 'v2.2.0/float_gift' into v2.2.0/test
|
2023-10-31 10:19:48 +08:00 |
|
Max
|
e56bbb5f8f
|
fix:修复非房间礼物 飘窗弹窗 点击跳转未屏蔽问题
|
2023-10-31 10:17:09 +08:00 |
|
Max
|
7bf7e232d0
|
Merge branch 'v2.2.0/red_package' into v2.2.0/test
|
2023-10-30 20:11:15 +08:00 |
|
Max
|
d63a441296
|
feat：去掉房间设置中的-全服红包开关（暂时操作隐藏入口）
|
2023-10-30 20:08:08 +08:00 |
|
Max
|
e81ec19168
|
Merge branch 'v2.2.0/float_gift' into v2.2.0/test
# Conflicts:
# gradle.properties
|
2023-10-30 20:02:52 +08:00 |
|
Max
|
588b96ec7b
|
fix:跳转提示去房间的忽略提示规则
|
2023-10-30 20:02:04 +08:00 |
|
Max
|
514abbc314
|
Merge branch 'v2.2.0/red_package' into v2.2.0/test
|
2023-10-30 19:49:16 +08:00 |
|
Max
|
94d9183952
|
fix:修复全服红包未展示自定义文案问题
|
2023-10-30 19:49:09 +08:00 |
|
Max
|
6eedd5cc46
|
fix：修复切换同类型房间导致的Widget未更新Context问题
|
2023-10-30 19:30:26 +08:00 |
|
Max
|
087091275f
|
fix:增加领取成功后主动刷新入口图标数据
|
2023-10-30 17:10:20 +08:00 |
|
Max
|
f54a8ec175
|
feat:完善发送红包的权限细分
feat：删除红包无用旧代码
|
2023-10-30 16:49:00 +08:00 |
|
Max
|
fee8f2ceb9
|
Merge branch 'v2.2.0/red_package' into v2.2.0/test
# Conflicts:
# app/src/main/res/values/strings.xml
|
2023-10-30 15:37:59 +08:00 |
|
Max
|
a18a66b496
|
fix;修复红包失效时的入口更新问题
|
2023-10-30 15:36:00 +08:00 |
|
Max
|
80e21bee74
|
fix:修复房间内点击红包跳转到其他房间后没弹出红包问题
|
2023-10-30 15:16:06 +08:00 |
|
Max
|
e031dd9d02
|
fix:修复红包内若干bug
|
2023-10-30 14:45:19 +08:00 |
|
Max
|
19a3b64a32
|
Merge branch 'v2.2.0/float_gift' into v2.2.0/test
# Conflicts:
# app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelDialog.kt
# app/src/main/res/values/strings.xml
|
2023-10-30 12:45:11 +08:00 |
|
Max
|
34a5571338
|
feat:完成礼物飘窗跳转提示
|
2023-10-30 12:35:56 +08:00 |
|
Max
|
5b4eeb80e8
|
Merge branch 'v2.2.0/red_package' into v2.2.0/test
|
2023-10-29 23:14:28 +08:00 |
|
Max
|
f7889ace18
|
feat:完善游戏房、个播房红包展示
feat:完善红包冲突场景
|
2023-10-29 23:14:20 +08:00 |
|
Max
|
cfc909df42
|
Merge branch 'v2.2.0/float_gift' into v2.2.0/test
# Conflicts:
# app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelDialog.kt
# app/src/main/res/layout/dialog_gift_all_service_level.xml
# app/src/main/res/values/colors.xml
# app/src/main/res/values/strings.xml
|
2023-10-28 12:56:42 +08:00 |
|
Max
|
ebc989cccf
|
feat:使用动态比例实现飘窗礼物布局（待验证）
|
2023-10-28 12:25:24 +08:00 |
|
Max
|
5ad1c017c3
|
feat:完善礼物飘窗文本样式
|
2023-10-28 11:43:19 +08:00 |
|
Max
|
15a80f5537
|
feat：初步完成全服飘窗礼物UI优化
|
2023-10-27 20:06:11 +08:00 |
|
Max
|
38fde6109b
|
Merge branch 'v2.2.0/red_package' into v2.2.0/dev
# Conflicts:
# gradle.properties
|
2023-10-27 17:09:46 +08:00 |
|