Commit Graph

11836 Commits

Author SHA1 Message Date
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
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
6c4d17ab9e feat: 调整判定 refresh 渠道的依据 https://jira.shanqu.cc/browse/GHZS-5043 2024-03-28 14:44:46 +08:00
8fc9134402 Merge remote-tracking branch 'origin/release' into dev
# Conflicts:
#	app/src/main/java/com/gh/common/databind/BindingAdapters.java
#	app/src/main/java/com/gh/download/DownloadManager.java
2024-03-27 17:14:09 +08:00
babb7d3f7b Merge branch 'feat/GHZS-4887' into 'dev'
feat: 网游插件签名管理 https://jira.shanqu.cc/browse/GHZS-4887

See merge request halo/android/assistant-android!1591
2024-03-27 10:08:37 +08:00
0972e90049 feat: 网游插件签名管理 https://jira.shanqu.cc/browse/GHZS-4887 2024-03-27 09:58:00 +08:00
df2382609a Merge branch 'hotfix/v5.33.2-1012/index_out_of_bounds_exception' into 'release'
fix: 修复数组越界闪退问题...

See merge request halo/android/assistant-android!1589
2024-03-26 16:19:00 +08:00
b61fdd0a0e fix: 修复数组越界闪退问题 https://sentry.shanqu.cc/organizations/lightgame/issues/372151/?query=is%3Aunresolved+assigned%3Ame&referrer=issue-stream&statsPeriod=14d 2024-03-26 15:11:52 +08:00
0662ecd86b Merge branch 'feat/remove_legacy_tag_code' into 'dev'
feat: 移除已经失效的插件标签相关代码

See merge request halo/android/assistant-android!1588
2024-03-26 10:51:03 +08:00
3c6920520e feat: 移除已经失效的插件标签相关代码
Signed-off-by: chenjuntao <chenjuntao@ghzhushou.com>
2024-03-26 10:34:13 +08:00
03bbcc2af3 Merge branch 'feat/GHZS-4955' into 'dev'
feat: 开屏广告神策埋点补充—客户端 https://jira.shanqu.cc/browse/GHZS-4955

See merge request halo/android/assistant-android!1587
2024-03-25 15:36:04 +08:00
5efd61d5f6 feat: 开屏广告神策埋点补充—客户端 https://jira.shanqu.cc/browse/GHZS-4955 2024-03-25 15:36:04 +08:00
737e14a6ce Merge branch 'feat/GHZS-4959' into 'dev'
feat: 广告位管理第三方广告相关优化—客户端 https://jira.shanqu.cc/browse/GHZS-4959

See merge request halo/android/assistant-android!1586
2024-03-25 15:35:40 +08:00
68931b5d9c feat: 广告位管理第三方广告相关优化—客户端 https://jira.shanqu.cc/browse/GHZS-4959 2024-03-25 15:35:40 +08:00
dac1f207f2 Merge branch 'feat/GHZS-3956' into 'dev'
feat: APP内容配置重构

See merge request halo/android/assistant-android!1584
2024-03-22 16:56:21 +08:00
dd48585bca feat: APP内容配置重构 https://jira.shanqu.cc/browse/GHZS-3956 2024-03-22 16:56:21 +08:00
b4a8c07d8a fix: 修复深色模式下载管理第三方 banner 广告显示透明的问题
Signed-off-by: chenjuntao <chenjuntao@ghzhushou.com>
2024-03-22 16:54:28 +08:00
7a417bc655 feat: 为内嵌网页添加 JS 获取 OAID 的方法
Signed-off-by: chenjuntao <chenjuntao@ghzhushou.com>
2024-03-22 15:51:43 +08:00
6efb8ee700 Merge branch 'feat/GHZS-4844' into 'dev'
feat: 已下载安装包提取及清理需求—客户端 https://jira.shanqu.cc/browse/GHZS-4844

See merge request halo/android/assistant-android!1555
2024-03-20 16:05:10 +08:00
1d58dcc998 feat: 已下载安装包提取及清理需求—客户端 https://jira.shanqu.cc/browse/GHZS-4844 2024-03-20 16:05:10 +08:00
5647b9c0b0 Merge branch 'fix/GHZS-5004' into 'dev'
fix: 开屏广告点击问题 https://jira.shanqu.cc/browse/GHZS-5004

See merge request halo/android/assistant-android!1580
2024-03-20 14:37:51 +08:00
ba0eb38ee8 Merge branch 'feat/clean_up_legacy_code' into 'dev'
feat: 移除已经无用/不维护的代码(dokit, 畅玩数据库备份)

See merge request halo/android/assistant-android!1578
2024-03-20 14:20:39 +08:00
3406addd87 Merge branch 'fix/catch_add_channel_exception' into 'dev'
feat: 包裹为 APK 写入渠道内容时的错误

See merge request halo/android/assistant-android!1579
2024-03-20 14:20:35 +08:00
52f7120157 feat: 包裹为 APK 写入渠道内容时的错误
Signed-off-by: chenjuntao <chenjuntao@ghzhushou.com>
2024-03-20 14:13:46 +08:00
ee742213e6 feat: 移除已经无用/不维护的代码(dokit, 畅玩数据库备份)
Signed-off-by: chenjuntao <chenjuntao@ghzhushou.com>
2024-03-20 14:05:47 +08:00
3816ce44a5 fix: 开屏广告点击问题 https://jira.shanqu.cc/browse/GHZS-5004 v4.40.0-4400 2024-03-20 11:37:49 +08:00
37c6c7bb26 Merge branch 'feature-GHZS-4982' into 'dev'
fix: 【光环助手】部分页面文字显示颜色没有适配深色模式 https://jira.shanqu.cc/browse/GHZS-4982

See merge request halo/android/assistant-android!1577
2024-03-19 13:39:16 +08:00
a0bc96fa2b fix: 【光环助手】部分页面文字显示颜色没有适配深色模式 https://jira.shanqu.cc/browse/GHZS-4982 2024-03-19 13:39:16 +08:00
5375901813 Merge branch 'feat/GHZS-4992' into 'dev'
feat: 关于XAPK/APKS自动解压的优化—客户端 https://jira.shanqu.cc/browse/GHZS-4993

See merge request halo/android/assistant-android!1576
2024-03-19 11:48:35 +08:00
816c37ed6f feat: 关于XAPK/APKS自动解压的优化—客户端 https://jira.shanqu.cc/browse/GHZS-4993 2024-03-19 10:05:12 +08:00
a3c603490d Merge remote-tracking branch 'origin/release' into dev
# Conflicts:
#	app/src/main/java/com/gh/ndownload/NDownloadBridge.kt
#	libraries/LGLibrary
2024-03-18 16:53:54 +08:00
2e18460f22 Merge branch 'hotfix/v5.33.2-1012/download_dir_crash' into 'release'
fix: 修复部分 Android 6.0 及以下设备获取下载地址时出现的空指针闪退问题 https://sentry.shanqu.cc/organizations/lightgame/issues/364171

See merge request halo/android/assistant-android!1575
2024-03-18 16:50:02 +08:00
6482bb31e9 fix: 修复部分 Android 6.0 以下设备获取下载地址时出现的空指针闪退问题 https://sentry.shanqu.cc/organizations/lightgame/issues/364171 2024-03-18 16:49:15 +08:00
1822177e2c Merge branch 'hotfix/v5.33.2-1012/splash_ad_crash' into 'release'
fix: 修复开屏广告空指针闪退问题...

See merge request halo/android/assistant-android!1568
2024-03-15 10:22:30 +08:00
3af3d4255f fix: 修复开屏广告空指针闪退问题... 2024-03-15 10:22:29 +08:00
a58498741b Merge branch 'feature-GHZS-4867' into 'dev'
feat: 新增联网APP字段—客户端 https://jira.shanqu.cc/browse/GHZS-4867

See merge request halo/android/assistant-android!1564
2024-03-15 09:51:54 +08:00
c01c9af191 feat: 新增联网APP字段—客户端 https://jira.shanqu.cc/browse/GHZS-4867 2024-03-15 09:51:54 +08:00
463ac5fc77 Merge branch 'feature-GHZS-3927' into 'dev'
feat: 内容社区神策埋点-第一期—客户端 https://jira.shanqu.cc/browse/GHZS-3927

See merge request halo/android/assistant-android!1496
2024-03-11 09:49:48 +08:00
3bd4823463 feat: 内容社区神策埋点-第一期—客户端 https://jira.shanqu.cc/browse/GHZS-3927 2024-03-11 09:49:47 +08:00
240666aa5f Merge branch 'feature-GHZS-3763' into 'dev'
feat: 替换文件上传 SDK https://jira.shanqu.cc/browse/GHZS-3763

See merge request halo/android/assistant-android!1561
2024-03-08 10:32:42 +08:00
77bbf5c647 feat: 替换文件上传 SDK https://jira.shanqu.cc/browse/GHZS-3763 2024-03-08 10:32:42 +08:00
873178c10d Merge branch 'feature-GHZS-4489' into 'dev'
feat: 游戏分发相关神策埋点-补充-第一期 —客户端 https://jira.shanqu.cc/browse/GHZS-4489

See merge request halo/android/assistant-android!1526
2024-03-07 16:56:34 +08:00