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

11336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
曾祥俊
776dfddc34 feat: 【光环助手】游戏详情-开服日历表-反馈优化 https://jira.shanqu.cc/browse/GHZS-3049 2023-09-04 10:05:55 +08:00
曾祥俊
b31b529ca7 Merge branch 'feature-GHZS-3367' into 'dev' 
feat: 帖子详情页UI优化—0831测试 https://jira.shanqu.cc/browse/GHZS-3367

See merge request halo/android/assistant-android!1311
 2023-09-04 09:40:19 +08:00
曾祥俊
1cc2f5387a feat: 帖子详情页UI优化—0831测试 https://jira.shanqu.cc/browse/GHZS-3367 2023-09-02 21:38:19 +08:00
陈君陶
f9d652d629 Merge branch 'fix/floating_window_issue' into 'dev' 
fix: 修复右下悬浮窗及启动弹窗的一些显示问题

See merge request halo/android/assistant-android!1308
 2023-08-31 17:05:54 +08:00
chenjuntao
0a61d29f37 fix: 修复右下悬浮窗及启动弹窗的一些显示问题 2023-08-31 16:50:14 +08:00
叶子维
f8ce9ffc90 Merge branch 'fix/GHZS-3358' into 'dev' 
fix: 意见反馈页面改版-0830测试 https://jira.shanqu.cc/browse/GHZS-3358

See merge request halo/android/assistant-android!1306
 2023-08-31 10:59:25 +08:00
叶子维
42366a8591 fix: 意见反馈页面改版-0830测试 https://jira.shanqu.cc/browse/GHZS-3358 2023-08-31 10:53:52 +08:00
曾祥俊
5dbf29a09d Merge branch 'feature-GHZS-3276-patch' into 'dev' 
feat: 游戏详情-开服日历表-反馈优化—0822UI测试 https://jira.shanqu.cc/browse/GHZS-3276

See merge request halo/android/assistant-android!1305
 2023-08-31 10:53:41 +08:00
曾祥俊
9621a62ed6 feat: 游戏详情-开服日历表-反馈优化—0822UI测试 https://jira.shanqu.cc/browse/GHZS-3276 2023-08-31 10:37:27 +08:00
chenjuntao
07f320db27 Merge remote-tracking branch 'origin/release' into dev 
# Conflicts:
#	dependencies.gradle
 2023-08-31 10:20:25 +08:00
陈君陶
89ecf09b55 Merge branch 'hotfix/v5.30.1-951/gson-culprit' into 'release' 
fix: 捕抓 gson toList 方法在部分设备上异常闪退的问题

See merge request halo/android/assistant-android!1304
 2023-08-31 10:19:34 +08:00
chenjuntao
2cfb227c22 fix: 捕抓 gson toList 方法在部分设备上异常闪退的问题 2023-08-31 10:18:02 +08:00
曾祥俊
285ec88d01 Merge branch 'feature-GHZS-3168' into 'dev' 
feat: 帖子详情页UI优化—客户端 https://jira.shanqu.cc/browse/GHZS-3168

See merge request halo/android/assistant-android!1303
 2023-08-31 09:26:01 +08:00
曾祥俊
1f86e7b32d feat: 帖子详情页UI优化—客户端 https://jira.shanqu.cc/browse/GHZS-3168 2023-08-30 18:00:09 +08:00
juntao
f34adc8e6d chore: 版本更新至 5.30.1 2023-08-30 17:39:45 +08:00
曾祥俊
8606c8f87a Merge branch 'feature-GHZS-sentry-327130' into 'release' 
Fix Sentry327130 QQ小游戏生命周期回调异常处理

See merge request halo/android/assistant-android!1301
 2023-08-30 17:22:18 +08:00
曾祥俊
caf2dbacf9 Fix Sentry327130 QQ小游戏生命周期回调异常处理 2023-08-30 17:22:18 +08:00
叶子维
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
陈君陶
9587336b31 Merge branch 'fix/vgame_ui_issue' into 'release' 
fix: 修复畅玩首页最近在玩区域的更多按钮被隐藏的问题

See merge request halo/android/assistant-android!1299
 2023-08-30 15:23:31 +08:00
chenjuntao
e1c2b2027a fix: 修复畅玩首页最近在玩区域的更多按钮被隐藏的问题 2023-08-30 15:22:39 +08:00
叶子维
c5ff26c879 Merge branch 'fix/crashes' into 'release' 
修复Sentry闪退问题

See merge request halo/android/assistant-android!1298
 2023-08-30 15:10:57 +08:00
叶子维
9690a695d4 fix: Sentry327122 https://sentry.shanqu.cc/organizations/lightgame/issues/327122/ 2023-08-30 15:06:59 +08:00
叶子维
78e9c43f24 fix: Sentry323027 https://sentry.shanqu.cc/organizations/lightgame/issues/323027/ 2023-08-30 15:06:59 +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