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

13161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
叶子维
c944e529ba Merge branch 'feat/GHZSCY-8177' into 'dev' 
feat: 极光认证SDK升级-客户端 https://jira.shanqu.cc/browse/GHZSCY-8176

See merge request halo/android/assistant-android!2220
 2025-06-30 14:57:52 +08:00
叶子维
eaa1a3609f feat: 极光认证SDK升级-客户端 https://jira.shanqu.cc/browse/GHZSCY-8176 2025-06-30 14:57:18 +08:00
叶子维
2b9478a1b9 Merge branch 'feat/GHZSCY-8124' into 'dev' 
feat: 新游开测相关功能优化（第五期）—客户端 https://jira.shanqu.cc/browse/GHZSCY-8124

See merge request halo/android/assistant-android!2218
 2025-06-23 10:37:28 +08:00
叶子维
dbd6e7bb43 feat: 新游开测相关功能优化（第五期）—客户端 https://jira.shanqu.cc/browse/GHZSCY-8124 2025-06-23 10:37:28 +08:00
叶子维
09a823d4da Merge branch 'feat/GHZSCY-8150' into 'dev' 
feat: GameDetailPageTabSelect埋点事件优化-客户端 https://jira.shanqu.cc/browse/GHZSCY-8150

See merge request halo/android/assistant-android!2217
 2025-06-20 16:11:16 +08:00
叶子维
0b49c58884 feat: GameDetailPageTabSelect埋点事件优化-客户端 https://jira.shanqu.cc/browse/GHZSCY-8150 2025-06-20 16:11:16 +08:00
张晨
2e93bcc173 Merge branch 'feat/GHZSCY-8041-pr' into 'dev' 
feat:游戏搜索结果列表的插入优化—客户端 https://jira.shanqu.cc/browse/GHZSCY-8041

See merge request halo/android/assistant-android!2216
 2025-06-20 14:49:04 +08:00
张晨
03f6906b46 feat:游戏搜索结果列表的插入优化—客户端 https://jira.shanqu.cc/browse/GHZSCY-8041 2025-06-20 14:49:04 +08:00
叶子维
0f382baec1 Merge branch 'feat/GHZSCY-8049' into 'dev' 
feat: 游戏详情UI优化-客户端 https://jira.shanqu.cc/browse/GHZSCY-8049

See merge request halo/android/assistant-android!2207
 2025-05-27 14:39:06 +08:00
叶子维
62f80bbfdd feat: 游戏详情UI优化-客户端 https://jira.shanqu.cc/browse/GHZSCY-8049 2025-05-27 14:39:06 +08:00
chenjuntao
63be9ac221 chore: 版本更新至 5.43.0 2025-05-27 14:04:44 +08:00
yangfei
ade32ef92d Merge branch 'feat/GHZSCY-7987' into 'dev' 
合并【光环助手】畅玩游戏管理游戏显示问题

See merge request halo/android/assistant-android!2206
v5.42.0-1190-2.0.9 		2025-05-27 11:19:57 +08:00
yangfei
58702b46aa Revert "ci: 测试 https://jira.shanqu.cc/browse/GHZSCY-7987" 
This reverts commit 75ca0a8379.
 2025-05-27 11:15:55 +08:00
chenjuntao
e6d6fc5309 Merge remote-tracking branch 'origin/release' into dev 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/minigame/wechat/WGameSubjectCPMRemoteDataSource.kt
#	dependencies.gradle
 2025-05-27 09:29:44 +08:00
yangfei
1460348582 Merge branch 'feat/GHZSCY-7972' into 'dev' 
feat: 【畅玩助手】文件夹权限申请 https://jira.shanqu.cc/browse/GHZSCY-7972

See merge request halo/android/assistant-android!2205
 2025-05-26 11:31:40 +08:00
yangfei
c49b3c5efe feat: 【畅玩助手】文件夹权限申请 https://jira.shanqu.cc/browse/GHZSCY-7972 2025-05-26 11:27:05 +08:00
yangfei
4f7c468cde fix: 畅玩加载中没有显示正在下载的游戏 https://jira.shanqu.cc/browse/GHZSCY-7987 2025-05-23 17:53:59 +08:00
yangfei
df93bdda2e Merge branch 'dev' into feat/GHZSCY-7987 2025-05-23 15:54:42 +08:00
陈君陶
086796915b Merge branch 'feat/GHZSCY-7955' into 'dev' 
feat: CPM微信小游戏推荐优化 https://jira.shanqu.cc/browse/GHZSCY-7954

See merge request halo/android/assistant-android!2204
 2025-05-22 16:40:44 +08:00
chenjuntao
f99e5f403d feat: CPM微信小游戏推荐优化 https://jira.shanqu.cc/browse/GHZSCY-7954 2025-05-22 16:25:40 +08:00
陈君陶
9785f4fa13 Merge branch 'feat/GHZSCY-8006' into 'dev' 
fix: 广告系统-新增广告游戏的过滤条件 https://jira.shanqu.cc/browse/GHZSCY-8006

See merge request halo/android/assistant-android!2203
 2025-05-20 17:17:22 +08:00
chenjuntao
6cdff338ed fix: 广告系统-新增广告游戏的过滤条件 https://jira.shanqu.cc/browse/GHZSCY-8006 2025-05-20 17:16:45 +08:00
chenjuntao
761093a768 chore: 版本更新至 5.41.4 v5.41.4-1174-2.0.9 2025-05-20 11:05:49 +08:00
陈君陶
e5a0db4513 Merge branch 'hotfix/v5.41.3-1173/dsp_crash' into 'release' 
fix: 修复 DetailViewHolder 触发的弹窗在模拟器上的闪退问题

See merge request halo/android/assistant-android!2202
 2025-05-20 10:05:26 +08:00
chenjuntao
a3df62bba8 fix: 修复 DetailViewHolder 触发的弹窗在模拟器上的闪退问题 2025-05-20 09:56:20 +08:00
陈君陶
ee773f7e31 Merge branch 'hotfix/v5.41.3-1173/huawei-crash' into 'release' 
fix: 补充屏蔽华为 Android 10 设备上的热启动广告显示

See merge request halo/android/assistant-android!2201
v5.41.3-1173-2.0.9 		2025-05-19 16:00:29 +08:00
chenjuntao
227a5e677f fix: 补充屏蔽华为 Android 10 设备上的热启动广告显示 2025-05-19 15:56:04 +08:00
叶子维
c41939cd79 Merge branch 'feat/GHZSCY-7999' into 'dev' 
feat: 专题合集新增自定义设置-0516运营验收优化-客户端 https://jira.shanqu.cc/browse/GHZSCY-7999

See merge request halo/android/assistant-android!2200
 2025-05-19 14:10:04 +08:00
叶子维
125ef60176 feat: 专题合集新增自定义设置-0516运营验收优化-客户端 https://jira.shanqu.cc/browse/GHZSCY-7999 2025-05-19 14:10:04 +08:00
张晨
e2bf2773e4 Merge branch 'fix/GHZSCY-8001-pr' into 'dev' 
fix:分类新增搜索功能-0516运营验收-客户端 https://jira.shanqu.cc/browse/GHZSCY-8001

See merge request halo/android/assistant-android!2199
 2025-05-19 11:09:28 +08:00
张晨
e3596c758e fix:分类新增搜索功能-0516运营验收-客户端 https://jira.shanqu.cc/browse/GHZSCY-8001 2025-05-19 11:00:38 +08:00
yangfei
75ca0a8379 ci: 测试 https://jira.shanqu.cc/browse/GHZSCY-7987 2025-05-19 10:49:17 +08:00
yangfei
ef7d2860e5 feat: 修复页面onStart没有刷新数据 https://jira.shanqu.cc/browse/GHZSCY-7987 2025-05-19 10:48:04 +08:00
chenjuntao
bfc8981253 chore: 版本更新至 5.41.3 2025-05-19 10:42:28 +08:00
陈君陶
12d6d338aa Merge branch 'hotfix/v5.41.2-1172/huawei-crash' into 'release' 
fix: 屏蔽华为系 Android 10 设备的穿山甲广告，避免启动闪退

See merge request halo/android/assistant-android!2198
 2025-05-19 10:39:51 +08:00
chenjuntao
4da3c3aec1 fix: 屏蔽华为系 Android 10 设备的穿山甲广告，避免启动闪退 2025-05-19 10:37:59 +08:00
yangfei
e608a51cce feat: 修复畅玩游戏管理页面编辑状态点击删除按钮，取消操作之后导致已下载的游戏变为暂停https://jira.shanqu.cc/browse/GHZSCY-7987 2025-05-16 18:19:53 +08:00
张晨
4f2aea7fcf Merge branch 'fix/GHZSCY-7989-pr' into 'dev' 
fix:【光环助手】页面刷新问题 https://jira.shanqu.cc/browse/GHZSCY-7989

See merge request halo/android/assistant-android!2197
 2025-05-16 15:47:30 +08:00
张晨
3abcad5d5d fix:【光环助手】页面刷新问题 https://jira.shanqu.cc/browse/GHZSCY-7989 2025-05-16 15:29:59 +08:00
陈君陶
1cca908327 Merge branch 'feat/GHZSCY-7058-rebase' into 'dev' 
feat: 广告系统 https://jira.shanqu.cc/browse/GHZSCY-7058

See merge request halo/android/assistant-android!2103
 2025-05-16 13:52:37 +08:00
陈君陶
63c0b859f4 feat: 广告系统 https://jira.shanqu.cc/browse/GHZSCY-7058 2025-05-16 13:52:37 +08:00
yangfei
5deb741942 Merge branch 'feat/GHZSCY-7642' into 'dev' 
畅玩汉化翻译功能

See merge request halo/android/assistant-android!2196
 2025-05-15 16:55:35 +08:00
yangfei
e855f59ae4 Merge branch 'feat/GHZSCY-7642' of git.shanqu.cc:halo/android/assistant-android into feat/GHZSCY-7642 2025-05-15 16:50:08 +08:00
yangfei
9ea4b1367e Revert .gitlab-ci.yml 2025-05-15 16:49:29 +08:00
yangfei
e44c11349b feat: 替换正式环境2.0.0插件url 2025-05-15 16:49:29 +08:00
yangfei
a0ea9f9f44 feat: https://jira.shanqu.cc/browse/GHZSCY-7638 替换新版插件 2025-05-15 16:49:29 +08:00
yangfei
082d3297f7 feat: 修复用户没有下载新的畅玩游戏，插件更新没有触发的问题。 https://jira.shanqu.cc/browse/GHZSCY-7642 2025-05-15 16:49:29 +08:00
yangfei
f81055ae7f feat: 汉化打包测试 https://jira.shanqu.cc/browse/GHZSCY-7642 2025-05-15 16:49:29 +08:00
yangfei
8e3de4e441 feat: 优化汉化UI 2025-05-15 16:49:29 +08:00
yangfei
7cf66c4362 feat: 畅玩汉化功能 2025-05-15 16:49:29 +08:00