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

12113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
陈君陶
29facb49df Merge branch 'hotfix/v5.35.1-1051/disable_jcore_auto_init' into 'release' 
feat: 恢复极光推送，移除极光自动初始化 https://jira.shanqu.cc/browse/GHZSCY-5342

See merge request halo/android/assistant-android!1658
 2024-06-25 16:14:40 +08:00
juntao
f023a315b9 chore: 版本更新至 5.36.2 v5.36.2-1072 2024-06-25 10:02:13 +08:00
陈君陶
b9d217d773 Merge branch 'hotfix/v5.36.1-1071/revert_mr_1672' into 'release' 
revert: "fix: 修复图片显示问题"  https://git.shanqu.cc/halo/android/assistant-android/-/merge_requests/1672

See merge request halo/android/assistant-android!1714
 2024-06-25 09:48:21 +08:00
曾祥俊
cbdab7cd50 Merge branch 'feature-GHZS-5696' into 'release' 
feat: QQ小游戏SDK更新—客户端 https://jira.shanqu.cc/browse/GHZSCY-5696

See merge request halo/android/assistant-android!1705
 2024-06-25 09:43:32 +08:00
曾祥俊
5b2f710be8 feat: QQ小游戏SDK更新—客户端 https://jira.shanqu.cc/browse/GHZSCY-5696 2024-06-25 09:43:32 +08:00
chenjuntao
b15dafb852 revert: "fix: 修复图片显示问题" https://git.shanqu.cc/halo/android/assistant-android/-/merge_requests/1672 2024-06-24 18:25:00 +08:00
juntao
37b36a9632 chore: 版本更新至 5.36.1 2024-06-21 14:37:06 +08:00
陈君陶
17495e3699 Merge branch 'hotfix/v5.36.0-1070/craches' into 'release' 
fix: 修复 5.36.0 线上闪退问题

See merge request halo/android/assistant-android!1713
 2024-06-21 14:36:00 +08:00
chenjuntao
d9ee277e82 fix: 处理多线程操作 tag 造成 View.getTag 数组越界异常，并上报 sentry 供后续分析 https://sentry.shanqu.cc/organizations/lightgame/issues/392564 2024-06-21 14:28:58 +08:00
chenjuntao
bb6bdb1351 fix: 简单捕抓 getPackageForUid 的异常 https://sentry.shanqu.cc/organizations/lightgame/issues/392558 2024-06-21 13:49:17 +08:00
juntao
24815cd398 Merge remote-tracking branch 'origin/release' into dev 2024-06-20 14:26:11 +08:00
曾祥俊
b963281eb6 Merge branch 'feature-GHZS-5775' into 'dev' 
feat: 【光环助手】部分专题封面图不展示问题 https://jira.shanqu.cc/browse/GHZSCY-5775

See merge request halo/android/assistant-android!1711
 2024-06-20 14:24:30 +08:00
曾祥俊
95721268f7 feat: 【光环助手】部分专题封面图不展示问题 https://jira.shanqu.cc/browse/GHZSCY-5775 2024-06-20 14:24:30 +08:00
张晨
dfd542f5df Merge branch 'fix-qq-game-recently-played' into 'dev' 
fix: 修复QQ小游戏首页最近在玩刷新异常问题

See merge request halo/android/assistant-android!1712
 2024-06-20 10:22:13 +08:00
曾祥俊
14522e5d07 fix: 修复QQ小游戏首页最近在玩刷新异常问题 2024-06-20 10:19:12 +08:00
陈君陶
71efe3b69a Merge branch 'hotfix/v5.35.5-1055/pack-info-error' into 'release' 
fix: 特殊包判断的异常问题

See merge request halo/android/assistant-android!1710
 2024-06-17 16:07:54 +08:00
juntao
b8cbbc0301 fix: 特殊包判断的异常问题 v5.35.5-1055 2024-06-17 16:07:02 +08:00
chenjuntao
2fe8051280 Merge remote-tracking branch 'refs/remotes/origin/release' into dev 
# Conflicts:
#	app/src/main/java/com/gh/ndownload/NDownloadBridge.kt
 2024-06-17 11:15:12 +08:00
陈君陶
0d4a893552 Merge branch 'feat/GHZSCY-5250' into 'dev' 
feat: 合规调整-已安装列表权限 https://jira.shanqu.cc/browse/GHZSCY-5250

See merge request halo/android/assistant-android!1703
 2024-06-17 11:11:49 +08:00
chenjuntao
e07216365a feat: 合规调整-已安装列表权限 https://jira.shanqu.cc/browse/GHZSCY-5250 2024-06-17 11:11:25 +08:00
陈君陶
1c04e966d9 Merge branch 'hotfix/v5.35.5-1055/download_dialog_crash' into 'release' 
fix: 捕抓下载弹窗自动触发下载时的数组越界异常 https://sentry.shanqu.cc/organizations/lightgame/issues/365000/

See merge request halo/android/assistant-android!1709
 2024-06-17 10:50:20 +08:00
chenjuntao
ba0ad10f61 fix: 捕抓下载弹窗自动触发下载时的数组越界异常 https://sentry.shanqu.cc/organizations/lightgame/issues/365000/ 2024-06-17 10:49:47 +08:00
曾祥俊
9592731033 Merge branch 'feature-GHZS-5704' into 'dev' 
feat: 同步正式问题—微小后台无内购等数据—客户端 https://jira.shanqu.cc/browse/GHZSCY-5704

See merge request halo/android/assistant-android!1708
 2024-06-17 10:18:26 +08:00
曾祥俊
0dc9fb1aa3 feat: 同步正式问题—微小后台无内购等数据—客户端 https://jira.shanqu.cc/browse/GHZSCY-5704 2024-06-17 10:18:26 +08:00
陈君陶
fd450f0d67 Merge branch 'hotfix/v5.35.5-1055/sentry_crashes' into 'release' 
fix: 捕抓下载时获取回调 header 时的异常 https://sentry.shanqu.cc/organizations/lightgame/issues/371082

See merge request halo/android/assistant-android!1707
 2024-06-14 16:31:47 +08:00
chenjuntao
57984d160f fix: 捕抓下载时获取回调 header 时的异常 https://sentry.shanqu.cc/organizations/lightgame/issues/371082 
Signed-off-by: chenjuntao <chenjuntao@ghzhushou.com>
 2024-06-14 15:08:00 +08:00
chenjuntao
165ca21926 Merge remote-tracking branch 'refs/remotes/origin/release' into dev 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/entity/SubjectEntity.kt
 2024-06-14 14:20:20 +08:00
陈君陶
e19c091532 Merge branch 'hotfix/v5.35.5-1055/filter_crash' into 'release' 
fix: 修复游戏屏蔽的闪退问题 https://sentry.shanqu.cc/organizations/lightgame/issues/380904/

See merge request halo/android/assistant-android!1706
 2024-06-14 11:32:04 +08:00
chenjuntao
5db6b3511f fix: 修复游戏屏蔽的闪退问题 https://sentry.shanqu.cc/organizations/lightgame/issues/380904/ 
Signed-off-by: chenjuntao <chenjuntao@ghzhushou.com>
 2024-06-14 10:44:29 +08:00
张晨
8557b230ac Merge branch 'fix-wechat-game-recently-play-refresh' into 'dev' 
fix: 自定义页面-微信小游戏-最近在玩列表刷新修复

See merge request halo/android/assistant-android!1704
 2024-06-12 17:21:07 +08:00
曾祥俊
44a817be12 fix: 自定义页面-微信小游戏-最近在玩列表刷新修复 2024-06-12 17:21:07 +08:00
陈君陶
c76e0b8bfa Merge branch 'feat/GHZSCY-5543' into 'dev' 
feat: 鸿蒙系统关闭“纯净模式/增强防护”引导弹窗 https://jira.shanqu.cc/browse/GHZSCY-5543

See merge request halo/android/assistant-android!1694
 2024-06-12 15:47:01 +08:00
chenjuntao
bbbd77b8ab feat: 鸿蒙系统关闭“纯净模式/增强防护”引导弹窗 https://jira.shanqu.cc/browse/GHZSCY-5543 2024-06-12 14:48:02 +08:00
曾祥俊
08ab5ec727 Merge branch 'fix-custom-page-game-item-ui' into 'dev' 
fix: 自定义页面-游戏Item UI调整

See merge request halo/android/assistant-android!1702
 2024-06-12 09:29:57 +08:00
曾祥俊
39afbecce8 fix: 自定义页面-游戏Item UI调整 2024-06-11 18:47:56 +08:00
曾祥俊
4229f0e335 Merge branch 'feature-GHZS-5267' into 'dev' 
feat: 微信小游戏接入—客户端 https://jira.shanqu.cc/browse/GHZSCY-5267

See merge request halo/android/assistant-android!1684
 2024-06-11 18:42:15 +08:00
曾祥俊
efae6cb459 feat: 微信小游戏接入—客户端 https://jira.shanqu.cc/browse/GHZSCY-5267 2024-06-11 18:42:15 +08:00
陈君陶
8f8cfb757f Merge branch 'feat/GHZS-5156' into 'dev' 
feat: Xapk解压失败弹窗优化-0514优化 https://jira.shanqu.cc/browse/GHZSCY-5383

See merge request halo/android/assistant-android!1639
 2024-06-11 17:21:39 +08:00
chenjuntao
1e894e1158 feat: Xapk解压失败弹窗优化-0514优化 https://jira.shanqu.cc/browse/GHZSCY-5383 2024-06-11 17:18:34 +08:00
曾祥俊
96b479b8f0 Merge branch 'feature-GHZS-5245' into 'dev' 
fix: 【光环助手】MIUI优化关闭提示弹窗点击问题 https://jira.shanqu.cc/browse/GHZSCY-5245

See merge request halo/android/assistant-android!1663
 2024-06-11 17:10:13 +08:00
曾祥俊
342eefe7ba fix: 【光环助手】MIUI优化关闭提示弹窗点击问题 https://jira.shanqu.cc/browse/GHZSCY-5245 2024-06-11 17:10:13 +08:00
陈君陶
e9c9f6f66b Merge branch 'fix/GHZSCY-5405' into 'dev' 
fix: 游戏详情页顶部视频播放问题 https://jira.shanqu.cc/browse/GHZSCY-5405

See merge request halo/android/assistant-android!1701
 2024-06-11 17:07:38 +08:00
chenjuntao
7da90ffb0b fix: 游戏详情页顶部视频播放问题 https://jira.shanqu.cc/browse/GHZSCY-5405 2024-06-11 17:02:50 +08:00
张晨
c71f8676dd Merge branch 'feat/GHZSCY-5098-pr' into 'dev' 
feat:社区新增关注页面—客户端 https://jira.shanqu.cc/browse/GHZSCY-5098
 2024-06-11 16:50:59 +08:00
张晨
50555cb217 feat:社区新增关注页面—客户端 https://jira.shanqu.cc/browse/GHZSCY-5098 2024-06-11 16:50:59 +08:00
曾祥俊
766e4fc3ab Merge branch 'feature-GHZS-5142' into 'dev' 
feat: 【光环助手】第三方落地页数据相关优化 https://jira.shanqu.cc/browse/GHZSCY-5142

See merge request halo/android/assistant-android!1664
 2024-06-11 14:20:34 +08:00
曾祥俊
c091e496e7 feat: 【光环助手】第三方落地页数据相关优化 https://jira.shanqu.cc/browse/GHZSCY-5142 2024-06-11 14:20:34 +08:00
陈君陶
ecd81ea353 Merge branch 'feat/GHZSCY-5604' into 'dev' 
feat: 推广包相关推广平台SDK更新 https://jira.shanqu.cc/browse/GHZSCY-5605

See merge request halo/android/assistant-android!1695
 2024-06-11 09:41:53 +08:00
陈君陶
21e7198589 Merge branch 'feat/GHZSCY-5631' into 'dev' 
fix: 仅支持32位架构的设备屏蔽畅玩下载方式 https://jira.shanqu.cc/browse/GHZSCY-5631

See merge request halo/android/assistant-android!1696
 2024-06-07 15:58:06 +08:00
chenjuntao
d6c97bc215 feat: 仅支持32位架构的设备屏蔽畅玩下载方式 https://jira.shanqu.cc/browse/GHZSCY-5631 
Signed-off-by: chenjuntao <chenjuntao@ghzhushou.com>
 2024-06-07 15:51:54 +08:00