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
chenjuntao
a3f1b09da1 feat: H5链接游戏适配优化 https://jira.shanqu.cc/browse/GHZS-2450 2023-05-26 14:27:10 +08:00
叶子维
1798dfb64d Merge branch 'fix/CWZS-62' into 'dev' 
fix: 32位畅玩游戏下载流程

See merge request halo/android/assistant-android!1054
 2023-05-26 14:11:35 +08:00
叶子维
8e5814d389 fix: 32位畅玩游戏下载流程—0526UI测试 https://jira.shanqu.cc/browse/CWZS-63 2023-05-26 14:06:01 +08:00
叶子维
14c01cf171 fix: 32位畅玩游戏下载流程—0525测试 https://jira.shanqu.cc/browse/CWZS-62 2023-05-26 14:06:01 +08:00
chenjuntao
deb2b07644 Merge remote-tracking branch 'origin/dev' into dev-5.26.0 2023-05-22 11:27:59 +08:00
叶子维
386a7f82d9 Merge branch 'fix/debug_compile_error' into 'dev' 
fix: 修复debug包编译问题

See merge request halo/android/assistant-android!1040
 2023-05-22 11:05:31 +08:00
叶子维
94983c4b7f fix: 修复debug包编译问题 2023-05-22 10:51:08 +08:00
chenjuntao
119cdf4f91 Merge remote-tracking branch 'origin/release' into dev 
# Conflicts:
#	dependencies.gradle
 2023-05-19 15:55:10 +08:00
陈君陶
bdfd88a4c3 Merge branch 'fix/GHZS-2426' into 'dev-5.26.0' 
fix: 已安装列表游戏显示问题 https://jira.shanqu.cc/browse/GHZS-2426

See merge request halo/android/assistant-android!1038
 2023-05-19 15:42:25 +08:00
chenjuntao
2697fd57b4 fix: 已安装列表游戏显示问题 https://jira.shanqu.cc/browse/GHZS-2426 2023-05-19 15:35:19 +08:00
叶子维
bde7685dc6 Merge branch 'fix/compile_error' into 'dev' 
fix: 修复编译问题

See merge request halo/android/assistant-android!1037
 2023-05-19 14:45:51 +08:00
叶子维
6acaa95098 fix: 修复编译问题 2023-05-19 14:16:19 +08:00
陈君陶
610f116b82 Merge branch 'feature/ci_optimise' into 'dev' 
ci: android build 添加 resource_group 避免资源抢夺

See merge request halo/android/assistant-android!1036
 2023-05-19 14:02:42 +08:00
juntao
fe616ed87b ci: android build 添加 resource_group 避免资源抢夺 2023-05-19 13:56:36 +08:00
叶子维
06e238b2d5 Merge branch 'feature/CWZS-36' into 'dev-5.26.0' 
feat: 32位畅玩游戏下载流程—客户端 https://jira.shanqu.cc/browse/CWZS-36

See merge request halo/android/assistant-android!1024
 2023-05-18 17:59:29 +08:00
叶子维
a4c323b5e0 feat: 32位畅玩游戏下载流程—客户端 https://jira.shanqu.cc/browse/CWZS-36 2023-05-18 17:59:28 +08:00
叶子维
fdfb03348e Merge branch 'feature/GHZS-2408' into 'dev-5.26.0' 
feat: 神策SDK升级—客户端 https://jira.shanqu.cc/browse/GHZS-2408

See merge request halo/android/assistant-android!1034
 2023-05-18 16:46:10 +08:00
叶子维
91ba665c4c Merge branch 'hotfix/v5.24.5-835/forum_detail_section' into 'release' 
fix:【光环助手】子版块展示错位 https://jira.shanqu.cc/browse/GHZS-1867

See merge request halo/android/assistant-android!1035
 2023-05-18 16:09:46 +08:00
叶子维
ba65c5e23a feat: 神策SDK升级—客户端 https://jira.shanqu.cc/browse/GHZS-2408 2023-05-18 15:06:21 +08:00
叶子维
f05b20ed98 fix:【光环助手】子版块展示错位 https://jira.shanqu.cc/browse/GHZS-1867 2023-05-18 14:17:48 +08:00
叶子维
74d3e8b2d4 Merge branch 'feature/GHZS-2176' into 'dev' 
合并开屏广告SDK相关代码

See merge request halo/android/assistant-android!1033
 2023-05-18 11:48:52 +08:00
叶子维
74364cd452 合并开屏广告SDK相关代码 2023-05-18 11:48:52 +08:00
叶子维
dc2a023fbb Merge branch 'fix/GHZS-2372' into 'release' 
fix: 推广渠道接入神策数据平台—05/15测试 https://jira.shanqu.cc/browse/GHZS-2372

See merge request halo/android/assistant-android!1032
v5.24.5-835 		2023-05-16 16:02:50 +08:00
叶子维
47560daec6 fix: 推广渠道接入神策数据平台—05/15测试 https://jira.shanqu.cc/browse/GHZS-2372 2023-05-16 16:00:46 +08:00
叶子维
657b900418 Merge branch 'fix/GHZS-2372' into 'release' 
fix: 推广渠道接入神策数据平台—05/15测试 https://jira.shanqu.cc/browse/GHZS-2372

See merge request halo/android/assistant-android!1031
 2023-05-16 15:46:05 +08:00
叶子维
d826c3dcce fix: 推广渠道接入神策数据平台—05/15测试 https://jira.shanqu.cc/browse/GHZS-2372 2023-05-16 11:54:35 +08:00
陈君陶
935d61f910 Merge branch 'fix/CWZS-53' into 'dev' 
Resolve CWZS-53

See merge request halo/android/assistant-android!1030
 2023-05-15 11:09:43 +08:00
叶子维
0a412feefb Merge branch 'fix/GHZS-2370' into 'dev' 
fix:【光环助手】新游开测显示问题 https://jira.shanqu.cc/browse/GHZS-2370

See merge request halo/android/assistant-android!1029
 2023-05-15 10:45:18 +08:00
叶子维
31111a1cc8 fix:【光环助手】新游开测显示问题 https://jira.shanqu.cc/browse/GHZS-2370 2023-05-15 10:45:18 +08:00
chenjuntao
cf901ef840 fix: 需要谷歌框架的游戏授权后无法跳转返回的问题 https://jira.shanqu.cc/browse/CWZS-53 2023-05-12 14:44:06 +08:00
juntao
8d70716f15 chore: 版本更新为 5.24.5 2023-05-12 11:53:14 +08:00
陈君陶
7cf086874a Merge branch 'feature/GHZS-2364' into 'release' 
feat: 推广渠道接入神策数据平台 https://jira.shanqu.cc/browse/GHZS-2364

See merge request halo/android/assistant-android!1027
 2023-05-12 11:51:20 +08:00
juntao
d1698f0c2d feat: 推广渠道接入神策数据平台 https://jira.shanqu.cc/browse/GHZS-2364 2023-05-12 11:48:06 +08:00
chenjuntao
f80bcbcfb9 fix: 修复畅玩安装记录时可能错误使用同包名其它游戏实体的问题 https://jira.shanqu.cc/browse/CWZS-53 2023-05-12 11:33:37 +08:00
曾祥俊
0f2fcdba68 Merge branch 'feature-delete-comment-dialog-title-center-gravity' into 'dev-5.26.0' 
feat:评论详情删除评论弹窗标题居中

See merge request halo/android/assistant-android!1025
 2023-05-11 17:04:15 +08:00
曾祥俊
548156c159 feat:评论详情删除评论弹窗标题居中 2023-05-11 17:01:59 +08:00
曾祥俊
ea08a52750 Merge branch 'feature-comment-delete-hint-center-gravity' into 'dev-5.26.0' 
feat:评论详情删除评论弹窗内容居中

See merge request halo/android/assistant-android!1023
 2023-05-11 15:49:05 +08:00
曾祥俊
4c51ca7670 feat:评论详情删除评论弹窗内容居中 2023-05-11 15:43:52 +08:00
陈君陶
2ea9d46e12 Merge branch 'fix/GHZS-2340' into 'dev' 
fix: 同步正式环境问题—镜像游戏安装包大小显示错误 https://jira.shanqu.cc/browse/GHZS-2340

See merge request halo/android/assistant-android!1022
 2023-05-11 11:35:26 +08:00
chenjuntao
65445859d3 fix: 同步正式环境问题—镜像游戏安装包大小显示错误 https://jira.shanqu.cc/browse/GHZS-2340 2023-05-11 11:28:46 +08:00
陈君陶
8c9927b9cb Merge branch 'fix/build_error' into 'dev' 
fix: 处理编译问题

See merge request halo/android/assistant-android!1021
 2023-05-11 10:42:40 +08:00
chenjuntao
5477a4a4cc fix: 处理编译问题 2023-05-11 10:36:01 +08:00
曾祥俊
d1277aa1aa Merge branch 'feature-CWZS-50' into 'dev-5.26.0' 
feat:云存档最新Tab排序逻辑调整—0510测试-客户端 https://jira.shanqu.cc/browse/CWZS-50

See merge request halo/android/assistant-android!1020
 2023-05-11 10:12:11 +08:00
曾祥俊
2381550e08 feat:云存档最新Tab排序逻辑调整—0510测试-客户端 https://jira.shanqu.cc/browse/CWZS-50 2023-05-11 10:04:54 +08:00
juntao
3ff4a9b6cf chore: 版本更新至 5.24.4 v5.24.4-834 2023-05-10 17:35:51 +08:00
叶子维
174f47edb1 Merge branch 'hotfix/v5.24.3-833/home_push_crash' into 'release' 
fix: 修复首页下拉推送弹出时偶发的闪退问题...

See merge request halo/android/assistant-android!1019
 2023-05-10 17:35:19 +08:00
叶子维
96fbe30924 fix: 修复首页下拉推送弹出时偶发的闪退问题... 2023-05-10 17:35:19 +08:00
陈君陶
954c7e427a Merge branch 'fix/GHZS-2262' into 'dev' 
fix: 推广包修改激活上报比例没有生效 https://jira.shanqu.cc/browse/GHZS-2262

See merge request halo/android/assistant-android!1018
 2023-05-10 17:22:34 +08:00
chenjuntao
e466eb6683 fix: 推广包修改激活上报比例没有生效 https://jira.shanqu.cc/browse/GHZS-2262 2023-05-10 16:07:46 +08:00
叶子维
01437e9d8a Merge branch 'fix/GHZS-2337' into 'dev' 
fix:【光环助手】首页下拉推送显示问题 https://jira.shanqu.cc/browse/GHZS-2337

See merge request halo/android/assistant-android!1017
 2023-05-10 14:31:17 +08:00