Commit Graph

9941 Commits

Author SHA1 Message Date
01c2ff29f1 Merge branch 'feature-GHZS-1066' into 'dev-5.20.0'
fix:【光环助手】资讯文章-下载按钮显示问题 https://jira.shanqu.cc/browse/GHZS-1066

See merge request halo/android/assistant-android!669
2023-02-01 11:28:23 +08:00
9ddc4b1de0 chore: 版本更新到 5.20.0 2023-02-01 11:26:50 +08:00
de5420f01d fix:【光环助手】资讯文章-下载按钮显示问题 https://jira.shanqu.cc/browse/GHZS-1066 2023-02-01 11:14:46 +08:00
99c318c571 chore: 版本更新到 5.19.0 2023-01-31 10:24:44 +08:00
e77542abef Merge branch 'feature-GHZS-1020' into 'dev'
fix: 游戏镜像&游戏屏蔽优化汇总—0113补充  https://jira.shanqu.cc/browse/GHZS-1020

See merge request halo/android/assistant-android!667
2023-01-31 09:29:28 +08:00
2a5b189d36 Merge branch 'fix-discover_card_crash' into 'dev'
fix: 修复首页发现页卡片闪退问题

See merge request halo/android/assistant-android!666
2023-01-30 10:52:36 +08:00
8a6ac74b87 fix: 修复首页发现页卡片闪退问题 2023-01-30 10:46:03 +08:00
e8b185cb0f Merge branch 'feature-GHZS-1040' into 'dev'
fix: 游戏广告管理功能(第二期)—0118测试(2) https://jira.shanqu.cc/browse/GHZS-1040

See merge request halo/android/assistant-android!665
2023-01-18 15:01:03 +08:00
e4dc0d9cda fix: 游戏广告管理功能(第二期)—0118测试(2) https://jira.shanqu.cc/browse/GHZS-1040 2023-01-18 14:54:34 +08:00
f70f574e6d fix: 游戏镜像&游戏屏蔽优化汇总—0113补充 https://jira.shanqu.cc/browse/GHZS-1020 2023-01-17 15:14:07 +08:00
b6db8fa99f Merge branch 'feature-GHZS-998' into 'dev'
fix: 游戏镜像&游戏屏蔽优化汇总-0112测试(2(2)) https://jira.shanqu.cc/browse/GHZS-998

See merge request halo/android/assistant-android!663
2023-01-16 16:38:30 +08:00
2e113314ba fix: 游戏镜像&游戏屏蔽优化汇总-0112测试(2(2)) https://jira.shanqu.cc/browse/GHZS-998 2023-01-16 16:33:55 +08:00
d84f208de4 Merge branch 'feature-GHZS-988' into 'dev'
feat: 优化 GameEntity 高频调用方法的性能

See merge request halo/android/assistant-android!662
2023-01-16 10:41:29 +08:00
09ae826e3c feat: 优化 GameEntity 高频调用方法的性能 https://jira.shanqu.cc/browse/GHZS-968 2023-01-15 14:38:19 +08:00
18a04aac52 Merge branch 'fix-home_discover_item_dislocation' into 'dev'
fix: 修复首页发现页Item提交不喜欢错位问题

See merge request halo/android/assistant-android!661
2023-01-13 16:52:19 +08:00
cec418d484 fix: 修复首页发现页Item提交不喜欢错位问题 2023-01-13 16:42:30 +08:00
4dfed562d4 Merge branch 'feature-GHZS-956' into 'dev'
feat: 完善首页列表的子项数据比对代码 https://jira.shanqu.cc/browse/GHZS-956

See merge request halo/android/assistant-android!656
2023-01-13 15:51:36 +08:00
479b243136 feat: 完善首页列表的子项数据比对代码 https://jira.shanqu.cc/browse/GHZS-956 2023-01-13 15:51:36 +08:00
392bdf9715 Merge branch 'feature-GHZS-998' into 'dev'
fix: 游戏镜像&游戏屏蔽优化汇总-0112测试 https://jira.shanqu.cc/browse/GHZS-998

See merge request halo/android/assistant-android!660
2023-01-13 11:47:04 +08:00
39a4dcbe34 fix: 游戏镜像&游戏屏蔽优化汇总-0112测试 https://jira.shanqu.cc/browse/GHZS-998 2023-01-13 11:47:04 +08:00
3104db7c10 Merge branch 'fix_missing_material_button_crash' into 'dev'
fix: 修复 compose 包切换渠道时的闪退问题

See merge request halo/android/assistant-android!659
2023-01-13 10:25:16 +08:00
0f9cff90f8 fix: 修复 compose 包切换渠道时的闪退问题 2023-01-13 10:20:21 +08:00
197e650e81 Merge remote-tracking branch 'origin/release' into dev 2023-01-13 09:53:09 +08:00
f60c907978 Merge branch 'hotfix-vspace_launch_error' into 'release'
修复畅玩游戏安装异常

See merge request halo/android/assistant-android!658
2023-01-12 20:46:00 +08:00
3f21d7d37c 修复畅玩游戏安装异常 2023-01-12 20:46:00 +08:00
e622d6a8ee Merge branch 'hotfix-v5.17.3-693-crashes' into 'release'
fix: 全量捕抓畅玩云存档下载的数据库异常

See merge request halo/android/assistant-android!657
2023-01-12 17:13:42 +08:00
e911588569 fix: 全量捕抓畅玩云存档下载的数据库异常 2023-01-12 17:04:36 +08:00
92d006e018 Merge branch 'feature-GHZS-982' into 'dev'
fix: 处理部分页面深色模式下的显示异常 https://jira.shanqu.cc/browse/GHZS-982

See merge request halo/android/assistant-android!655
2023-01-12 14:15:07 +08:00
a04c9bb7c2 Merge branch 'fix-dark_mode' into 'dev'
处理部分界面切换深色模式出现的异常

See merge request halo/android/assistant-android!652
2023-01-12 14:14:36 +08:00
f0093f3ff5 fix: 处理部分页面深色模式下的显示异常 https://jira.shanqu.cc/browse/GHZS-982 2023-01-12 13:55:32 +08:00
8b1c046475 Merge branch 'hotfix-v5.17.3-693-fix_vgame_update' into 'release'
fix: 修复畅玩游戏更新功能

See merge request halo/android/assistant-android!654
2023-01-12 09:21:06 +08:00
984a1ba517 fix: 修复畅玩游戏更新功能 2023-01-12 09:21:05 +08:00
d5021e139d Merge branch 'fix-data_compare_issue' into 'dev'
fix: 还原部分列表 data class,避免列表比较时的异常

See merge request halo/android/assistant-android!653
2023-01-11 16:59:54 +08:00
d43613b259 fix: 还原部分列表 data class,避免列表比较时的异常 2023-01-11 16:54:14 +08:00
8c2eb3d2be fix: 修复礼包中心右上角管理菜单显示时标题不居中的问题 2023-01-11 11:49:56 +08:00
3e55f2e1a1 fix: 修复礼包中心存号箱tab没有兼容深色模式的问题 2023-01-11 11:48:45 +08:00
2424521d0f fix: 修复部分带Tab界面Tab切换深色模式不变色的问题 2023-01-11 11:48:06 +08:00
e42b060e85 Merge branch 'feature-GHZS-953' into 'dev'
fix: 游戏镜像&游戏屏蔽优化汇总—客户端 https://jira.shanqu.cc/browse/GHZS-953

See merge request halo/android/assistant-android!651
2023-01-11 11:18:28 +08:00
e29a787c73 fix: 游戏镜像&游戏屏蔽优化汇总—客户端 https://jira.shanqu.cc/browse/GHZS-953 2023-01-11 11:18:28 +08:00
362ac1415c Merge remote-tracking branch 'origin/release' into dev
# Conflicts:
#	dependencies.gradle
2023-01-11 11:11:02 +08:00
a5cdc5b432 Merge branch 'feature-GHZS-973' into 'dev'
fix: 【光环助手】内容卡片-镜像游戏显示优化 https://jira.shanqu.cc/browse/GHZS-973

See merge request halo/android/assistant-android!650
2023-01-11 09:23:41 +08:00
1d3ef08bb3 fix: 【光环助手】内容卡片-镜像游戏显示优化 https://jira.shanqu.cc/browse/GHZS-973 2023-01-10 21:38:13 +08:00
a337494d22 chore: 版本更新到 5.17.3 v5.17.3-693 2023-01-10 16:00:58 +08:00
6c5f9f2689 Merge branch 'hotfix-v5.17.2-692-crashes' into 'release'
修复闪退和畅玩连接异常

See merge request halo/android/assistant-android!649
2023-01-10 16:00:12 +08:00
7ad73b84f9 fix: 修复畅玩 contentProvider 写入闪退,修复畅玩服务断连后首次安装失败的问题 2023-01-10 15:53:34 +08:00
ad683b66d7 fix: 修复检查设备 webview 状态时 webview 列表为空时的闪退 2023-01-10 15:51:12 +08:00
fb719577cf chore: 版本更新到 5.17.2 v5.17.2-692 2023-01-09 18:17:16 +08:00
7770f16565 Merge branch 'hotfix-v5.17.1-691-crashes' into 'release'
fix: 修复存储满了的闪退问题,尝试修复畅玩游戏写入数据时的闪退问题,捕抓畅玩时启动安装 activity 的闪退

See merge request halo/android/assistant-android!647
2023-01-09 18:16:37 +08:00
43fdd0d8d3 Merge branch 'revert-fbd61f37' into 'release'
Revert "Merge branch 'hotfix-v5.17.1-691-home_list_crash' into 'release'"

See merge request halo/android/assistant-android!648
2023-01-09 18:09:37 +08:00
0067ef2c40 Revert "Merge branch 'hotfix-v5.17.1-691-home_list_crash' into 'release'"
This reverts merge request !640
2023-01-09 18:08:07 +08:00