Commit Graph

13061 Commits

Author SHA1 Message Date
f613bbd60c chore: 版本更新至 5.42.0 2025-05-08 16:44:01 +08:00
c284fcd531 Merge branch 'fix/game_detail_video' into 'release'
fix: 修复游戏详情页视频主动播放时退出页面没有停止播放的问题

See merge request halo/android/assistant-android!2177
2025-05-08 16:37:29 +08:00
101aa11855 fix: 修复游戏详情页视频主动播放时退出页面没有停止播放的问题 2025-05-08 16:26:55 +08:00
21a4ff5560 Merge branch 'revert-GHZSCY-7496' into 'dev'
Revert "feat: 专题合集新增自定义设置—客户端 https://jira.shanqu.cc/browse/GHZSCY-7496"

See merge request halo/android/assistant-android!2174
2025-05-08 10:40:50 +08:00
034b7f07ee Revert "feat: 专题合集新增自定义设置—客户端 https://jira.shanqu.cc/browse/GHZSCY-7496"
This reverts commit d874b91b
2025-05-08 10:32:37 +08:00
d3c9cb7776 Merge branch 'revert-26e272ed' into 'dev'
Revert "Merge branch 'feat/GHZSCY-7512-pr' into 'dev'"

See merge request halo/android/assistant-android!2173
2025-05-08 09:21:42 +08:00
8593f5cd0d Revert "Merge branch 'feat/GHZSCY-7512-pr' into 'dev'"
This reverts merge request !2172
2025-05-08 09:21:23 +08:00
26e272edd0 Merge branch 'feat/GHZSCY-7512-pr' into 'dev'
feat:分类新增搜索功能—客户端 https://jira.shanqu.cc/browse/GHZSCY-7512

See merge request halo/android/assistant-android!2172
2025-05-07 15:16:09 +08:00
cc0683c3c7 feat:分类新增搜索功能—客户端 https://jira.shanqu.cc/browse/GHZSCY-7512 2025-05-07 15:09:35 +08:00
7d9f36d587 Merge branch 'feat/GHZSCY-7848-pr' into 'dev'
feat:奇游加速器第三期迭代—客户端 https://jira.shanqu.cc/browse/GHZSCY-7864

See merge request halo/android/assistant-android!2168
2025-05-07 10:33:50 +08:00
eac6bc2c7f feat:奇游加速器第三期迭代—客户端 https://jira.shanqu.cc/browse/GHZSCY-7864 2025-05-07 10:33:50 +08:00
1fd0d7f215 Merge branch 'feat/GHZSCY-7889' into 'dev'
feat:神策埋点优化—客户端 https://jira.shanqu.cc/browse/GHZSCY-7889

See merge request halo/android/assistant-android!2169
2025-05-07 09:30:12 +08:00
cd5748fa1c feat:神策埋点优化—客户端 https://jira.shanqu.cc/browse/GHZSCY-7889 2025-05-07 09:30:12 +08:00
3cc4a2b9bc Merge branch 'fix/GHZSCY-7907' into 'dev'
feat:【光环助手】自定义页面-游戏组件显示问题 https://jira.shanqu.cc/browse/GHZSCY-7907

See merge request halo/android/assistant-android!2170
2025-05-07 09:29:46 +08:00
55056b772e feat:【光环助手】自定义页面-游戏组件显示问题 https://jira.shanqu.cc/browse/GHZSCY-7907 2025-05-07 09:29:46 +08:00
a11acbb8c4 Merge branch 'fix/dsp_install_error' into 'dev'
feat: 广告系统-APP启动埋点事件优化 https://jira.shanqu.cc/browse/GHZSCY-7937

See merge request halo/android/assistant-android!2166
2025-04-30 15:24:51 +08:00
24d59aaa85 fix: 广告系统-APP启动埋点事件优化 https://jira.shanqu.cc/browse/GHZSCY-7937 2025-04-30 14:46:03 +08:00
f57a95b82c feat: 广告系统-APP启动埋点事件优化 https://jira.shanqu.cc/browse/GHZSCY-7937 2025-04-30 13:55:09 +08:00
3a78b307d3 Merge branch 'feat/GHZSCY-7820-continued' into 'dev'
feat:新增dsp广告合作模式—客户端 https://jira.shanqu.cc/browse/GHZSCY-7820

See merge request halo/android/assistant-android!2157
2025-04-30 09:59:24 +08:00
c4dccb7aa7 feat:新增dsp广告合作模式—客户端 https://jira.shanqu.cc/browse/GHZSCY-7820 2025-04-30 09:59:24 +08:00
7612c6afd7 Merge branch 'feat/GHZSCY-7927' into 'dev'
feat: GameDetailModuleClick埋点上报优化-客户端 https://jira.shanqu.cc/browse/GHZSCY-7927

See merge request halo/android/assistant-android!2165
2025-04-28 15:27:29 +08:00
2c781bcbf1 feat: GameDetailModuleClick埋点上报优化-客户端 https://jira.shanqu.cc/browse/GHZSCY-7927 2025-04-28 15:27:29 +08:00
7ab09e42ca Merge branch 'feat/GHZSCY-7869' into 'dev'
feat: 游戏详情组件UI调整—客户端 https://jira.shanqu.cc/browse/GHZSCY-7869

See merge request halo/android/assistant-android!2164
2025-04-27 17:24:27 +08:00
292c96586a feat: 游戏详情组件UI调整—客户端 https://jira.shanqu.cc/browse/GHZSCY-7869 2025-04-27 17:24:27 +08:00
7681b63e27 Merge branch 'fix/GHZSCY-7922' into 'dev'
fix:【光环助手】视频播放问题 https://jira.shanqu.cc/browse/GHZSCY-7922

See merge request halo/android/assistant-android!2163
2025-04-27 15:18:28 +08:00
95966be1a1 fix:【光环助手】视频播放问题 https://jira.shanqu.cc/browse/GHZSCY-7922 2025-04-27 15:18:28 +08:00
9eab3361a0 Merge branch 'fix/iothread-livedata' into 'dev'
fix: 在 io 线程设置 livedata value 导致的问题

See merge request halo/android/assistant-android!2162
2025-04-27 14:30:14 +08:00
d0d5ccdc45 fix: 在 io 线程设置 livedata value 导致的问题 2025-04-27 14:29:09 +08:00
c61d0bc9cc Revert "feat: 重新启用在华为 Android 10 上的开屏广告,测试闪退情况"
This reverts commit aed8e50db3.
2025-04-27 11:05:24 +08:00
2da07354e7 Merge branch 'feat/GHZSCY-7496' into 'dev'
feat: 专题合集新增自定义设置—客户端 https://jira.shanqu.cc/browse/GHZSCY-7496

See merge request halo/android/assistant-android!2161
2025-04-27 11:03:31 +08:00
d874b91b7c feat: 专题合集新增自定义设置—客户端 https://jira.shanqu.cc/browse/GHZSCY-7496 2025-04-27 11:03:31 +08:00
62e62d3a93 chore: 版本更新至 5.41.0 2025-04-27 10:03:20 +08:00
2e806d77e1 Merge branch 'fix/GHZSCY-7916' into 'dev'
Resolve GHZSCY-7916 "Fix/"

Closes GHZSCY-7916

See merge request halo/android/assistant-android!2160
2025-04-25 16:33:50 +08:00
30da988ebc fix: 助手更新显示问题 https://jira.shanqu.cc/browse/GHZSCY-7916 2025-04-25 16:27:12 +08:00
fd61e83f8e Revert "Revert "fix: "点"符号设置颜色""
This reverts commit e5161ae350.
2025-04-24 15:44:34 +08:00
0712960a30 Revert "Revert "feat: 【光环助手】实名认证特殊字符输入优化 https://jira.shanqu.cc/browse/GHZSCY-7702""
This reverts commit b1b231a309.
2025-04-24 15:44:34 +08:00
5dfdaa0353 Merge remote-tracking branch 'origin/release' into dev 2025-04-24 15:16:28 +08:00
fa4dce66a6 Merge branch 'feat/GHZSCY-7704' into 'dev'
【畅玩】实名认证特殊符号以及字符限制优化

See merge request halo/android/assistant-android!2159
2025-04-22 10:09:24 +08:00
8a017df220 Revert .gitlab-ci.yml 2025-04-22 10:08:42 +08:00
3a0be0a6ee 【单机&畅玩】实名认证特殊符号以及字符限制优化 https://jira.shanqu.cc/browse/GHZSCY-7704 2025-04-21 17:47:07 +08:00
d50eeddde2 Merge branch 'fix/GHZSCY-7860' into 'release'
fix:【光环助手】游戏专题显示问题 https://jira.shanqu.cc/browse/GHZSCY-7860

See merge request halo/android/assistant-android!2158
2025-04-15 11:23:14 +08:00
89aa6e7abc fix:【光环助手】游戏专题显示问题 https://jira.shanqu.cc/browse/GHZSCY-7860 2025-04-15 11:23:14 +08:00
ab795ab538 Merge branch 'feat/more-xapk-error-log' into 'release'
feat: xapk 解压失败增加异常摘要字段

See merge request halo/android/assistant-android!2156
v5.40.2-1152-2.0.9
2025-04-10 10:08:07 +08:00
ba0854ad9a feat: xapk 解压失败增加异常摘要字段 2025-04-10 10:00:57 +08:00
fc2051387a Merge branch 'cherry-pick' into 'release'
合并部分需求到 release

See merge request halo/android/assistant-android!2155
2025-04-10 09:43:58 +08:00
ab2973c7be feat: 游戏预约相关优化—客户端 https://jira.shanqu.cc/browse/GHZSCY-7828 2025-04-10 09:35:01 +08:00
2a08ea681d fix: 修复游戏详情视频/图集Tab闪烁的问题 2025-04-10 09:35:00 +08:00
e23d510fb0 fix: 游戏详情-视频/图集tab 神策埋点补充—客户端 https://jira.shanqu.cc/browse/GHZSCY-7781 2025-04-10 09:35:00 +08:00
3c6ee0c782 chore: 版本更新至 5.40.2 2025-04-09 15:43:49 +08:00
07840822a8 Merge branch 'fix/GHZSCY-7806-pick' into 'release'
fix:【光环助手】通知栏目 滚动问题 https://jira.shanqu.cc/browse/GHZSCY-7806

See merge request halo/android/assistant-android!2154
2025-04-09 13:45:37 +08:00