Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,789 Commits 121 Branches 327 Tags
bf30aef686ec2b2d7c8e8ba2cf7dfddf37c554c3
Commit Graph

12789 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
chenjuntao
bf30aef686 feat: 适配微信 CPM 小游戏的曝光上报逻辑 2025-02-07 16:32:51 +08:00
chenjuntao
3cca6b5cb5 feat: 广告系统(gitlab-ci) https://jira.shanqu.cc/browse/GHZSCY-7058 2025-02-07 16:32:51 +08:00
chenjuntao
49a49d115c feat: 广告系统 https://jira.shanqu.cc/browse/GHZSCY-7058 2025-02-07 16:32:46 +08:00
chenjuntao
d0bf23ae48 Merge remote-tracking branch 'origin/release' into dev 2025-01-17 14:15:55 +08:00
陈君陶
b2fde1e0af Merge branch 'hotfix/v5.38.8-1118/meta_build_script_channel_issue' into 'release' 
fix: 修复推广打包渠道不生效的问题

See merge request halo/android/assistant-android!2045
v5.38.8-1118-2.0.7 		2025-01-16 16:01:39 +08:00
chenjuntao
ab1350ff46 fix: 修复推广打包渠道不生效的问题 2025-01-16 16:00:25 +08:00
叶子维
7f991e29d4 Merge branch 'fix/xiaomi_parallel_game_auth' into 'dev' 
fix: 修复小米部分机型双开由于缺少权限无法授权登录的问题

See merge request halo/android/assistant-android!2044
 2025-01-16 11:04:40 +08:00
叶子维
40edf76aed fix: 修复小米部分机型双开由于缺少权限无法授权登录的问题 2025-01-16 11:04:40 +08:00
陈君陶
aaeb83c5df Merge branch 'fix/splash_flicker_on_miui' into 'dev' 
fix: 修复部分小米设备修改状态栏颜色导致开屏广告闪烁的问题

See merge request halo/android/assistant-android!2043
 2025-01-16 09:29:05 +08:00
chenjuntao
5739f0a800 fix: 修复部分小米设备修改状态栏颜色导致开屏广告闪烁的问题 2025-01-15 17:58:16 +08:00
yangfei
10cc81e7fc Merge branch 'feat/va-relative' into 'dev' 
feat: 同步va的release代码

See merge request halo/android/assistant-android!2042
 2025-01-15 15:00:42 +08:00
yangfei
60a50f5722 feat: 同步va的release代码 2025-01-15 14:58:32 +08:00
张晨
644881c14f Merge branch 'fix/package_check_stuck_issue' into 'dev' 
fix: 修复包名检测弹窗弹出较慢的问题

See merge request halo/android/assistant-android!2041
 2025-01-15 14:48:19 +08:00
chenjuntao
a0e43930a0 Merge remote-tracking branch 'origin/release' into dev 
# Conflicts:
#	app/src/main/java/com/gh/ad/AdDelegateHelper.kt
#	dependencies.gradle
#	module_login/src/main/java/com/gh/gamecenter/login/user/UserRepository.java
#	vasdk
 2025-01-15 14:27:40 +08:00
chenjuntao
aa5f6f4f24 fix: 修复包名检测弹窗弹出较慢的问题 2025-01-15 14:22:22 +08:00
chenjuntao
ab7668fd81 chore: 版本更新至 5.38.8 2025-01-15 09:19:40 +08:00
陈君陶
c6f014c984 Merge branch 'hotfix/v5.38.7-1117/pre_download_error' into 'release' 
fix: 修复预下载获取资源时，服务端报错未能正确处理的问题

See merge request halo/android/assistant-android!2040
 2025-01-14 16:30:31 +08:00
chenjuntao
c215bd195e fix: 修复预下载获取资源时，服务端报错未能正确处理的问题 2025-01-14 16:27:43 +08:00
yangfei
bb73598a87 Merge branch 'hotfix/va-relative' into 'release' 
fix: va_core进程没有启动导致aidl的NPE问题。

See merge request halo/android/assistant-android!2039
 2025-01-14 16:24:52 +08:00
yangfei
c6f70d1b4c fix: va_core进程没有启动导致aidl的NPE问题。 2025-01-14 16:23:01 +08:00
陈君陶
ce7f75976c Merge branch 'fix/GHZSCY-7371' into 'dev' 
fix: 游戏详情-多版本插件下载问题 https://jira.shanqu.cc/browse/GHZSCY-7371

See merge request halo/android/assistant-android!2038
 2025-01-14 13:45:06 +08:00
chenjuntao
c8a7999990 fix: 游戏详情-多版本插件下载问题 https://jira.shanqu.cc/browse/GHZSCY-7371 2025-01-14 10:49:52 +08:00
yangfei
0cd281a53c Merge branch 'hotfix/va-relative' into 'release' 
fix: 手机不支持armeabi-v7a架构时，根据游戏来选择架构

See merge request halo/android/assistant-android!2037
 2025-01-10 18:01:24 +08:00
yangfei
e92d89d498 fix: 手机不支持armeabi-v7a架构时，根据游戏来选择架构 2025-01-10 17:44:03 +08:00
chenjuntao
a22858389b chore: 版本更新至 5.38.7 v5.38.7-1117-2.0.7 2025-01-10 13:55:24 +08:00
yangfei
e9d091043d Merge branch 'hotfix/va-relative' into 'release' 
feat: 同步商业版VA，修复权限问题。

See merge request halo/android/assistant-android!2036
 2025-01-10 11:25:46 +08:00
yangfei
db4ac95094 feat: 同步商业版VA，修复权限问题。 
fix: 实名认证超大UI问题
fix: sentry va relative log.
 2025-01-10 11:24:45 +08:00
张晨
13be47d440 Merge branch 'fix/search-page-crash' into 'release' 
fix:https://sentry.shanqu.cc/organizations/lightgame/issues/423398/?project=22

See merge request halo/android/assistant-android!2035
 2025-01-10 11:21:43 +08:00
张晨
beee098cfe fix:https://sentry.shanqu.cc/organizations/lightgame/issues/423398/?project=22 2025-01-10 11:17:26 +08:00
叶子维
d67aaf956b Merge branch 'feat/GHZSCY-7046' into 'release' 
feat: 补充启动广告图相关广告加载事件埋点—客户端 https://jira.shanqu.cc/browse/GHZSCY-7046

See merge request halo/android/assistant-android!2034
 2025-01-09 17:29:21 +08:00
叶子维
1ed9151b1f feat: 补充启动广告图相关广告加载事件埋点—客户端 https://jira.shanqu.cc/browse/GHZSCY-7046 2025-01-09 16:43:54 +08:00
陈君陶
13f20f6883 Merge branch 'hotfix/v5.38.6-1116/ad_view_background' into 'release' 
fix: 还原自有开屏广告的背景颜色 https://jira.shanqu.cc/browse/GHZSCY-7360

See merge request halo/android/assistant-android!2033
 2025-01-09 15:28:06 +08:00
chenjuntao
78e320a192 fix: 还原自有开屏广告的背景颜色 https://jira.shanqu.cc/browse/GHZSCY-7360 2025-01-09 15:27:34 +08:00
陈君陶
e51db47fad Merge branch 'cherry-pick-f8a26ece' into 'release' 
Merge branch 'fix/GHZSCY-7277' into 'dev'

See merge request halo/android/assistant-android!2032
 2025-01-09 15:24:18 +08:00
陈君陶
ac02ea88b9 Merge branch 'fix/GHZSCY-7277' into 'dev' 
修复错误的下载错误提示 https://jira.shanqu.cc/browse/GHZSCY-7277

See merge request halo/android/assistant-android!2025

(cherry picked from commit f8a26ece01)

54ee3ea3 fix: 游戏下载异常提示 https://jira.shanqu.cc/browse/GHZSCY-7277

Co-authored-by: 陈君陶 <chenjuntao@ghzhushou.com>
 2025-01-09 15:23:53 +08:00
叶子维
f60004fc81 Merge branch 'feat/GHZSCY-7359' into 'release' 
需求合并

See merge request halo/android/assistant-android!2031
 2025-01-09 15:05:29 +08:00
叶子维
0cf39a82e2 Merge branch 'fix/viewstub_crashes' into 'release' 
fix: 修复ViewStub偶发闪退问题 https://sentry.shanqu.cc/organizations/lightgame/issues/422108/events/?project=22 https://sentry.shanqu.cc/organizations/lightgame/issues/425087/?project=22

See merge request halo/android/assistant-android!2030
 2025-01-09 15:03:51 +08:00
张晨
315f244153 fix:【光环助手】包名检测及搜索页面在深色模式下的显示问题 https://jira.shanqu.cc/browse/GHZSCY-6985 2025-01-09 14:54:37 +08:00
叶子维
f4bdc02d70 fix: 【光环助手】深色模式显示问题 https://jira.shanqu.cc/browse/GHZSCY-7121 2025-01-09 14:54:17 +08:00
叶子维
aef39eb481 feat: 样式组件优化汇总—客户端 https://jira.shanqu.cc/browse/GHZSCY-6866 2025-01-09 14:53:37 +08:00
叶子维
dc2e7147d9 fix: 修复ViewStub偶发闪退问题 https://sentry.shanqu.cc/organizations/lightgame/issues/422108/events/?project=22 https://sentry.shanqu.cc/organizations/lightgame/issues/425087/?project=22 2025-01-09 14:49:58 +08:00
陈君陶
fdcb6342bf Merge branch 'hotfix/v5.38.6-1116/crashes' into 'release' 
修复部分 5.38.6 线上闪退

See merge request halo/android/assistant-android!2029
 2025-01-09 14:37:49 +08:00
陈君陶
b0da4f8986 Merge branch 'hotfix/v5.38.6-1116/blank_ad_view' into 'release' 
fix: 优化开屏广告的显示，提高线程池的 core 线程数，限制视频开屏广告的触摸控制

See merge request halo/android/assistant-android!2028
 2025-01-09 14:37:40 +08:00
陈君陶
f7cc906cc5 fix: 优化开屏广告的显示，提高线程池的 core 线程数，限制视频开屏广告的触摸控制 2025-01-09 14:37:40 +08:00
陈君陶
795fbabd90 Merge branch 'hotfix/v5.38.6-1116/login_culprit' into 'release' 
修复`我的光环`页面在用户信息接口异常时的显示问题 https://jira.shanqu.cc/browse/GHZSCY-7340

See merge request halo/android/assistant-android!2027
 2025-01-09 14:34:25 +08:00
chenjuntao
e770f8a359 fix: 修复安装完成后更新安装信息时的闪退问题 https://sentry.shanqu.cc/organizations/lightgame/issues/395511 2025-01-09 11:49:38 +08:00
chenjuntao
dd12b103be fix: 捕抓上报游戏启动日志的闪退问题 https://sentry.shanqu.cc/organizations/lightgame/issues/406179 2025-01-09 09:59:32 +08:00
chenjuntao
21f4a398d5 fix: 处理数组越界闪退问题 https://sentry.shanqu.cc/organizations/lightgame/issues/408904 2025-01-09 09:45:22 +08:00
陈君陶
f8a26ece01 Merge branch 'fix/GHZSCY-7277' into 'dev' 
修复错误的下载错误提示 https://jira.shanqu.cc/browse/GHZSCY-7277

See merge request halo/android/assistant-android!2025
 2025-01-08 10:10:32 +08:00
chenjuntao
54ee3ea376 fix: 游戏下载异常提示 https://jira.shanqu.cc/browse/GHZSCY-7277 2025-01-07 17:56:09 +08:00