Commit Graph

9749 Commits

Author SHA1 Message Date
eef2ae3dbe Merge branch 'feature-GHZS-796' into 'dev-5.18.0'
feat:优化设置模块 https://jira.shanqu.cc/browse/GHZS-796

See merge request halo/android/assistant-android!585
2022-12-21 15:05:14 +08:00
011f8cc2b7 feat:优化设置模块 https://jira.shanqu.cc/browse/GHZS-796 2022-12-21 15:05:14 +08:00
3eb002ece1 chore: 版本更新至 5.18.0 2022-12-21 14:36:17 +08:00
ead95968ec Merge remote-tracking branch 'origin/dev' into dev-5.18.0 2022-12-21 10:28:57 +08:00
b10fac1371 Merge remote-tracking branch 'origin/release' into dev 2022-12-21 10:28:25 +08:00
f750682bff Merge remote-tracking branch 'origin/legacy-release' into release
# Conflicts:
#	dependencies.gradle
2022-12-21 10:28:02 +08:00
c7094a0476 chore: 版本更新至 5.15.3 v5.15.3-653 2022-12-21 09:56:23 +08:00
c5019a90f7 Merge branch 'feature-GHZS-779' into 'dev-5.18.0'
feat: 畅玩助手问题反馈相关优化—客户端 https://jira.shanqu.cc/browse/GHZS-779

See merge request halo/android/assistant-android!582
2022-12-20 17:59:54 +08:00
e7bc17c29f feat: 畅玩助手问题反馈相关优化—客户端 https://jira.shanqu.cc/browse/GHZS-779 2022-12-20 17:53:38 +08:00
f8cedcf737 Merge branch 'hotfix-5.15.2-652-list_not_display' into 'legacy-release'
fix: 修改选择活动标签弹窗列表不显示问题

See merge request halo/android/assistant-android!581
2022-12-20 17:10:06 +08:00
d1e04a5743 fix: 修改选择活动标签弹窗列表不显示问题 2022-12-20 16:57:31 +08:00
6cf154268a Merge branch 'feature-fix_rejected_task_error' into 'dev-5.18.0'
简单处理线程池不足以运行更多任务的问题 https://jira.shanqu.cc/browse/GHZS-801

See merge request halo/android/assistant-android!580
2022-12-20 16:40:13 +08:00
395bfc744e 简单处理线程池不足以运行更多任务的问题 https://jira.shanqu.cc/browse/GHZS-801 2022-12-20 16:40:13 +08:00
9892e891e2 Merge branch 'dev' into 'dev-5.18.0'
fix: 更新畅玩 module 依赖

See merge request halo/android/assistant-android!579
2022-12-19 11:21:58 +08:00
4659ebe064 Merge branch 'release' into 'dev'
fix: 更新畅玩 module 依赖

See merge request halo/android/assistant-android!578
2022-12-19 11:20:57 +08:00
9eded4d0ce fix: 更新畅玩 module 依赖 2022-12-19 09:46:58 +08:00
9d9d620d98 Merge branch 'feature-GHZS-578' into 'dev-5.18.0'
fix:【光环助手】夜间模式测试问题汇总(3-4) https://jira.shanqu.cc/browse/GHZS-578

See merge request halo/android/assistant-android!577
2022-12-16 16:58:36 +08:00
6f28b640dd Merge branch 'feature-GHZS-766' into 'dev-5.18.0'
feat: 埋点事件补充—客户端 https://jira.shanqu.cc/browse/GHZS-766

See merge request halo/android/assistant-android!575
2022-12-16 16:45:24 +08:00
eaae32a06a Merge branch 'feature-GHZS-798' into 'dev-5.18.0'
fix: 移除热门卡牌专题的相关代码 https://jira.shanqu.cc/browse/GHZS-798

See merge request halo/android/assistant-android!576
2022-12-16 16:37:22 +08:00
c2f32aafff fix:【光环助手】夜间模式测试问题汇总(3-4) https://jira.shanqu.cc/browse/GHZS-578 2022-12-16 15:37:40 +08:00
f9d2c875b8 fix: 移除热门卡牌专题的相关代码 https://jira.shanqu.cc/browse/GHZS-798 2022-12-16 15:19:52 +08:00
72634a877e feat: 埋点事件补充—客户端 https://jira.shanqu.cc/browse/GHZS-766 2022-12-16 14:38:50 +08:00
7c76753815 Merge branch 'feature-GHZS-717' into 'dev-5.18.0'
fix:【光环助手】开服表的多版本下载按钮显示问题 https://jira.shanqu.cc/browse/GHZS-717

See merge request halo/android/assistant-android!573
2022-12-16 13:44:40 +08:00
a36d905e27 Merge branch 'feature-GHZS-800' into 'dev-5.18.0'
fix: 解决多线程调用 DownloadManager.initMap() 造成的问题 https://jira.shanqu.cc/browse/GHZS-800

See merge request halo/android/assistant-android!574
2022-12-16 12:02:35 +08:00
ab7e417b42 fix: 解决多线程调用 DownloadManager.initMap() 造成的问题 https://jira.shanqu.cc/browse/GHZS-800 2022-12-16 11:36:04 +08:00
e93d95dc0d Merge branch 'dev' into 'dev-5.17.0'
fix: 更新畅玩 module 依赖

See merge request halo/android/assistant-android!572
2022-12-15 18:35:16 +08:00
5a7c316a2d fix: 更新畅玩 module 依赖 v5.16.0-670 2022-12-15 18:34:34 +08:00
198eb0d961 fix:【光环助手】开服表的多版本下载按钮显示问题 https://jira.shanqu.cc/browse/GHZS-717 2022-12-15 17:55:41 +08:00
f55448a264 Merge branch 'hotfix-interested_game_type_dialog_ui' into 'dev-5.17.0'
fix: 微调游戏偏好-分类弹窗UI

See merge request halo/android/assistant-android!571
2022-12-15 17:11:23 +08:00
1c20bf9e02 fix: 微调游戏偏好-分类弹窗UI 2022-12-15 17:10:13 +08:00
69cb4865b2 Merge branch 'feature-GHZS-788' into 'dev-5.17.0'
fix: 【光环助手V5.17.0】APP闪退问题 https://jira.shanqu.cc/browse/GHZS-788

See merge request halo/android/assistant-android!570
2022-12-15 17:08:08 +08:00
d5e9e9f092 fix: 【光环助手V5.17.0】APP闪退问题 https://jira.shanqu.cc/browse/GHZS-788 2022-12-15 17:04:50 +08:00
20a60fb2b5 Merge branch 'hotfix-discovery_card_drak_mode' into 'dev-5.17.0'
fix: 首页发现页卡片和游戏偏好页适配深色模式

See merge request halo/android/assistant-android!569
2022-12-15 16:21:01 +08:00
deac181261 fix: 首页发现页卡片和游戏偏好页适配深色模式 2022-12-15 16:17:28 +08:00
5a4eb2ed65 Merge branch 'fix-GHZS-774' into 'dev-5.17.0'
fix: 【V5.17.0】游戏评价活动:光环星推官挑战赛—1214测试-第10点 (为网页下载添加畅玩游戏支持) https://jira.shanqu.cc/browse/GHZS-774

See merge request halo/android/assistant-android!567
2022-12-15 16:17:18 +08:00
634e897511 Merge branch 'dev' into 'dev-5.17.0'
fix: 更新畅玩 module 依赖

See merge request halo/android/assistant-android!568
2022-12-15 16:17:11 +08:00
305c6792f2 fix: 更新畅玩 module 依赖 2022-12-15 16:04:57 +08:00
0ae726d6b1 fix: 【V5.17.0】游戏评价活动:光环星推官挑战赛—1214测试-第10点 (为网页下载添加畅玩游戏支持) https://jira.shanqu.cc/browse/GHZS-774 2022-12-15 16:02:28 +08:00
6be4412ac6 Merge branch 'dev-fix-game_subtitle' into 'dev-5.17.0'
fix:修复首页游戏副标题超长时遮挡游戏图标的问题

See merge request halo/android/assistant-android!566
2022-12-15 15:56:52 +08:00
586e3deb9e fix:修复首页游戏副标题超长时遮挡游戏图标的问题 2022-12-15 15:45:09 +08:00
f02219b83b fix:【V5.17.0】发现页相关功能优化(第一期)—1212测试-第2点(游戏列表过滤已安装游戏) https://jira.shanqu.cc/browse/GHZS-650 2022-12-15 14:11:00 +08:00
1391ab730d Merge branch 'feature-GHZS-763' into 'dev-5.17.0'
fix:【V5.17.0】发现页相关功能优化(第一期)—1215UI测试 https://jira.shanqu.cc/browse/GHZS-763

See merge request halo/android/assistant-android!565
2022-12-15 11:46:43 +08:00
9eca2ab660 fix:【V5.17.0】发现页相关功能优化(第一期)—1215UI测试 https://jira.shanqu.cc/browse/GHZS-763 2022-12-15 11:38:08 +08:00
b58daea96f Merge branch 'feature-GHZS-700' into 'dev-5.17.0'
fix:【V5.17.0】发现页相关功能优化(第一期)-1214测试 https://jira.shanqu.cc/browse/GHZS-700

See merge request halo/android/assistant-android!564
2022-12-15 11:29:29 +08:00
f958787f9e fix:【V5.17.0】发现页相关功能优化(第一期)-1214测试 https://jira.shanqu.cc/browse/GHZS-700 2022-12-15 11:13:10 +08:00
5fbeff3158 Merge branch 'feature-GHZS-682' into 'dev-5.17.0'
fix:【V5.17.0】发现页相关功能优化(第一期)—1214UI测试 https://jira.shanqu.cc/browse/GHZS-682

See merge request halo/android/assistant-android!563
2022-12-14 15:34:13 +08:00
c03fcc7fde fix:【V5.17.0】发现页相关功能优化(第一期)—1214UI测试 https://jira.shanqu.cc/browse/GHZS-682 2022-12-14 15:27:22 +08:00
ce4c6c1ca3 Merge remote-tracking branch 'origin/dev' into dev-5.17.0 2022-12-14 15:21:45 +08:00
1294a13933 fix: 更新畅玩 submodule 依赖 2022-12-14 15:21:15 +08:00
1b07c28956 Merge branch 'hotfix-get_discovery_card_data_optimize' into 'dev-5.17.0'
fix:处理首页/板块首次今日会多次调用获取发现页数据接口的问题

See merge request halo/android/assistant-android!562
2022-12-14 14:41:13 +08:00