Commit Graph

10747 Commits

Author SHA1 Message Date
7ad634c78e Merge remote-tracking branch 'origin/dev' into dev-5.24.0 2023-04-11 10:45:16 +08:00
6950c9af09 Merge remote-tracking branch 'origin/dev' into dev-5.24.0
# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/gh/common/xapk/XapkInstaller.kt
2023-04-11 10:37:40 +08:00
851f79c58f feat: 论坛子版块新增发帖权限限制—客户端 https://jira.shanqu.cc/browse/GHZS-1909 2023-04-11 10:31:05 +08:00
7ef2d9b193 Merge remote-tracking branch 'origin/release' into dev
# Conflicts:
#	app/src/main/java/com/gh/download/DownloadManager.java
#	dependencies.gradle
#	module_common/src/main/java/com/gh/gamecenter/common/utils/Extensions.kt
2023-04-11 10:21:54 +08:00
7298d772bb Merge branch 'refactor-remove_legacy_code' into 'dev-5.24.0'
feat: 移除光能部分代码

See merge request halo/android/assistant-android!892
2023-04-11 10:14:53 +08:00
7a6afa9f6c feat: 移除光能部分代码 2023-04-11 09:49:44 +08:00
310b800149 Merge branch 'feat-GHZS-1941' into 'dev-5.24.0'
feat:光环跳转畅玩助手,携带信息增加游戏图标url; https://jira.shanqu.cc/browse/GHZS-1941

See merge request halo/android/assistant-android!890
2023-04-11 09:40:30 +08:00
4126f06107 Merge branch 'hotfix-v5.22.4-794-tea_version' into 'release'
fix: 头条 SDK 基础版本升级为 6.14.3

See merge request halo/android/assistant-android!891
v5.22.4-794
2023-04-10 18:03:54 +08:00
3e3f276cc4 fix: 头条 SDK 基础版本升级为 6.14.3 2023-04-10 18:01:32 +08:00
a3ff7d19a7 feat:光环跳转畅玩助手,携带信息增加游戏图标url; https://jira.shanqu.cc/browse/GHZS-1941 2023-04-10 17:48:13 +08:00
bd5902d924 chore: 版本更新至 5.22.4 2023-04-10 15:31:01 +08:00
7022cf97c8 Merge branch 'hotfix-v5.22.3-793-vspace_config_update_issue' into 'release'
fix: 修复畅玩服务工具因为初始化时序问题,有机率无法更新到最新配置的问题

See merge request halo/android/assistant-android!889
2023-04-10 15:30:22 +08:00
0452116830 fix: 修复畅玩服务工具因为初始化时序问题,有机率无法更新到最新配置的问题 2023-04-10 15:23:43 +08:00
5dfbe5c571 Merge branch 'hotfix-v5.22.3-793-change_fixed_tea_version' into 'release'
fix: 头条 SDK 版本跟随输入变更

See merge request halo/android/assistant-android!888
v5.22.3-793
2023-04-10 14:01:13 +08:00
b8adfc7a4b fix: 头条 SDK 版本跟随输入变更 2023-04-10 13:58:04 +08:00
87de104da6 Merge branch 'pack-v5.22.3-793-multithread_download' into 'release'
feat: 游戏下载底层下载切换至多线程

See merge request halo/android/assistant-android!887
2023-04-10 11:15:28 +08:00
b97a68828d Merge branch 'feature-meta_build_without_multithread_download' into 'release'
feat: 【光环助手】推广组测试打包任务 https://jira.shanqu.cc/browse/GHZS-972

See merge request halo/android/assistant-android!885
2023-04-10 10:59:19 +08:00
b84f456943 Merge branch 'feature-remove_redundant_video_hint' into 'dev-5.24.0'
feat: 移除无用的视频引导相关代码和资源

See merge request halo/android/assistant-android!886
2023-04-10 10:58:04 +08:00
18e96d1c0c feat: 【光环助手】推广组测试打包任务 https://jira.shanqu.cc/browse/GHZS-972 2023-04-10 10:04:32 +08:00
07abad8e04 feat: 移除无用的视频引导相关代码和资源 2023-04-10 09:35:38 +08:00
ad8f06f899 Merge branch 'feature-GHZS-1848' into 'dev-5.24.0'
fix: 我的游戏-玩过 游戏显示问题 https://jira.shanqu.cc/browse/GHZS-1848

See merge request halo/android/assistant-android!884
2023-04-06 19:21:13 +08:00
eb1b04caea fix: 我的游戏-玩过 游戏显示问题 https://jira.shanqu.cc/browse/GHZS-1848 2023-04-06 19:19:30 +08:00
84493b312e Merge branch 'feature-GHZS-1914' into 'dev-5.24.0'
feat: 内容点击来源数据记录 https://jira.shanqu.cc/browse/GHZS-1914

See merge request halo/android/assistant-android!883
2023-04-06 17:00:31 +08:00
fe4ad76e2a feat: 内容点击来源数据记录 https://jira.shanqu.cc/browse/GHZS-1914 2023-04-06 16:57:35 +08:00
e9efbbc44a Merge branch 'fix-GHZS-1966' into 'dev'
fix: 首页轮播图样式改版-前端部分—0331测试(0406测试2) https://jira.shanqu.cc/browse/GHZS-1966

See merge request halo/android/assistant-android!882
2023-04-06 15:34:29 +08:00
7cc7bb54d0 fix: 首页轮播图样式改版-前端部分—0331测试(0406测试2) https://jira.shanqu.cc/browse/GHZS-1966 2023-04-06 15:24:31 +08:00
4adcadbc21 Merge remote-tracking branch 'origin/dev' into dev-5.24.0 2023-04-06 11:09:17 +08:00
38a5893b4d Merge branch 'fix-GHZS-1966' into 'dev'
fix: 首页轮播图样式改版-前端部分—0331测试(0404测试5) https://jira.shanqu.cc/browse/GHZS-1966

See merge request halo/android/assistant-android!881
2023-04-06 11:08:55 +08:00
2c303002f3 Merge remote-tracking branch 'origin/release' into dev
# Conflicts:
#	dependencies.gradle
2023-04-06 10:55:30 +08:00
316778e8a5 feat: 底层下载切换至多线程 2023-04-06 10:31:12 +08:00
210f731b59 chore: 版本更新至 5.22.3 2023-04-06 10:29:32 +08:00
42b7a4abf9 fix: 首页轮播图样式改版-前端部分—0331测试(0404测试5) https://jira.shanqu.cc/browse/GHZS-1966 2023-04-06 10:10:38 +08:00
6a12a0236e Merge branch 'feature-GHZS-1919' into 'dev-5.24.0'
feat: Xapk游戏解压相关埋点补充 https://jira.shanqu.cc/browse/GHZS-1919

See merge request halo/android/assistant-android!880
2023-04-06 09:24:31 +08:00
9e6816440b Merge branch 'hotfix-v5.22.2-792-crashes' into 'release'
处理线上测试包 5.22 的相关闪退

See merge request halo/android/assistant-android!879
2023-04-06 09:24:22 +08:00
d37d4c37bf feat: Xapk游戏解压相关埋点补充 https://jira.shanqu.cc/browse/GHZS-1919 2023-04-05 17:51:28 +08:00
128fea4446 fix: 修复游戏详情页快速跳转时的闪退 https://sentry.shanqu.cc/organizations/lightgame/issues/285364/?project=22&query=dist%3A792&statsPeriod=14d 2023-04-05 10:19:37 +08:00
7e6e85469c fix: 修复刷新延时触发的空指针闪退 https://sentry.shanqu.cc/organizations/lightgame/issues/283770/events/9e0110112aa34b369fdfe89f00fe41f8/?project=22&query=LazyListFragment&statsPeriod=14d 2023-04-05 10:09:06 +08:00
d9c1108dfe fix: 捕抓游戏详情顶部视频暂停时显示占位图所有的异常 2023-04-05 10:01:24 +08:00
86b79d6240 fix: 修复接收卸载应用广播时偶发的数组越界闪退 https://sentry.shanqu.cc/organizations/lightgame/issues/240065/events/0ea60d852bd9400faa6ab2fc611be890/?project=22&query=dist%3A792&statsPeriod=14d 2023-04-05 10:00:29 +08:00
acd308eb00 Merge branch 'hotfix-v5.22.1-791-gid' into 'release'
处理神策 gid 绑定问题

See merge request halo/android/assistant-android!877
2023-04-04 15:35:19 +08:00
c0937b7393 fix: 补充 gid 变更的数据上报,以及神策的临时 gid 解绑操作 2023-04-04 15:27:18 +08:00
7a04e1b8f4 Merge branch 'feature-GHZS-1917' into 'dev-5.24.0'
feat: 深色模式相关埋点补充—客户端 https://jira.shanqu.cc/browse/GHZS-1917

See merge request halo/android/assistant-android!876
2023-04-04 11:04:56 +08:00
b666368bb2 feat: 深色模式相关埋点补充—客户端 https://jira.shanqu.cc/browse/GHZS-1917 2023-04-04 10:59:03 +08:00
62b9e8a76c chore: 版本更新至 5.22.2 2023-04-04 10:35:52 +08:00
76b3607c7f Merge branch 'hotfix-v5.22.1-791-crash' into 'release'
fix: 修复游戏详情页顶部视频闪退

See merge request halo/android/assistant-android!875
2023-04-04 10:27:07 +08:00
619ca32a4a fix: 修复游戏详情页顶部视频闪退 2023-04-04 10:16:03 +08:00
2bd9b7cfe2 Merge branch 'feat-GHZS-1870' into 'release'
feat: VPN预授权弹窗文案修改 https://jira.shanqu.cc/browse/GHZS-1869

See merge request halo/android/assistant-android!874
2023-04-04 09:22:33 +08:00
c93978c773 feat: VPN预授权弹窗文案修改 https://jira.shanqu.cc/browse/GHZS-1869 2023-04-04 09:20:51 +08:00
d0991d1b1b chore: 版本更新至 5.24.0 2023-04-03 17:36:20 +08:00
60b3c25162 Merge branch 'fix-GHZS-1976' into 'release'
fix:【光环助手】神策分析报告问题(2、4) https://jira.shanqu.cc/browse/GHZS-1976

See merge request halo/android/assistant-android!872
2023-04-03 17:32:44 +08:00