Commit Graph

10747 Commits

Author SHA1 Message Date
98a54ad85d Merge branch 'fix/game_icon_render_issue' into 'dev-5.25.0'
fix: 处理 GameIconView 无法预览的问题

See merge request halo/android/assistant-android!939
2023-04-19 17:36:23 +08:00
fc0a36e4b8 fix: 处理 GameIconView 无法预览的问题 2023-04-19 17:31:30 +08:00
a3a68d7550 Merge branch 'feature-ci-5.25.0' into 'dev-5.25.0'
ci: 更新 ci 配置

See merge request halo/android/assistant-android!938
2023-04-19 17:07:56 +08:00
572400a3c7 ci: 更新 ci 配置 2023-04-19 17:05:43 +08:00
8b42390175 chore: 版本更新为 5.25.0 2023-04-19 10:52:17 +08:00
ad71193089 Merge branch 'refactor-relocate_module' into 'dev-5.25.0'
refactor: 将特殊打包模块和 VPN 模块移动到 feature 目录下

See merge request halo/android/assistant-android!937
2023-04-19 10:43:36 +08:00
f631810acc refactor: 将特殊打包模块和 VPN 模块移动到 feature 目录下 2023-04-19 10:38:58 +08:00
6c9ac11175 Merge branch 'fix-floating_window_exposure_issue' into 'dev'
fix: 修复下载完成的曝光事件使用首个 trace 事件导致游戏名为空的问题

See merge request halo/android/assistant-android!936
2023-04-18 17:58:37 +08:00
5ba2ec0129 fix: 修复下载完成的曝光事件使用首个 trace 事件导致游戏名为空的问题 2023-04-18 17:45:38 +08:00
e6677c781d Merge branch 'feat-GHZS-1972' into 'dev'
feat: 通用授权功能—客户端 https://jira.shanqu.cc/browse/GHZS-1972

See merge request halo/android/assistant-android!878
2023-04-18 16:23:25 +08:00
86fb3e02a2 feat: 通用授权功能—客户端 https://jira.shanqu.cc/browse/GHZS-1972 2023-04-18 16:23:25 +08:00
97790e9416 Merge branch 'hotfix-v5.22.5-795-crashes' into 'legacy-release'
修复一些闪退问题

See merge request halo/android/assistant-android!935
2023-04-18 16:02:48 +08:00
ae800c2046 fix: 修复进入分类2.0页面快速退出出现的闪退问题 https://sentry.shanqu.cc/organizations/lightgame/issues/246858/events/30c49600edde46d5a9afa071ddf6948d/?project=22&statsPeriod=14d 2023-04-18 15:40:13 +08:00
75de02669a fix: 修复从游戏存档已安装游戏页进入已卸载畅玩游戏的云存档管理页面点击下载按钮出现的闪退问题 https://sentry.shanqu.cc/organizations/lightgame/issues/289025/events/271d99a504674afb98041c50db3cc433/?project=22&query=String.length%28%29&statsPeriod=14d 2023-04-18 15:15:41 +08:00
9f15983512 Merge branch 'fix-game_filter' into 'dev-5.24.0'
fix: 版块页第一页补充游戏屏蔽功能

See merge request halo/android/assistant-android!933
2023-04-18 11:50:27 +08:00
c1eb1cde87 fix: 版块页第一页补充游戏屏蔽功能 2023-04-18 11:27:53 +08:00
1f9cee2823 Merge remote-tracking branch 'origin/dev' into dev-5.24.0 2023-04-18 10:56:43 +08:00
67e0181fa5 Merge remote-tracking branch 'origin/release' into dev
# Conflicts:
#	dependencies.gradle
2023-04-18 10:55:05 +08:00
dfa2d9b568 Merge branch 'fix-memory_leak' into 'dev-5.24.0'
fix: 简单处理部分内存泄漏问题

See merge request halo/android/assistant-android!932
2023-04-18 10:13:53 +08:00
402e3be226 fix: 简单处理部分内存泄漏问题 2023-04-18 10:01:46 +08:00
2db297e7c9 Merge branch 'fix-GHZS-2076' into 'dev-5.24.0'
fix: 新增[首页下拉推送]功能-前端部分—0417测试(0417测试2) https://jira.shanqu.cc/browse/GHZS-2076

See merge request halo/android/assistant-android!931
2023-04-18 09:57:47 +08:00
43b634f17e fix: 新增[首页下拉推送]功能-前端部分—0417测试(0417测试2) https://jira.shanqu.cc/browse/GHZS-2076 2023-04-18 09:57:47 +08:00
3dce109b87 Merge branch 'fix-night_mode_display_issue' into 'dev-5.24.0'
fix: 修复下载管理游戏更新列表其它版本更新在深色模式下的显示问题

See merge request halo/android/assistant-android!930
2023-04-17 21:32:10 +08:00
683981d5a1 fix: 修复下载管理游戏更新列表其它版本更新在深色模式下的显示问题 2023-04-17 21:25:57 +08:00
9c9b23e1f2 Merge branch 'fix-GHZS-2076' into 'dev-5.24.0'
fix: 新增[首页下拉推送]功能-前端部分—0417测试(0417测试1-4) https://jira.shanqu.cc/browse/GHZS-2076

See merge request halo/android/assistant-android!929
2023-04-17 20:27:58 +08:00
629c274b20 fix: 新增[首页下拉推送]功能-前端部分—0417测试(0417测试1-4) https://jira.shanqu.cc/browse/GHZS-2076 2023-04-17 20:27:58 +08:00
2548e36e65 Merge branch 'fix-home_push' into 'dev-5.24.0'
fix: 调整首页推送下拉阻尼

See merge request halo/android/assistant-android!928
2023-04-17 19:24:38 +08:00
974e35962f fix: 调整首页推送下拉阻尼 2023-04-17 19:22:17 +08:00
b05f3de5b2 Merge branch 'fix-GHZS-2078' into 'dev-5.24.0'
fix: 修复手动上滑收起时透明度不变化的问题,修复触发下拉推送后反向滑动下拉刷新箭头消失的问题

See merge request halo/android/assistant-android!926
2023-04-17 19:08:07 +08:00
9437d64b0f Merge branch 'fix-GHZS-2064' into 'dev-5.24.0'
fix: 新增[首页下拉推送]功能-前端部分—0414测试(3) https://jira.shanqu.cc/browse/GHZS-2064

See merge request halo/android/assistant-android!927
2023-04-17 19:03:11 +08:00
a9787ebc5a Merge branch 'fix-GHZS-2076' into 'dev-5.24.0'
fix: 新增[首页下拉推送]功能-前端部分—0417测试(3) https://jira.shanqu.cc/browse/GHZS-2076

See merge request halo/android/assistant-android!925
2023-04-17 19:02:47 +08:00
329ca952d4 fix: 修复手动上滑收起时透明度不变化的问题,修复触发下拉推送后反向滑动下拉刷新箭头消失的问题 2023-04-17 19:02:14 +08:00
6cebded553 fix: 新增[首页下拉推送]功能-前端部分—0414测试(3) https://jira.shanqu.cc/browse/GHZS-2064 2023-04-17 18:54:00 +08:00
6b77c71b09 Merge branch 'fix-GHZS-2087' into 'dev-5.24.0'
fix: 去掉游戏详情页启动畅玩游戏弹出加载框的行为 https://jira.shanqu.cc/browse/GHZS-2087

See merge request halo/android/assistant-android!924
2023-04-17 18:03:30 +08:00
386315247a fix: 新增[首页下拉推送]功能-前端部分—0417测试(3) https://jira.shanqu.cc/browse/GHZS-2076 2023-04-17 18:00:48 +08:00
31d819573b Merge branch 'fix-GHZS-2086' into 'dev-5.24.0'
fix: 内容点击来源数据记录—0417测试 https://jira.shanqu.cc/browse/GHZS-2086

See merge request halo/android/assistant-android!923
2023-04-17 17:35:55 +08:00
060ef0e2e1 fix: 内容点击来源数据记录—0417测试 https://jira.shanqu.cc/browse/GHZS-2086 2023-04-17 17:33:39 +08:00
3797caaee6 Merge branch 'fix-floating_window_image_display_size' into 'dev-5.24.0'
fix: 修复悬浮窗图片大小显示问题,悬浮显示时间更改为1秒 https://jira.shanqu.cc/browse/GHZS-2074

See merge request halo/android/assistant-android!922
2023-04-17 17:20:37 +08:00
cfe262eee2 fix: 修复悬浮窗图片大小显示问题,悬浮显示时间更改为1秒 https://jira.shanqu.cc/browse/GHZS-2074 2023-04-17 17:13:16 +08:00
5d15f9097b fix: 去掉游戏详情页启动畅玩游戏弹出加载框的行为 https://jira.shanqu.cc/browse/GHZS-2087 2023-04-17 17:09:13 +08:00
a9093dfe37 Merge branch 'fix-GHZS-2078' into 'dev-5.24.0'
fix: 新增[首页下拉推送]功能-前端部分—0417UI测试 https://jira.shanqu.cc/browse/GHZS-2078

See merge request halo/android/assistant-android!921
2023-04-17 16:55:48 +08:00
c4ab306f0d fix: 新增[首页下拉推送]功能-前端部分—0417UI测试 https://jira.shanqu.cc/browse/GHZS-2078 2023-04-17 16:45:20 +08:00
b9daf3075a Merge branch 'feature-GHZS-2005' into 'dev-5.24.0'
feat: 版块接口优化 https://jira.shanqu.cc/browse/GHZS-2005

See merge request halo/android/assistant-android!920
2023-04-17 16:21:17 +08:00
843ac6b432 feat: 版块接口优化 https://jira.shanqu.cc/browse/GHZS-2005 2023-04-17 16:15:52 +08:00
e5d6de8bf4 Merge branch 'fix-floating_window_wrong_delay_time' into 'dev-5.24.0'
fix: 新增右下角悬浮窗—0415优化 https://jira.shanqu.cc/browse/GHZS-2074

See merge request halo/android/assistant-android!919
2023-04-17 14:56:33 +08:00
7fd2a4ce67 fix: 新增右下角悬浮窗—0415优化 https://jira.shanqu.cc/browse/GHZS-2074 2023-04-17 14:54:34 +08:00
7cc38a8d56 Merge branch 'feature-GHZS-2011' into 'dev-5.24.0'
feat: 通用内容合集优化 https://jira.shanqu.cc/browse/GHZS-2011

See merge request halo/android/assistant-android!918
2023-04-17 14:50:38 +08:00
fb9e0c19a5 feat: 通用内容合集优化 https://jira.shanqu.cc/browse/GHZS-2011 2023-04-17 14:48:47 +08:00
f3a2db619a Merge branch 'feat-GHZS-1928' into 'dev-5.24.0'
feat: 新游开测相关功能优化 https://jira.shanqu.cc/browse/GHZS-1928

See merge request halo/android/assistant-android!916
2023-04-17 11:54:24 +08:00
dc4fc254f6 feat: 新游开测相关功能优化 https://jira.shanqu.cc/browse/GHZS-1928 2023-04-17 11:54:24 +08:00