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

11314 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
叶子维
df6c87eed2 Merge branch 'fix/GHZS-3064' into 'dev' 
fix: 修复帮助与反馈页面帮助视频轮播与下拉刷新的滑动冲突

See merge request halo/android/assistant-android!1302
 2023-08-30 17:08:00 +08:00
叶子维
2894a964ea fix: 修复帮助与反馈页面帮助视频轮播与下拉刷新的滑动冲突 2023-08-30 17:06:35 +08:00
陈君陶
421baf2889 Merge branch 'fix/GHZS-3315' into 'dev' 
fix: 重构首页弹窗类功能的显示（调整通知权限弹窗的回调）

See merge request halo/android/assistant-android!1300
 2023-08-30 15:32:46 +08:00
chenjuntao
040901f9df fix: 重构首页弹窗类功能的显示（调整通知权限弹窗的回调） 2023-08-30 15:28:24 +08:00
叶子维
2d9af85b62 Merge branch 'fix/home_game_collection_carousel_crash' into 'dev' 
fix: 修复首页游戏单轮播数组越界闪退

See merge request halo/android/assistant-android!1297
 2023-08-30 14:36:12 +08:00
叶子维
35c71c70c9 fix: 修复首页游戏单轮播数组越界闪退 2023-08-30 14:23:47 +08:00
陈君陶
0cb7e4c9a1 Merge branch 'fix/window_animation' into 'dev' 
fix: 优化右下悬浮窗的隐藏动画

See merge request halo/android/assistant-android!1295
 2023-08-30 10:55:50 +08:00
chenjuntao
152b9add80 fix: 优化右下悬浮窗的隐藏动画 2023-08-30 10:52:22 +08:00
叶子维
ab27ca5256 Merge branch 'fix/compose_setting' into 'dev' 
fix: 修复compose设置模块编译问题

See merge request halo/android/assistant-android!1294
 2023-08-29 17:35:37 +08:00
叶子维
90545415ae fix: 修复compose设置模块编译问题 2023-08-29 17:31:55 +08:00
叶子维
8018517207 Merge branch 'feature/GHZS-3172' into 'dev' 
feat: 神策数据埋点第二期(1)—客户端 https://jira.shanqu.cc/browse/GHZS-3172

See merge request halo/android/assistant-android!1293
 2023-08-29 15:40:15 +08:00
叶子维
c79128d6f4 feat: 神策数据埋点第二期(1)—客户端 https://jira.shanqu.cc/browse/GHZS-3172 2023-08-29 15:40:15 +08:00
chenjuntao
0a9471fc2e Merge remote-tracking branch 'origin/dev' into dev-5.31.0 2023-08-29 14:06:47 +08:00
陈君陶
7cfa26ff02 Merge branch 'build/build_issue' into 'dev' 
build: 将 QQ 小游戏的类添加到移除日志输出白名单，避免无法编译

See merge request halo/android/assistant-android!1292
v5.30.0-950 v5.30.0-950-debug 		2023-08-29 11:55:24 +08:00
juntao
a7335d21c5 build: 将 QQ 小游戏的类添加到移除日志输出白名单，避免无法编译 2023-08-29 11:54:43 +08:00
陈君陶
ce3d594a4e Merge branch 'feat/GHZS-3182' into 'dev-5.31.0' 
feat: 神策数据埋点第二期(3) https://jira.shanqu.cc/browse/GHZS-3182

See merge request halo/android/assistant-android!1291
 2023-08-29 10:50:58 +08:00
chenjuntao
553f84daa1 feat: 神策数据埋点第二期(3) https://jira.shanqu.cc/browse/GHZS-3182 2023-08-29 10:35:40 +08:00
陈君陶
70f782cb5c Merge branch 'fix/GHZS-3325' into 'dev-5.31.0' 
fix: 右下悬浮窗优化-0828测试 https://jira.shanqu.cc/browse/GHZS-3325

See merge request halo/android/assistant-android!1290
 2023-08-29 10:25:53 +08:00
chenjuntao
28725ae76f fix: 右下悬浮窗优化-0828测试 https://jira.shanqu.cc/browse/GHZS-3325 2023-08-29 10:17:38 +08:00
叶子维
b0972f1a80 Merge branch 'feature/GHZS-3064' into 'dev-5.31.0' 
帮助与反馈页面改版&意见反馈页面改版

See merge request halo/android/assistant-android!1283
 2023-08-28 14:06:09 +08:00
叶子维
585660e52d 帮助与反馈页面改版&意见反馈页面改版 2023-08-28 14:06:09 +08:00
陈君陶
0fd84f8b44 Merge branch 'fix/csj-privacy-issue' into 'dev' 
fix: 处理穿山甲 SDK 的自动初始化问题，穿山甲 SDK 区分测试和正式 ID

See merge request halo/android/assistant-android!1288
 2023-08-28 09:51:41 +08:00
叶子维
43bcf78dea Merge branch 'fix/GHZS-3317' into 'dev' 
fix: 【光环助手】插件通知业务：已通知的消息图片不展示以及批量回复“未回复”用户报错(1) https://jira.shanqu.cc/browse/GHZS-3317

See merge request halo/android/assistant-android!1289
 2023-08-28 09:51:33 +08:00
chenjuntao
fb44391500 fix: 处理穿山甲 SDK 的自动初始化问题，穿山甲 SDK 区分测试和正式 ID 2023-08-28 09:44:20 +08:00
叶子维
4c4de337cd fix: 【光环助手】插件通知业务：已通知的消息图片不展示以及批量回复“未回复”用户报错(1) https://jira.shanqu.cc/browse/GHZS-3317 2023-08-28 09:41:45 +08:00
chenjuntao
20998852b6 fix: 处理合并冲突 2023-08-25 16:57:53 +08:00
chenjuntao
929a2c4d29 Merge remote-tracking branch 'origin/dev' into dev-5.31.0 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java
#	app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalAdapter.kt
 2023-08-25 16:38:27 +08:00
陈君陶
f0fd323107 Merge branch 'fix/floating_window_animation' into 'dev-5.31.0' 
fix: 修复右下悬浮窗展开和收起的动画显示问题

See merge request halo/android/assistant-android!1287
 2023-08-25 16:34:50 +08:00
chenjuntao
00892e831a fix: 修复右下悬浮窗展开和收起的动画显示问题 2023-08-25 16:34:15 +08:00
陈君陶
625e448928 Merge branch 'fix/qGame_culprit' into 'dev' 
fix: 修复专题详情默认为 QQ 小游戏的问题

See merge request halo/android/assistant-android!1286
 2023-08-25 16:04:53 +08:00
chenjuntao
2bfefc5082 fix: 修复专题详情默认为 QQ 小游戏的问题 2023-08-25 16:00:17 +08:00
陈君陶
a55fcdcb28 Merge branch 'feat/GHZS-3081' into 'dev-5.31.0' 
feat: 右下悬浮窗优化-新增悬浮窗展开交互 https://jira.shanqu.cc/browse/GHZS-3081

See merge request halo/android/assistant-android!1285
 2023-08-24 18:03:20 +08:00
曾祥俊
1538d77960 Merge branch 'feature-GHZS-3273' into 'dev' 
feat: 【光环助手】同步正式问题—QQ小游戏SDK https://jira.shanqu.cc/browse/GHZS-3273

See merge request halo/android/assistant-android!1284
 2023-08-24 17:41:27 +08:00
曾祥俊
9f77e70c16 feat: 【光环助手】同步正式问题—QQ小游戏SDK https://jira.shanqu.cc/browse/GHZS-3273 2023-08-24 17:41:27 +08:00
chenjuntao
548a34c66d feat: 右下悬浮窗优化-新增悬浮窗展开交互 https://jira.shanqu.cc/browse/GHZS-3081 2023-08-24 17:28:36 +08:00
曾祥俊
55f51284c8 Merge branch 'feature-GHZS-3255' into 'dev-5.31.0' 
feat: 插件化相关弹窗埋点补充—0817测试 https://jira.shanqu.cc/browse/GHZS-3255

See merge request halo/android/assistant-android!1282
 2023-08-24 15:06:07 +08:00
曾祥俊
079dac80f8 feat: 插件化相关弹窗埋点补充—0817测试 https://jira.shanqu.cc/browse/GHZS-3255 2023-08-24 15:06:07 +08:00
曾祥俊
b33fee6ec0 Merge branch 'feature-GHZS-3276' into 'dev-5.31.0' 
feat: 游戏详情-开服日历表-反馈优化—0822UI测试 https://jira.shanqu.cc/browse/GHZS-3276

See merge request halo/android/assistant-android!1281
 2023-08-24 09:55:43 +08:00
曾祥俊
2c1fdae6c7 feat: 游戏详情-开服日历表-反馈优化—0822UI测试 https://jira.shanqu.cc/browse/GHZS-3276 2023-08-24 09:55:43 +08:00
叶子维
6a935b18e8 Merge branch 'fix/GHZS-3274' into 'dev-5.31.0' 
fix: 新游开测相关功能优化（第二期）—0822UI测试 https://jira.shanqu.cc/browse/GHZS-3274

See merge request halo/android/assistant-android!1280
 2023-08-22 15:40:13 +08:00
叶子维
91c363fb55 fix: 新游开测相关功能优化（第二期）—0822UI测试 https://jira.shanqu.cc/browse/GHZS-3274 2023-08-22 15:38:46 +08:00
曾祥俊
630f78e62d Merge branch 'feature-sentry-318553' into 'dev' 
fix: Sentry318553

See merge request halo/android/assistant-android!1279
 2023-08-18 16:55:52 +08:00
曾祥俊
dc7b103cbc fix: Sentry318553 2023-08-18 16:55:52 +08:00
曾祥俊
d30f51123d Merge branch 'feature-GHZS-2966-new' into 'dev' 
feat: QQ小游戏SDK接入—客户端 https://jira.shanqu.cc/browse/GHZS-2966

See merge request halo/android/assistant-android!1278
 2023-08-18 15:23:19 +08:00
曾祥俊
00f625c350 feat: QQ小游戏SDK接入—客户端 https://jira.shanqu.cc/browse/GHZS-2966 2023-08-18 15:23:19 +08:00
陈君陶
95f63bd4f2 Merge branch 'feat/GHZS-3252' into 'dev' 
feat: 已安装列表权限-合规整改 https://jira.shanqu.cc/browse/GHZS-3249

See merge request halo/android/assistant-android!1276
 2023-08-17 16:53:41 +08:00
叶子维
e1a65c5fce Merge branch 'fix/GHZS-3248' into 'dev-5.31.0' 
fix: 新游开测相关功能优化（第二期）—0817测试 https://jira.shanqu.cc/browse/GHZS-3248

See merge request halo/android/assistant-android!1277
 2023-08-17 16:39:02 +08:00
叶子维
9fd6ce4e74 fix: 新游开测相关功能优化（第二期）—0817测试 https://jira.shanqu.cc/browse/GHZS-3248 2023-08-17 16:37:33 +08:00
叶子维
46df9cdccc Merge branch 'fix/GHZS-3248' into 'dev-5.31.0' 
fix: 新游开测相关功能优化（第二期）—0817测试 https://jira.shanqu.cc/browse/GHZS-3248

See merge request halo/android/assistant-android!1275
 2023-08-17 16:34:37 +08:00
叶子维
339665f90f fix: 新游开测相关功能优化（第二期）—0817测试 https://jira.shanqu.cc/browse/GHZS-3248 2023-08-17 16:29:33 +08:00