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

10747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
叶子维
cd158d380b Merge branch 'hotfix-v5.19.1-731-game_detail_crash' into 'release' 
fix: 修复游戏详情更新toolbar时出现的闪退问题

See merge request halo/android/assistant-android!716
 2023-02-16 14:33:07 +08:00
chenjuntao
3d049bb406 Merge remote-tracking branch 'origin/release' into dev 
# Conflicts:
#	dependencies.gradle
 2023-02-16 14:28:17 +08:00
叶子维
63ca94509f fix: 修复游戏详情更新toolbar时出现的闪退问题 2023-02-16 14:23:36 +08:00
叶子维
45a8f9683e Merge branch 'feature-GHZS-1254' into 'legacy-release' 
feat: 对接广点通SDK—客户端 https://jira.shanqu.cc/browse/GHZS-1254

See merge request halo/android/assistant-android!711
 2023-02-16 11:41:01 +08:00
叶子维
572cbba819 feat: 对接广点通SDK—客户端 https://jira.shanqu.cc/browse/GHZS-1254 2023-02-16 11:41:00 +08:00
张玉久
fd01515733 Merge branch 'fix-GHZS-1270' into 'dev' 
fix: 新增[新游开测]功能-前端详情页部分—0215UI测试 https://jira.shanqu.cc/browse/GHZS-1270

See merge request halo/android/assistant-android!715
 2023-02-16 11:12:36 +08:00
张玉久
a687c8b149 fix: 新增[新游开测]功能-前端详情页部分—0215UI测试 https://jira.shanqu.cc/browse/GHZS-1270 2023-02-16 10:34:19 +08:00
chenjuntao
b395b6f049 chore: 版本更新至 5.19.1 v5.19.1-731 2023-02-16 09:49:52 +08:00
陈君陶
bb6f5e4367 Merge branch 'hotfix-v5.19.0-730-download_log_crash' into 'release' 
fix: 修复下载时长为 0 时的闪退问题

See merge request halo/android/assistant-android!714
 2023-02-16 09:48:36 +08:00
chenjuntao
e9bd2b3b59 fix: 修复下载时长为 0 时的闪退问题 2023-02-16 09:43:31 +08:00
叶子维
77cb3f92a1 Merge branch 'fix-GHZS-1251' into 'dev' 
fix: 新增[图标浮层]功能-0214测试(1) https://jira.shanqu.cc/browse/GHZS-1251

See merge request halo/android/assistant-android!713
 2023-02-15 19:30:05 +08:00
叶子维
5a3db9c78e fix: 新增[图标浮层]功能-0214测试(1) https://jira.shanqu.cc/browse/GHZS-1251 2023-02-15 19:10:00 +08:00
陈君陶
51498b005d Merge branch 'fix-GHZS-1207-2' into 'dev' 
fix: 补充消息中心文本高亮 https://jira.shanqu.cc/browse/GHZS-1207

See merge request halo/android/assistant-android!712
 2023-02-15 18:43:20 +08:00
chenjuntao
ec983f7b2c fix: 补充消息中心文本高亮 https://jira.shanqu.cc/browse/GHZS-1207 2023-02-15 18:38:14 +08:00
张玉久
745e14a8ce Merge branch 'fix-GHZS-1127' into 'dev' 
fix: 修改新游开测列表无法加载更多的问题

See merge request halo/android/assistant-android!710
 2023-02-15 18:31:27 +08:00
张玉久
4939129b21 fix: 修改列表无法加载更多的问题 2023-02-15 14:50:07 +08:00
张玉久
d85da2b1b5 Merge branch 'feature-GHZS-1127' into 'dev' 
feat: 新增[新游开测]功能-前端详情页部分—客户端 https://jira.shanqu.cc/browse/GHZS-1127

See merge request halo/android/assistant-android!708
 2023-02-15 11:10:12 +08:00
张玉久
2c90a909a6 feat: 新增[新游开测]功能-前端详情页部分—客户端 https://jira.shanqu.cc/browse/GHZS-1127 2023-02-15 11:10:11 +08:00
chenjuntao
bd86051615 Merge remote-tracking branch 'origin/release' into dev 2023-02-15 10:49:01 +08:00
陈君陶
739526e9fa Merge branch 'fix-GHZS-1247' into 'release' 
fix: 【光环助手】多线程下载相关数据埋点补充-0214测试 https://jira.shanqu.cc/browse/GHZS-1247

See merge request halo/android/assistant-android!709
 2023-02-15 10:44:20 +08:00
chenjuntao
cbabfe72f7 fix: 【光环助手】多线程下载相关数据埋点补充-0214测试 https://jira.shanqu.cc/browse/GHZS-1247 2023-02-15 10:37:11 +08:00
叶子维
42250edbbc Merge branch 'fix-GHZS-1251' into 'dev' 
fix: 新增[图标浮层]功能-0214测试(3) https://jira.shanqu.cc/browse/GHZS-1251

See merge request halo/android/assistant-android!707
 2023-02-14 16:10:24 +08:00
叶子维
252c933649 fix: 新增[图标浮层]功能-0214测试(3) https://jira.shanqu.cc/browse/GHZS-1251 2023-02-14 16:05:20 +08:00
张玉久
f21368c761 Merge branch 'hotfix-gamedetail_jump_tab_error' into 'release' 
fix: 修改游戏详情点击tab跳转错误问题

See merge request halo/android/assistant-android!706
 2023-02-14 09:23:42 +08:00
张玉久
2a020fb269 fix: 修改游戏详情点击tab跳转错误问题 2023-02-13 18:44:54 +08:00
chenjuntao
0998109716 Merge remote-tracking branch 'origin/dev' into dev-5.20.0 2023-02-13 17:38:59 +08:00
chenjuntao
89b463f40b Merge remote-tracking branch 'origin/release' into dev 
# Conflicts:
#	dependencies.gradle
v5.19.0-730 		2023-02-13 17:29:50 +08:00
chenjuntao
32a6dff6cc feat: 【光环助手】多线程下载相关数据埋点补充 https://jira.shanqu.cc/browse/GHZS-1213 2023-02-13 17:28:28 +08:00
陈君陶
f4018172e3 Merge branch 'feature-GHZS-1213' into 'dev' 
【光环助手】多线程下载相关数据埋点补充 https://jira.shanqu.cc/browse/GHZS-1213

See merge request halo/android/assistant-android!705
 2023-02-13 17:26:09 +08:00
陈君陶
4745cede61 【光环助手】多线程下载相关数据埋点补充 https://jira.shanqu.cc/browse/GHZS-1213 2023-02-13 17:26:09 +08:00
叶子维
bf39be9705 Merge branch 'feature-GHZS-1240' into 'dev-5.20.0' 
fix: 新增[图标浮层]功能-0213UI测试 https://jira.shanqu.cc/browse/GHZS-1240

See merge request halo/android/assistant-android!704
 2023-02-13 15:38:34 +08:00
张玉久
1b5be46d53 Merge branch 'fix-GHZS-1200' into 'dev' 
fix: 修改版块内容列表-发现页下载按钮不更新的问题

See merge request halo/android/assistant-android!703
 2023-02-13 15:32:26 +08:00
张玉久
97b7b6bcaa fix: 修改版块内容列表-发现页下载按钮不更新的问题 2023-02-13 15:30:29 +08:00
叶子维
20c4ee5c0e fix: 新增[图标浮层]功能-0213UI测试 https://jira.shanqu.cc/browse/GHZS-1240 2023-02-13 14:24:38 +08:00
陈君陶
d76539c46a Merge branch 'fix-vgame_backup_clear_issue' into 'dev' 
fix: 修复卸载所有畅玩游戏时没有正确清理数据库文件备份的问题

See merge request halo/android/assistant-android!702
 2023-02-10 19:19:46 +08:00
chenjuntao
a8a8f6835a fix: 修复卸载所有畅玩游戏时没有正确清理数据库文件备份的问题 2023-02-10 19:14:47 +08:00
陈君陶
656213153d Merge branch 'fix-webview_check_crash' into 'dev' 
fix: 修复部分设备上检测 webview 类型时触发的闪退问题

See merge request halo/android/assistant-android!701
 2023-02-10 17:53:42 +08:00
chenjuntao
4a70dfed06 fix: 修复部分设备上检测 webview 类型时触发的闪退问题 2023-02-10 17:27:47 +08:00
陈君陶
4306f25b5e Merge branch 'fix-vgame_launch_issue' into 'dev' 
fix: 保证在主线程启动畅玩游戏

See merge request halo/android/assistant-android!700
 2023-02-10 16:43:43 +08:00
chenjuntao
608b0d1c3a fix: 保证在主线程启动畅玩游戏 2023-02-10 16:41:15 +08:00
张玉久
db119c22b3 Merge branch 'feature-GHZS-1001' into 'dev-5.20.0' 
fix: 优化普通帖子详情评论区的显示 https://jira.shanqu.cc/browse/GHZS-1001

See merge request halo/android/assistant-android!699
 2023-02-10 15:34:37 +08:00
张玉久
02ba8df424 fix: 优化普通帖子详情评论区的显示 https://jira.shanqu.cc/browse/GHZS-1001 2023-02-10 15:34:37 +08:00
陈君陶
9071675fae Merge branch 'fix-GHZS-1221' into 'dev' 
fix: 【游戏工具】原神悬浮窗登录问题 https://jira.shanqu.cc/browse/GHZS-1221

See merge request halo/android/assistant-android!698
 2023-02-10 10:06:36 +08:00
chenjuntao
21dc906600 fix: 【游戏工具】原神悬浮窗登录问题 https://jira.shanqu.cc/browse/GHZS-1221 2023-02-10 10:02:52 +08:00
叶子维
677f1d6fb9 Merge branch 'feature-GHZS-1100' into 'dev-5.20.0' 
feat: 新增[图标浮层]功能—客户端 https://jira.shanqu.cc/browse/GHZS-1100

See merge request halo/android/assistant-android!693
 2023-02-10 09:54:37 +08:00
叶子维
5bf0bb5042 feat: 新增[图标浮层]功能—客户端 https://jira.shanqu.cc/browse/GHZS-1100 2023-02-10 09:54:37 +08:00
陈君陶
4b90b43d0f Merge branch 'fix-GHZS-1229' into 'dev' 
fix: 修复畅玩管理相关问题(1, 2, 4) https://jira.shanqu.cc/browse/GHZS-1229

See merge request halo/android/assistant-android!697
 2023-02-10 09:14:05 +08:00
chenjuntao
a03016a70c fix: 修复畅玩管理相关问题(1, 2, 4) https://jira.shanqu.cc/browse/GHZS-1229 2023-02-09 18:08:20 +08:00
陈君陶
0957ad65a3 Merge branch 'fix-vgame_database_issue' into 'dev' 
fix: 修复畅玩游戏因为安装完成插入数据库异常而导致的显示问题

See merge request halo/android/assistant-android!696
 2023-02-09 15:34:23 +08:00
chenjuntao
13b004a78d fix: 修复畅玩游戏因为安装完成插入数据库异常而导致的显示问题 2023-02-09 15:28:18 +08:00