Commit Graph

11876 Commits

Author SHA1 Message Date
1e894e1158 feat: Xapk解压失败弹窗优化-0514优化 https://jira.shanqu.cc/browse/GHZSCY-5383 2024-06-11 17:18:34 +08:00
de9980af6a Merge branch 'feat/refactor_do_on_main_process_implementation' into 'dev'
feat: 重构限制主进程执行的相关代码

See merge request halo/android/assistant-android!1620
2024-04-12 15:29:54 +08:00
ec6ad35ade feat: 重构限制主进程执行的相关代码 2024-04-12 14:52:46 +08:00
fb7cdd5ce7 Merge branch 'feature-GHZS-4956' into 'dev'
feat: 内容卡片新增提示弹窗—客户端 https://jira.shanqu.cc/browse/GHZS-4956

See merge request halo/android/assistant-android!1595
2024-04-11 17:31:58 +08:00
3bbfd676fb feat: 内容卡片新增提示弹窗—客户端 https://jira.shanqu.cc/browse/GHZS-4956 2024-04-11 17:31:58 +08:00
81c8469e7b Merge branch 'feat/GHZS-5075' into 'dev'
feat: 搜索页面专区文案修改—客户端 https://jira.shanqu.cc/browse/GHZS-5075

See merge request halo/android/assistant-android!1615
2024-04-10 15:50:54 +08:00
2e03e9f4f5 feat: 搜索页面专区文案修改—客户端 https://jira.shanqu.cc/browse/GHZS-5075 2024-04-10 15:50:54 +08:00
6ab10a0eee Merge branch 'feat/GHZS-5050' into 'dev'
feat: 消息推送:接入极光消息推送系统—客户端 https://jira.shanqu.cc/browse/GHZS-5050

See merge request halo/android/assistant-android!1613
2024-04-10 14:46:35 +08:00
23f7d1f32c feat: 消息推送:接入极光消息推送系统—客户端 https://jira.shanqu.cc/browse/GHZS-5050 2024-04-10 14:46:35 +08:00
93f5343106 Merge branch 'feat/GHZS-5150' into 'dev'
feat: 下拉推送弹窗规则优化—客户端 https://jira.shanqu.cc/browse/GHZS-5150

See merge request halo/android/assistant-android!1614
2024-04-10 14:41:45 +08:00
6846a61dd5 feat: 下拉推送弹窗规则优化—客户端 https://jira.shanqu.cc/browse/GHZS-5150 2024-04-10 14:41:45 +08:00
6ebae66fc7 Merge remote-tracking branch 'origin/release' into dev
# Conflicts:
#	dependencies.gradle
2024-04-07 13:44:54 +08:00
907f840537 Merge branch 'feature=fix-sentry-bug-2' into 'release'
feat: 修复Sentry上报的BUG

See merge request halo/android/assistant-android!1610
2024-04-07 10:56:04 +08:00
07dfd58538 feat: 修复Sentry上报的BUG 2024-04-07 10:56:04 +08:00
4491865aef Merge branch 'chen/202404/GHZS-5117' into 'release'
fix:【光环助手】视频横屏滑动专题的显示问题 https://jira.shanqu.cc/browse/GHZS-5117

See merge request halo/android/assistant-android!1609
2024-04-03 17:24:22 +08:00
9dabe9fa03 fix:【光环助手】视频横屏滑动专题的显示问题 https://jira.shanqu.cc/browse/GHZS-5117 2024-04-03 17:01:47 +08:00
79349d51ee Merge branch 'hotfix/v5.34.3-1033/custom_common_collection_layout' into 'release'
fix: 修复通用链接跳转通用合集详情样式不正确的问题

See merge request halo/android/assistant-android!1608
v5.34.3-1033
2024-04-03 10:19:58 +08:00
a3319b71d2 fix: 修复通用链接跳转通用合集详情样式不正确的问题 2024-04-02 22:42:14 +08:00
b06341959d chore: 版本更新至 5.34.3 2024-04-02 18:20:43 +08:00
089e552e0f Merge branch 'feat/GHZS-5114' into 'release'
feat: 神策SDK版本升级 https://jira.shanqu.cc/browse/GHZS-5114

See merge request halo/android/assistant-android!1607
2024-04-02 18:20:25 +08:00
16e0da0c7c feat: 神策SDK版本升级 https://jira.shanqu.cc/browse/GHZS-5114 2024-04-02 17:58:48 +08:00
e1a9879ea4 chore: 版本更新至 5.34.2 v5.34.2-1032 2024-04-02 16:50:34 +08:00
b610e1619d Merge branch 'hotfix/v5.34.1-1031/fix_vgame_display_issue' into 'release'
fix: 修复自定义页面的最近在玩(畅玩)item 隐藏时高度没有变化的问题 https://jira.shanqu.cc/browse/GHZS-5112

See merge request halo/android/assistant-android!1606
2024-04-02 16:47:44 +08:00
6977e99269 fix: 畅玩-最近在玩的显示问题 https://jira.shanqu.cc/browse/GHZS-5112 2024-04-02 16:42:11 +08:00
18246edd46 Merge remote-tracking branch 'origin/release' into dev
# Conflicts:
#	dependencies.gradle
2024-04-02 11:23:44 +08:00
b7cadbce50 chore: 版本更新至 5.34.1 v5.34.1-1031 2024-04-01 16:13:50 +08:00
44569233e9 Merge branch 'hotfix/v5.34.0-1030/write_oaid_error' into 'release'
fix: 修复部分游戏没有 V2 签名导致写入 OAID 失败的问题

See merge request halo/android/assistant-android!1600
2024-04-01 11:33:51 +08:00
d1962cf363 Merge branch 'feat/GHZS-5068' into 'release'
feat: 备案号查询跳转 https://jira.shanqu.cc/browse/GHZS-5068

See merge request halo/android/assistant-android!1604
2024-04-01 11:33:48 +08:00
dbf35afa3f Merge branch 'hotfix/v5.34.0-1030/fix_crashes' into 'release'
fix: 修复下载模块初始化闪退问题,修复下载数据库升级闪退问题

See merge request halo/android/assistant-android!1605
2024-04-01 11:33:46 +08:00
1dcdb81529 feat: 备案号查询跳转 https://jira.shanqu.cc/browse/GHZS-5068
Signed-off-by: chenjuntao <chenjuntao@ghzhushou.com>
2024-04-01 11:18:42 +08:00
fb9d0d01d8 Merge branch 'feature-fix-sentry-bug' into 'release'
feat: 修复Sentry上报的BUG

See merge request halo/android/assistant-android!1603
2024-04-01 11:15:57 +08:00
f449a41257 feat: 修复Sentry上报的BUG 2024-04-01 11:15:57 +08:00
ef41245a1a fix: 修复下载模块初始化闪退问题,修复下载数据库升级闪退问题
Signed-off-by: chenjuntao <chenjuntao@ghzhushou.com>
2024-04-01 11:05:45 +08:00
c2aae6d5f9 ci: 添加 release 至 ci 触发分支 2024-04-01 10:51:10 +08:00
700a56c6f9 Merge branch 'chen/202404/GHZS-5069' into 'release'
fix:【光环助手】游戏专题问题修复 https://jira.shanqu.cc/browse/GHZS-5069

See merge request halo/android/assistant-android!1602
2024-04-01 10:32:50 +08:00
6673805ba1 Merge branch 'hotfix/v5.34.0-1030/simulator_game_shortcuts_crash' into 'release'
fix: 修复快捷方式启动模拟器游戏出现的闪退问题...

See merge request halo/android/assistant-android!1601
2024-04-01 10:32:35 +08:00
6130fa345b fix: 修复快捷方式启动模拟器游戏出现的闪退问题 https://sentry.shanqu.cc/organizations/lightgame/issues/376360/events/7240c5329d03408dba143ffb3fc8213a/?project=22 2024-04-01 10:31:13 +08:00
38a9bf0bfa fix:【光环助手】游戏专题问题修复 https://jira.shanqu.cc/browse/GHZS-5069 2024-04-01 10:30:45 +08:00
bdb2180af6 fix: 修复部分游戏没有 V2 签名导致写入 OAID 失败的问题
Signed-off-by: chenjuntao <chenjuntao@ghzhushou.com>
2024-03-29 19:02:10 +08:00
a4b8feb7ef Merge branch 'fix/privacy_issue' into 'release'
fix: 移除应用启动时获取光环包名及是否安装自应用商店的敏感代码

See merge request halo/android/assistant-android!1599
v5.34.0-1030
2024-03-29 17:29:12 +08:00
6c58b3b102 Merge branch 'hotfix/v5.34.0-1030/vgame_sinature_check_crash' into 'release'
fix: 修复检查畅玩游戏签名时导致的闪退问题

See merge request halo/android/assistant-android!1598
2024-03-29 17:27:17 +08:00
28014190f3 Merge branch 'chen/202403/optimize-sliding-experience2' into 'release'
优化首页滑动体验

See merge request halo/android/assistant-android!1597
2024-03-29 16:23:39 +08:00
76843829aa 优化首页滑动体验 2024-03-29 16:05:40 +08:00
ef3a243bc5 fix: 修复检查畅玩游戏签名时导致的闪退问题 2024-03-29 15:27:00 +08:00
796848a23c chore: 版本更新至 5.35.0 2024-03-29 11:01:32 +08:00
fc8766f2e7 fix: 移除应用启动时获取光环包名及是否安装自应用商店的敏感代码 2024-03-29 10:35:15 +08:00
278423cfad Merge branch 'feature-delay-notification-channel-create' into 'dev'
feat: 延迟推送NotificationChannel的创建

See merge request halo/android/assistant-android!1596
2024-03-29 10:08:39 +08:00
8e2f06c19b feat: 延迟推送NotificationChannel的创建 2024-03-29 10:05:32 +08:00
bf4f270c37 Merge branch 'feature-GHZS-4941' into 'dev'
feat: 消息推送:接入阿里云消息推送系统—客户端 https://jira.shanqu.cc/browse/GHZS-4941

See merge request halo/android/assistant-android!1593
2024-03-28 17:58:50 +08:00
d406cba6c2 feat: 消息推送:接入阿里云消息推送系统—客户端 https://jira.shanqu.cc/browse/GHZS-4941 2024-03-28 17:58:49 +08:00