Commit Graph

10242 Commits

Author SHA1 Message Date
fa03fc6d4c ci: 测试多项目触发 2023-03-27 17:54:22 +08:00
f23eb48185 ci: 测试多项目触发 2023-03-27 17:48:22 +08:00
8c5568c24d ci: 测试多项目触发 2023-03-27 17:42:56 +08:00
1bdc1a6430 ci: 测试多项目触发 2023-03-27 17:40:33 +08:00
b289e78a88 ci: Dockerfile 去掉代码复制 2023-03-27 17:09:49 +08:00
ac4143fe0a fix: 添加 outputs 参数 2023-03-24 15:01:03 +08:00
938cb1c9cb fix: 调整入参命名 2023-03-24 14:04:20 +08:00
7445f98086 修改.gitmodules url 2023-03-24 14:04:10 +08:00
c2552096e1 ci: 修改stage 2023-03-24 14:01:24 +08:00
c6c0fe771a ci:添加android,及制作基础打包镜像 2023-03-24 14:00:16 +08:00
623708fed1 fix: 修正入参命名 2023-03-24 11:27:51 +08:00
faec33658d feat: 简单对接接口 2023-03-15 18:17:53 +08:00
2fda01215a feat: 【光环助手】推广组测试打包任务 https://jira.shanqu.cc/browse/GHZS-972 2023-03-15 14:42:52 +08:00
ee6ec82d27 Merge branch 'fix-GHZS-1622' into 'dev'
fix: OPPO手机拦截安装相关优化—0314测试 (更正接口调用) https://jira.shanqu.cc/browse/GHZS-1622

See merge request halo/android/assistant-android!796
2023-03-15 09:24:07 +08:00
317cce1f56 fix: OPPO手机拦截安装相关优化—0314测试 (更正接口调用) https://jira.shanqu.cc/browse/GHZS-1622 2023-03-14 18:31:10 +08:00
f29f5089fd Merge branch 'feature-GHZS-1216' into 'dev'
feat:【光环助手】实名认证接口崩溃预案  https://jira.shanqu.cc/browse/GHZS-1216

See merge request halo/android/assistant-android!795
2023-03-14 18:06:49 +08:00
f5b71fdcb2 feat:【光环助手】实名认证接口崩溃预案 https://jira.shanqu.cc/browse/GHZS-1216 2023-03-14 18:03:45 +08:00
79c0e61a24 Merge branch 'feature-GHZS-1576' into 'dev'
feat: 游戏专题相关功能优化—客户端(补充下载完成的广告曝光埋点) https://jira.shanqu.cc/browse/GHZS-1576

See merge request halo/android/assistant-android!794
2023-03-14 17:50:50 +08:00
bfeadf8c75 feat: 游戏专题相关功能优化—客户端(补充下载完成的广告曝光埋点) https://jira.shanqu.cc/browse/GHZS-1576 2023-03-14 17:23:36 +08:00
b118309d4e Merge branch 'feature-GHZS-1498' into 'dev'
feat: 论坛详情页相关优化—客户端 https://jira.shanqu.cc/browse/GHZS-1498

See merge request halo/android/assistant-android!792
2023-03-14 15:59:39 +08:00
5aab516058 feat: 论坛详情页相关优化—客户端 https://jira.shanqu.cc/browse/GHZS-1498 2023-03-14 15:59:38 +08:00
3ef4214313 Merge branch 'fix-GHZS-1611' into 'dev'
fix: 游戏镜像&游戏屏蔽相关优化—0314测试-后端(3(2)) https://jira.shanqu.cc/browse/GHZS-1611

See merge request halo/android/assistant-android!793
2023-03-14 15:57:20 +08:00
dcca1b9ff9 fix: 游戏镜像&游戏屏蔽相关优化—0314测试-后端(3(2)) https://jira.shanqu.cc/browse/GHZS-1611 2023-03-14 15:53:26 +08:00
7bdc7a946d Merge branch 'fix-change-debug-log-class' into 'dev'
fix:更换新游开测使用的debug日志类。并补充新游开测需求地址:https://jira.shanqu.cc/browse/GHZS-1351

See merge request halo/android/assistant-android!790
2023-03-14 14:26:44 +08:00
55a92847c7 fix:更换新游开测使用的debug日志类。并补充新游开测需求地址:https://jira.shanqu.cc/browse/GHZS-1351 2023-03-14 14:26:44 +08:00
b858365c1d Merge branch 'feat-GHZS-1351' into 'dev'
feat:首页/板块-新游开测-开发完成

See merge request halo/android/assistant-android!788
2023-03-14 14:00:57 +08:00
92d2f7e701 feat:首页/板块-新游开测-开发完成 2023-03-14 14:00:57 +08:00
0967df5751 Merge branch 'feature-GHZS-1492' into 'dev'
feat: 镜像游戏-游戏更新优化—客户端 https://jira.shanqu.cc/browse/GHZS-1492

See merge request halo/android/assistant-android!789
2023-03-14 12:03:47 +08:00
d6e5b88d95 Merge remote-tracking branch 'origin/dev' into dev-5.22.0 2023-03-13 17:47:57 +08:00
b08e653b99 Merge remote-tracking branch 'origin/release' into dev
# Conflicts:
#	dependencies.gradle
#	module_common/src/main/java/com/gh/gamecenter/common/view/MaxHeightLinearLayout.kt
2023-03-13 17:41:10 +08:00
f539e45e18 feat: 镜像游戏-游戏更新优化—客户端 https://jira.shanqu.cc/browse/GHZS-1492 2023-03-13 15:50:49 +08:00
6a6ff5b12a ci: 调整最大 JVM heap size,避免编译时 OOM 2023-03-13 14:57:41 +08:00
b8ba5f85c9 Merge branch 'fix-GHZS-1587' into 'dev-5.22.0'
fix: 畅玩组件安装后自动下载游戏—0310测试 https://jira.shanqu.cc/browse/GHZS-1587

See merge request halo/android/assistant-android!787
2023-03-13 11:41:25 +08:00
67ed3cb919 fix: 畅玩组件安装后自动下载游戏—0310测试 https://jira.shanqu.cc/browse/GHZS-1587 2023-03-13 11:37:20 +08:00
c973bd6b5e Merge branch 'fix-GHZS-1591' into 'dev-5.22.0'
fix: 游戏专题新增[视频横屏滑动]样式—0313UI测试 https://jira.shanqu.cc/browse/GHZS-1591

See merge request halo/android/assistant-android!786
2023-03-13 11:29:10 +08:00
61e9bcb89d fix: 游戏专题新增[视频横屏滑动]样式—0313UI测试 https://jira.shanqu.cc/browse/GHZS-1591 2023-03-13 11:27:23 +08:00
2d3f18a302 Merge branch 'fix-vpn_setting_null_pointer' into 'dev-5.22.0'
fix: 修复安装配置为空时的空指针异常

See merge request halo/android/assistant-android!785
2023-03-13 11:17:50 +08:00
401d36a74e fix: 修复安装配置为空时的空指针异常 2023-03-13 11:15:36 +08:00
bee52ba0bd Merge branch 'feature-GHZS-1343' into 'dev-5.22.0'
fix: 【光环助手】OPPO手机拦截安装相关优化 https://jira.shanqu.cc/browse/GHZS-1343

See merge request halo/android/assistant-android!784
2023-03-13 11:01:02 +08:00
6d2e0853ff feat: 【光环助手】OPPO手机拦截安装相关优化 https://jira.shanqu.cc/browse/GHZS-1343 2023-03-13 11:01:02 +08:00
3b23f086c8 Merge branch 'fix-GHZS-1544' into 'dev-5.22.0'
fix: 【光环助手】游戏详情滑动问题 https://jira.shanqu.cc/browse/GHZS-1544

See merge request halo/android/assistant-android!783
2023-03-10 11:42:58 +08:00
d50e4e044b fix: 【光环助手】游戏详情滑动问题 https://jira.shanqu.cc/browse/GHZS-1544 2023-03-10 11:40:08 +08:00
84f56681d0 Merge remote-tracking branch 'origin/dev' into dev-5.22.0 2023-03-10 10:52:41 +08:00
7fbb3eec86 Merge branch 'feature-GHZS-1287' into 'dev-5.22.0'
feat: 游戏专题新增[视频横屏滑动]样式—客户端 https://jira.shanqu.cc/browse/GHZS-1287

See merge request halo/android/assistant-android!782
2023-03-09 15:55:11 +08:00
ef11044b50 feat: 游戏专题新增[视频横屏滑动]样式—客户端 https://jira.shanqu.cc/browse/GHZS-1287 2023-03-09 15:55:11 +08:00
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
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
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