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
陈君陶
26395038bd Merge branch 'feature-GHZS-1528' into 'dev-5.22.0' 
fix: 【光环助手】畅玩组件安装后自动下载游戏 https://jira.shanqu.cc/browse/GHZS-1516

See merge request halo/android/assistant-android!781
 2023-03-09 09:47:34 +08:00
chenjuntao
68b0691618 fix: 【光环助手】畅玩组件安装后自动下载游戏 https://jira.shanqu.cc/browse/GHZS-1516 2023-03-09 09:36:32 +08:00
陈君陶
f5a4e4ca06 Merge branch 'fix-GHZS-1543' into 'dev-5.22.0' 
fix: 启动广告图显示错误—0306测试 https://jira.shanqu.cc/browse/GHZS-1543

See merge request halo/android/assistant-android!780
 2023-03-08 16:52:43 +08:00
chenjuntao
c75eacaf45 fix: 启动广告图显示错误—0306测试 https://jira.shanqu.cc/browse/GHZS-1543 2023-03-08 16:37:09 +08:00
张玉久
aa5ecb8e6c Merge branch 'feature-GHZS-1550' into 'dev-5.22.0' 
fix: 游戏镜像&游戏屏蔽相关优化—客户端 https://jira.shanqu.cc/browse/GHZS-1550

See merge request halo/android/assistant-android!779
 2023-03-08 09:30:56 +08:00
张玉久
00dda64279 Merge branch 'fix-GHZS-1549' into 'dev-5.22.0' 
fix: 新增用户-用户短ID显示优化—0307测试 https://jira.shanqu.cc/browse/GHZS-1549

See merge request halo/android/assistant-android!778
 2023-03-08 09:20:34 +08:00
张玉久
2bd3be0088 fix: 新增用户-用户短ID显示优化—0307测试 https://jira.shanqu.cc/browse/GHZS-1549 2023-03-07 21:39:15 +08:00
张玉久
3bff64af27 fix: 游戏镜像&游戏屏蔽相关优化—客户端 https://jira.shanqu.cc/browse/GHZS-1550 2023-03-07 21:15:51 +08:00
juntao
32210875da chore: 版本更新至 5.19.5 2023-03-07 17:36:38 +08:00
叶子维
db9d7d9d22 Merge branch 'merge_dev_to_release' into 'release' 
合并 dev 部分修改到 release 分支

See merge request halo/android/assistant-android!777
 2023-03-07 17:29:25 +08:00
叶子维
1f211356fd fix:【光环助手】资讯文章-下载按钮显示问题(0206测试1) https://jira.shanqu.cc/browse/GHZS-1066 2023-03-07 17:20:10 +08:00
叶子维
81b5b6b369 fix:【光环助手】资讯文章-下载按钮显示问题 https://jira.shanqu.cc/browse/GHZS-1066 2023-03-07 17:20:07 +08:00
叶子维
98e263f99a fix:【光环助手】多版本下载面板-版本说明显示问题 https://jira.shanqu.cc/browse/GHZS-1064 2023-03-07 17:19:55 +08:00
叶子维
81b74e7077 Merge branch 'feature-GHZS-1484' into 'dev-5.22.0' 
feat: 游戏搜素-内容标签点击优化—客户端 https://jira.shanqu.cc/browse/GHZS-1484

See merge request halo/android/assistant-android!775
 2023-03-07 16:42:35 +08:00
叶子维
083a893582 feat: 游戏搜素-内容标签点击优化—客户端 https://jira.shanqu.cc/browse/GHZS-1484 2023-03-07 16:42:35 +08:00
叶子维
405d4b709f Merge branch 'feature-GHZS-1491' into 'dev-5.22.0' 
feat: 多版本下载面板优化—客户端 https://jira.shanqu.cc/browse/GHZS-1491

See merge request halo/android/assistant-android!776
 2023-03-07 16:41:58 +08:00
叶子维
36942aab5a feat: 多版本下载面板优化—客户端 https://jira.shanqu.cc/browse/GHZS-1491 2023-03-07 16:04:45 +08:00
叶子维
e61b21ca49 Merge branch 'fix-dark_mode' into 'dev' 
fix: 修复切换深色模式首页游戏没有更新颜色的问题

See merge request halo/android/assistant-android!774
 2023-03-07 15:21:37 +08:00
叶子维
b9e7f4145a fix: 修复切换深色模式首页游戏没有更新颜色的问题 2023-03-07 15:21:37 +08:00
叶子维
517b474a1e Merge branch 'fix-GHZS-1440' into 'dev' 
fix: 【光环助手】游戏专题夜间模式显示问题 https://jira.shanqu.cc/browse/GHZS-1440

See merge request halo/android/assistant-android!773
 2023-03-07 14:24:28 +08:00
叶子维
dfac1e93b7 fix: 【光环助手】游戏专题夜间模式显示问题 https://jira.shanqu.cc/browse/GHZS-1440 2023-03-07 14:02:02 +08:00
陈君陶
d848081f62 Merge branch 'fix-typo' into 'dev' 
fix: 更正用户 id 和 gid 的命名

See merge request halo/android/assistant-android!772
 2023-03-07 10:49:04 +08:00
chenjuntao
2bac0feb2c fix: 更正用户 id 和 gid 的命名 2023-03-07 10:44:48 +08:00
叶子维
a602055f98 Merge branch 'hotfix-v5.19.4-734-vector_crash' into 'release' 
fix: 修复5.0以下系统矢量图相关闪退问题

See merge request halo/android/assistant-android!771
 2023-03-07 10:11:00 +08:00
陈君陶
28ba14e9ec Merge branch 'feature-GHZS-1419' into 'dev' 
feat: 神策埋点接入测试--光环埋点 https://jira.shanqu.cc/browse/GHZS-1419

See merge request halo/android/assistant-android!770
 2023-03-07 09:31:20 +08:00
chenjuntao
c36fb04f81 feat: 神策埋点接入测试--光环埋点 https://jira.shanqu.cc/browse/GHZS-1419 2023-03-07 09:21:04 +08:00
chenjuntao
7d26a66bc3 Merge remote-tracking branch 'origin/dev' into dev-5.22.0 2023-03-06 19:57:30 +08:00
chenjuntao
9451f9bae3 Merge remote-tracking branch 'origin/release' into dev 
# Conflicts:
#	dependencies.gradle
 2023-03-06 19:55:40 +08:00
chenjuntao
ac18a678ff Merge remote-tracking branch 'origin/legacy-release' into release 
# Conflicts:
#	app/proguard-rules.txt
 2023-03-06 19:55:05 +08:00
叶子维
bd2871788f fix: 修复5.0以下系统矢量图相关闪退问题 2023-03-06 17:16:58 +08:00
叶子维
beeece1d0e Merge branch 'feature-GHZS-1417' into 'dev' 
feat: 神策埋点接入测试--SDK接入 https://jira.shanqu.cc/browse/GHZS-1417

See merge request halo/android/assistant-android!769
 2023-03-06 16:10:51 +08:00
叶子维
1e9e39eea9 feat: 神策埋点接入测试--SDK接入 https://jira.shanqu.cc/browse/GHZS-1417 2023-03-06 16:10:51 +08:00
陈君陶
9162b0f67d Merge branch 'fix-news_js_error' into 'dev' 
fix: 修复新闻资讯页因为没有设置 PageFinishListener 导致的方法调用问题

See merge request halo/android/assistant-android!768
 2023-03-06 11:49:38 +08:00
chenjuntao
46dd84aaf9 fix: 修复新闻资讯页因为没有设置 PageFinishListener 导致的方法调用问题 2023-03-06 11:46:24 +08:00
张玉久
e5e0d99abb Merge branch 'feature-GHZS-1428' into 'dev-5.22.0' 
fix: 【光环助手】游戏详情-游戏礼包显示问题 https://jira.shanqu.cc/browse/GHZS-1428

See merge request halo/android/assistant-android!767
 2023-03-06 09:09:29 +08:00
张玉久
6f34b16bba fix: 【光环助手】游戏详情-游戏礼包显示问题 https://jira.shanqu.cc/browse/GHZS-1428 2023-03-03 21:09:13 +08:00
张玉久
5b2512f16f Merge branch 'feature-GHZS-1537' into 'dev-5.22.0' 
fix: 新增用户-用户短ID显示优化—客户端 https://jira.shanqu.cc/browse/GHZS-1537

See merge request halo/android/assistant-android!766
 2023-03-03 18:42:07 +08:00
张玉久
9a1e0f1ae2 fix: 新增用户-用户短ID显示优化—客户端 https://jira.shanqu.cc/browse/GHZS-1537 2023-03-03 18:34:10 +08:00
陈君陶
a03b6b643f Merge branch 'fix-GHZS-1539' into 'dev-5.22.0' 
fix: 修复缓存的启动广告图过期仍显示的问题 https://jira.shanqu.cc/browse/GHZS-1539

See merge request halo/android/assistant-android!765
 2023-03-03 16:36:59 +08:00
chenjuntao
8b2cb8b40c fix: 修复缓存的启动广告图过期仍显示的问题 https://jira.shanqu.cc/browse/GHZS-1539 2023-03-03 16:32:43 +08:00
张玉久
c2402bd4d2 Merge branch 'feature-GHZS-1490' into 'dev-5.22.0' 
fix: 游戏详情-顶部视频播放优化—客户端 https://jira.shanqu.cc/browse/GHZS-1490

See merge request halo/android/assistant-android!764
 2023-03-03 15:53:22 +08:00
张玉久
b724cde6ca fix: 游戏详情-顶部视频播放优化—客户端 https://jira.shanqu.cc/browse/GHZS-1490 2023-03-03 15:53:22 +08:00
叶子维
fd3058e0be Merge branch 'fix-gdt' into 'legacy-release' 
fix: 修改广点通默认数据源id和密钥

See merge request halo/android/assistant-android!762
 2023-03-03 11:12:58 +08:00
张玉久
03431ef3a3 Merge branch 'feature-GHZS-1502' into 'dev-5.22.0' 
fix: 新增GIF图片可点击关闭—客户端 https://jira.shanqu.cc/browse/GHZS-1502

See merge request halo/android/assistant-android!761
 2023-03-03 09:51:08 +08:00
张玉久
23e2a79bee fix: 新增GIF图片可点击关闭—客户端 https://jira.shanqu.cc/browse/GHZS-1502 2023-03-03 09:40:06 +08:00
chenjuntao
3aa14c9541 chore: 版本更新为 5.22.0 2023-03-02 17:54:57 +08:00
陈君陶
39fcc5ed63 Merge branch 'fix-GHZS-1448' into 'dev-5.21.0' 
fix: 游戏礼包新增兑换码功能—0228测试-客户端部分-客户端 https://jira.shanqu.cc/browse/GHZS-1448

See merge request halo/android/assistant-android!760
 2023-03-02 16:53:12 +08:00
chenjuntao
577be922a6 fix: 游戏礼包新增兑换码功能—0228测试-客户端部分-客户端 https://jira.shanqu.cc/browse/GHZS-1448 2023-03-02 16:48:38 +08:00
陈君陶
19d128e98a Merge branch 'fix-typo' into 'dev-5.21.0' 
fix: 更新畅玩提示文案

See merge request halo/android/assistant-android!759
 2023-03-02 16:45:42 +08:00
chenjuntao
a8acf1d6c8 fix: 更新畅玩提示文案 2023-03-02 16:44:06 +08:00