Commit Graph

10747 Commits

Author SHA1 Message Date
9f451af564 Merge branch 'fix-GHZS-2074' into 'dev-5.24.0'
fix: 新增右下角悬浮窗—0415优化 https://jira.shanqu.cc/browse/GHZS-2074

See merge request halo/android/assistant-android!917
2023-04-17 11:52:25 +08:00
6f62b597b7 fix: 新增右下角悬浮窗—0415优化 https://jira.shanqu.cc/browse/GHZS-2074 2023-04-17 11:42:36 +08:00
b6f73a1e61 Merge branch 'fix-GHZS-2076' into 'dev-5.24.0'
fix: 新增[首页下拉推送]功能-前端部分-0417测试 https://jira.shanqu.cc/browse/GHZS-2076

See merge request halo/android/assistant-android!915
2023-04-17 10:56:01 +08:00
814d212f53 Merge branch 'fix-GHZS-2064' into 'dev-5.24.0'
fix: 新增[首页下拉推送]功能-前端部分-0414测试(第5点补充) https://jira.shanqu.cc/browse/GHZS-2064

See merge request halo/android/assistant-android!913
2023-04-17 10:55:26 +08:00
4f07be4528 Merge branch 'fix-GHZS-2021' into 'dev-5.24.0'
fix: 去除“推荐入口板块”与下方衔接板块之间多余的间距,但是下方衔接“最近在玩”板块时的间距正常,所以间距加到最近在玩板块;...

See merge request halo/android/assistant-android!914
2023-04-17 10:50:31 +08:00
6eaf16e039 fix: 去除“推荐入口板块”与下方衔接板块之间多余的间距,但是下方衔接“最近在玩”板块时的间距正常,所以间距加到最近在玩板块;... 2023-04-17 10:50:31 +08:00
89a7325264 fix: 新增[首页下拉推送]功能-前端部分-0417测试 https://jira.shanqu.cc/browse/GHZS-2076 2023-04-17 10:47:10 +08:00
0cdceaf0ed Merge branch 'fix-GHZS-2074' into 'dev-5.24.0'
fix: 新增右下角悬浮窗—0415优化 https://jira.shanqu.cc/browse/GHZS-2074

See merge request halo/android/assistant-android!912
2023-04-17 10:23:50 +08:00
c0eb8c7263 fix: 新增右下角悬浮窗—0415优化 https://jira.shanqu.cc/browse/GHZS-2074 2023-04-17 10:21:17 +08:00
4581acb5d4 fix: 新增[首页下拉推送]功能-前端部分-0414测试(第5点补充) https://jira.shanqu.cc/browse/GHZS-2064 2023-04-17 10:20:17 +08:00
9c1d64ffe6 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!911
2023-04-17 09:35:43 +08:00
6de711d127 feat: 通用内容合集优化 https://jira.shanqu.cc/browse/GHZS-2011 2023-04-17 09:31:27 +08:00
17a5445f25 fix: 回滚 ci 相关配置 2023-04-14 19:06:44 +08:00
7062d5d8d4 Merge branch 'fix-GHZS-2064' into 'dev-5.24.0'
fix: 新增[首页下拉推送]功能-前端部分-0414测试 https://jira.shanqu.cc/browse/GHZS-2064

See merge request halo/android/assistant-android!910
2023-04-14 18:10:47 +08:00
38347243f3 fix: 新增[首页下拉推送]功能-前端部分-0414测试 https://jira.shanqu.cc/browse/GHZS-2064 2023-04-14 18:01:26 +08:00
bf11c964a3 Merge branch 'fix-GHZS-2061' into 'dev-5.24.0'
fix: 新增[首页下拉推送]功能-0414UI测试 https://jira.shanqu.cc/browse/GHZS-2061

See merge request halo/android/assistant-android!909
2023-04-14 16:58:42 +08:00
d76e3beb63 Merge branch 'fix-floating_window_display_issue' into 'dev-5.24.0'
fix: 完善右下角悬浮窗图片显示逻辑 https://jira.shanqu.cc/projects/GHZS/issues/GHZS-1843

See merge request halo/android/assistant-android!908
2023-04-14 16:47:15 +08:00
e6d8ee779d fix: 完善右下角悬浮窗图片显示逻辑 https://jira.shanqu.cc/projects/GHZS/issues/GHZS-1843 2023-04-14 16:46:46 +08:00
744b60d0de fix: 新增[首页下拉推送]功能-0414UI测试 https://jira.shanqu.cc/browse/GHZS-2061 2023-04-14 16:18:20 +08:00
6bbca7e62d Merge branch 'fix-GHZS-1938' into 'dev-5.24.0'
fix: 修复5.0以下系统进入首页闪退的问题

See merge request halo/android/assistant-android!907
2023-04-14 14:37:24 +08:00
39983bdc02 fix: 修复5.0以下系统进入首页闪退的问题 2023-04-14 14:05:00 +08:00
a72a12c516 Merge branch 'fix-GHZS-1938' into 'dev-5.24.0'
fix: 修复首页下拉推送展开时切换深色模式出现的变色异常

See merge request halo/android/assistant-android!906
2023-04-14 11:31:48 +08:00
4fa5234231 fix: 修复首页下拉推送展开时切换深色模式出现的变色异常 2023-04-14 11:25:05 +08:00
26f5a03c98 Merge branch 'fix-floating_window_display_issue' into 'dev-5.24.0'
fix: 悬浮窗避免显示过大图片,同步悬浮窗与关闭按钮的出现

See merge request halo/android/assistant-android!905
2023-04-14 11:17:19 +08:00
cff85a9990 fix: 避免显示过大图片,同步悬浮窗与关闭按钮的出现 2023-04-14 11:10:07 +08:00
cf82938182 Merge branch 'feature-GHZS-1938' into 'dev-5.24.0'
feat: 新增[首页下拉推送]功能-前端部分—客户端 https://jira.shanqu.cc/browse/GHZS-1938

See merge request halo/android/assistant-android!904
2023-04-14 10:55:00 +08:00
103b551f88 feat: 新增[首页下拉推送]功能-前端部分—客户端 https://jira.shanqu.cc/browse/GHZS-1938 2023-04-14 10:55:00 +08:00
a7fb23fda9 fix: 处理编译问题 2023-04-13 19:41:37 +08:00
0735458c8b Merge branch 'feature-GHZS-1962' into 'dev-5.24.0'
feat: 新增右下角悬浮窗 https://jira.shanqu.cc/browse/GHZS-1962

See merge request halo/android/assistant-android!903
2023-04-13 17:52:15 +08:00
7559e87117 feat: 新增右下角悬浮窗 https://jira.shanqu.cc/browse/GHZS-1962 2023-04-13 17:49:39 +08:00
beb282503d Merge branch 'hotfix-v5.22.4-794-rating_reply_download_button' into 'release'
fix: 修复评价详情页下载按钮下载时不更新进度条的问题

See merge request halo/android/assistant-android!902
v5.22.5-795
2023-04-13 11:51:49 +08:00
4fc185a033 fix: 修复评价详情页下载按钮下载时不更新进度条的问题 2023-04-13 11:45:02 +08:00
5a54a85fe1 Merge branch 'hotfix-v5.22.4-794-GHZS-2028' into 'release'
fix: 礼包状态更新不限制是否登录

See merge request halo/android/assistant-android!901
2023-04-13 09:20:09 +08:00
d19e7f97d1 fix: 礼包状态更新不限制是否登录 2023-04-13 09:17:05 +08:00
fbb9fb885b Merge branch 'fix-GHZS-2036' into 'dev'
fix: 论坛子版块新增发帖权限限制—0412测试-客户端 https://jira.shanqu.cc/browse/GHZS-2036

See merge request halo/android/assistant-android!900
2023-04-12 17:17:53 +08:00
2547f21174 fix: 论坛子版块新增发帖权限限制—0412测试-客户端 https://jira.shanqu.cc/browse/GHZS-2036 2023-04-12 16:49:10 +08:00
0056680f4a chore: 版本更新至 5.22.5 2023-04-12 16:37:22 +08:00
1eb81d994d Merge branch 'hotfix-v5.22.4-794-game_detail_libao_crash' into 'release'
fix: 修复游戏礼包登录后点击复制会闪退的问题 https://jira.shanqu.cc/browse/GHZS-2028

See merge request halo/android/assistant-android!898
2023-04-12 16:36:32 +08:00
24949b9688 Merge branch 'fix-v5.22.4-794-meta_build' into 'release'
fix: 神策数据接受地址改成正式项目

See merge request halo/android/assistant-android!899
2023-04-12 16:36:21 +08:00
65de350da2 Merge branch 'hotfix-v5.22.4-794-meta_build_issue' into 'release'
fix: 推广打包后台功能—0330测试-客户端 https://jira.shanqu.cc/browse/GHZS-1874

See merge request halo/android/assistant-android!896
2023-04-12 16:36:09 +08:00
d02e8fbfa6 fix: 神策数据接受地址改成正式项目 2023-04-12 16:33:04 +08:00
48e8d4b631 fix: 修复游戏礼包登录后点击复制会闪退的问题 https://jira.shanqu.cc/browse/GHZS-2028 2023-04-12 16:21:18 +08:00
517c3c90d5 Merge branch 'fix-GHZS-1892' into 'dev-5.24.0'
fix:前端游戏详情页—自定义板块展示样式问题:超链接文本增加下划线; https://jira.shanqu.cc/browse/GHZS-1892

See merge request halo/android/assistant-android!897
2023-04-12 15:49:02 +08:00
5ee773c5b8 fix:前端游戏详情页—自定义板块展示样式问题:超链接文本增加下划线; https://jira.shanqu.cc/browse/GHZS-1892 2023-04-12 15:40:47 +08:00
e4e92e0efc fix: 推广打包后台功能—0330测试-客户端 https://jira.shanqu.cc/browse/GHZS-1874 2023-04-12 15:15:18 +08:00
1d0bf46597 Merge branch 'fix-GHZS-2020' into 'dev'
fix:【光环助手】同步正式问题—前端徽章小图标展示问题 https://jira.shanqu.cc/browse/GHZS-2020

See merge request halo/android/assistant-android!895
2023-04-12 11:00:31 +08:00
98c0fb39b4 fix:【光环助手】同步正式问题—前端徽章小图标展示问题 https://jira.shanqu.cc/browse/GHZS-2020 2023-04-12 10:53:26 +08:00
db037e4162 Merge branch 'fix-leakcanary' into 'dev-5.24.0'
fix: 修复 LeakCanary 失效的问题

See merge request halo/android/assistant-android!894
2023-04-11 11:28:53 +08:00
2d3af55875 fix: 修复 leakCanary 失效的问题 2023-04-11 11:23:31 +08:00
2fdb613ecc Merge branch 'feature-GHZS-1909' into 'dev'
feat: 论坛子版块新增发帖权限限制—客户端 https://jira.shanqu.cc/browse/GHZS-1909

See merge request halo/android/assistant-android!893
2023-04-11 11:04:57 +08:00