Commit Graph

9749 Commits

Author SHA1 Message Date
5c606f8eb3 feat: 【V5.17.0】游戏评价活动:光环星推官挑战赛—客户端 https://jira.shanqu.cc/browse/GHZS-415 2022-12-08 11:22:13 +08:00
6fed28da75 Merge branch 'feature-GHZS-604' into 'dev-5.17.0'
fix: 【V5.17.0】游戏详情-详情tab页面优化-相关游戏—1207UI测试 https://jira.shanqu.cc/browse/GHZS-604

See merge request halo/android/assistant-android!537
2022-12-07 17:07:40 +08:00
823060320f fix: 【V5.17.0】游戏详情-详情tab页面优化-相关游戏—1207UI测试 https://jira.shanqu.cc/browse/GHZS-604 2022-12-07 17:07:39 +08:00
d0bf32db06 Merge branch 'feature-GHZS-386' into 'dev-5.17.0'
feat:【V5.17.0】发帖草稿箱相关优化—客户端 https://jira.shanqu.cc/browse/GHZS-386

See merge request halo/android/assistant-android!536
2022-12-07 16:27:18 +08:00
d7fb0c86bb feat:【V5.17.0】发帖草稿箱相关优化—客户端 https://jira.shanqu.cc/browse/GHZS-386 2022-12-07 16:20:39 +08:00
c69ececcb7 Merge branch 'hotfix-dev-cloud_archive_list_page' into 'dev'
fix:修复游戏详情-云存档列表未设置分页问题

See merge request halo/android/assistant-android!535
2022-12-07 15:27:51 +08:00
ec4eeb0219 fix:修复游戏详情-云存档列表未设置分页问题 2022-12-07 15:25:23 +08:00
35aabd0fd3 Merge branch 'dev' into 'dev-5.17.0'
合并累积修复

See merge request halo/android/assistant-android!534
2022-12-07 14:00:39 +08:00
e626eb193f Merge branch 'feature-GHZS-436' into 'dev-5.17.0'
feat: 【V5.17.0】游戏详情-详情tab页面优化-大家都在玩—客户端 https://jira.shanqu.cc/browse/GHZS-436

See merge request halo/android/assistant-android!533
2022-12-07 11:29:18 +08:00
51d42c96d3 feat: 【V5.17.0】游戏详情-详情tab页面优化-大家都在玩—客户端 https://jira.shanqu.cc/browse/GHZS-436 2022-12-07 11:29:18 +08:00
ea32d5a798 Merge branch 'feature-GHZS-308' into 'dev-5.17.0'
feat: 【光环助手V5.17.0】发帖图片限制相关优化 https://jira.shanqu.cc/browse/GHZS-308

See merge request halo/android/assistant-android!532
2022-12-06 12:00:11 +08:00
59a5ea9600 feat: 【光环助手V5.17.0】发帖图片限制相关优化 https://jira.shanqu.cc/browse/GHZS-308 2022-12-06 11:50:46 +08:00
8ff62a9f5e Merge branch 'fix-vgame_wrong_database_backup' into 'dev'
fix: 修复畅玩游戏因为跨数据库版本备份造成的闪退问题

See merge request halo/android/assistant-android!531
2022-12-06 11:02:59 +08:00
203c8db840 fix: 修复畅玩游戏因为跨数据库版本备份造成的闪退问题 2022-12-06 10:48:48 +08:00
90ab76aa48 chore: 版本更新至 5.17.0 2022-12-06 09:55:45 +08:00
f1e3a21191 Merge remote-tracking branch 'origin/release' into dev
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/search/SearchGameIndexItemViewHolder.kt
#	dependencies.gradle
2022-12-05 17:02:14 +08:00
cae48cb2b7 Merge remote-tracking branch 'origin/legacy-release' into release
# Conflicts:
#	dependencies.gradle
2022-12-05 17:00:22 +08:00
b91fa853ca Merge branch 'feature-GHZS-473' into 'dev-5.17.0'
feat:【V5.17.0】副标题客户端使用场景补充—客户端 https://jira.shanqu.cc/browse/GHZS-473

See merge request halo/android/assistant-android!529
2022-12-05 14:22:13 +08:00
0f0900033c feat:【V5.17.0】副标题客户端使用场景补充—客户端 https://jira.shanqu.cc/browse/GHZS-473 2022-12-05 14:16:47 +08:00
4fbc80ca38 Merge branch 'feature-GHZS-372' into 'dev-5.17.0'
feat:【光环助手V5.17.0】游戏列表-游戏卡片显示优化 https://jira.shanqu.cc/browse/GHZS-372

See merge request halo/android/assistant-android!528
2022-12-05 13:53:42 +08:00
7fbe32d2af feat:【光环助手V5.17.0】游戏列表-游戏卡片显示优化 https://jira.shanqu.cc/browse/GHZS-372 2022-12-05 13:53:42 +08:00
988b931170 chore: 版本更新到 5.14.8 v5.14.8-638 2022-12-05 10:57:48 +08:00
50acd6998e Merge branch 'hotfix-v5.14.7-637-crash' into 'legacy-release'
fix: 临时修复跳转内容为空时的闪退...

See merge request halo/android/assistant-android!527
2022-12-05 10:56:15 +08:00
84faf3e0d5 Merge branch 'feature-GHZS-565' into 'dev'
fix:【光环助手V5.16.0】游戏广告管理功能(前端部分)-1202测试 https://jira.shanqu.cc/browse/GHZS-565

See merge request halo/android/assistant-android!526
2022-12-05 10:50:49 +08:00
d84c1f1f25 fix:【光环助手V5.16.0】游戏广告管理功能(前端部分)-1202测试 https://jira.shanqu.cc/browse/GHZS-565 2022-12-05 10:37:49 +08:00
52b6a429bc fix: 临时修复跳转内容为空时的闪退 https://sentry.shanqu.cc/organizations/lightgame/issues/237240/?project=22&query=skip&sort=freq&statsPeriod=14d 2022-12-05 10:28:42 +08:00
6492b41ad1 Merge branch 'feature-issues92' into 'dev'
fix:修复游戏单详情评论列表的滑动卡顿问题 https://git.shanqu.cc/halo/android/assistant-android/-/issues/92

See merge request halo/android/assistant-android!524
2022-12-02 15:37:12 +08:00
3e4faca388 fix:修复游戏单详情评论列表的滑动卡顿问题 https://git.shanqu.cc/halo/android/assistant-android/-/issues/92 2022-12-02 15:37:12 +08:00
15b3f7df2a Merge branch 'feature-GHZS-440' into 'dev-5.17.0'
feat: 【V5.17.0】游戏详情-详情tab页面优化-游戏单推荐—客户端 https://jira.shanqu.cc/browse/GHZS-440

See merge request halo/android/assistant-android!525
2022-12-02 15:34:16 +08:00
937109224c feat: 【V5.17.0】游戏详情-详情tab页面优化-游戏单推荐—客户端 https://jira.shanqu.cc/browse/GHZS-440 2022-12-02 15:30:14 +08:00
cd1609a3ef chore: 版本更新至 5.15.2 v5.15.2-652 2022-12-02 15:18:22 +08:00
4fd9c7b36e Merge branch 'hotfix-v5.15.1-651-game_ratting_error' into 'release'
fix: 修改游戏评论闪退问题

See merge request halo/android/assistant-android!523
2022-12-02 14:29:22 +08:00
2bd8e0f96b fix: 修改游戏评论闪退问题 2022-12-02 14:25:06 +08:00
2d64f19f98 Merge branch 'hotfix-v5.15.1-651-simulator_crash' into 'release'
fix: 修复模拟器安装时的闪退

See merge request halo/android/assistant-android!521
2022-12-02 13:49:44 +08:00
15de55ceae fix: 修复模拟器安装时的闪退 2022-12-02 13:45:42 +08:00
2316bd1e18 Merge branch 'hotfix-v5.15.1-651-search_subject_crash' into 'release'
fix:修复搜索专题显示空白的问题

See merge request halo/android/assistant-android!520
2022-12-02 12:21:04 +08:00
6a4726650c fix:修复搜索专题显示空白的问题 2022-12-02 11:45:10 +08:00
e79e6f8ec8 Merge branch 'feature-GHZS-554' into 'dev'
fix:【光环助手V5.16.0】光环下载进度条优化-1201测试 https://jira.shanqu.cc/browse/GHZS-554

See merge request halo/android/assistant-android!519
2022-12-02 10:43:34 +08:00
894d962836 Merge branch 'feature-GHZS-549' into 'dev'
fix:【光环助手V5.16.0】游戏广告管理功能(前端部分)-1201测试- (2(2)、4) https://jira.shanqu.cc/browse/GHZS-549

See merge request halo/android/assistant-android!518
2022-12-02 10:42:29 +08:00
f48767c4bf fix:【光环助手V5.16.0】光环下载进度条优化-1201测试 https://jira.shanqu.cc/browse/GHZS-554 2022-12-02 10:32:17 +08:00
b5a64d1c36 fix:【光环助手V5.16.0】游戏广告管理功能(前端部分)-1201测试- (2(2)、4) https://jira.shanqu.cc/browse/GHZS-549 2022-12-02 09:55:25 +08:00
fb4936a553 feat:【V5.17.0】论坛详情页-问答帖新增排序方式切换—客户端 https://jira.shanqu.cc/browse/GHZS-390 2022-12-01 16:30:44 +08:00
001d062207 chore: 版本更新至 5.15.1 v5.15.1-651 2022-12-01 16:27:31 +08:00
d4b1b822f4 Merge branch 'legacy-release' into 'release'
合并 5.14.X 闪退修复

See merge request halo/android/assistant-android!517
2022-12-01 16:26:32 +08:00
732765118e Merge branch 'hotfix-v5.14.7-637-crashes' into 'legacy-release'
修复一些线上闪退

See merge request halo/android/assistant-android!516
2022-12-01 16:25:36 +08:00
eeacae1fd2 fix: 修复历史游戏列表因为历史副标题颜色不存在引起的闪退 2022-12-01 16:08:17 +08:00
e982ae9125 fix: 修复双列通用合集专题因为获取到错误的位置造成的闪退 2022-12-01 16:03:20 +08:00
a7ee0c754b fix: 捕抓畅玩因为存储空间不足造成的闪退 2022-12-01 16:01:27 +08:00
b042b3433d Merge branch 'feature-GHZS-534' into 'dev'
fix:【光环助手V5.16.0】光环下载进度条优化-1130测试2 https://jira.shanqu.cc/browse/GHZS-534

See merge request halo/android/assistant-android!515
2022-12-01 15:05:24 +08:00
8ba70f4a7d fix:【光环助手V5.16.0】光环下载进度条优化-1130测试2 https://jira.shanqu.cc/browse/GHZS-534 2022-12-01 14:59:04 +08:00