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

11603 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
陈君陶
399e513174 Merge branch 'feat/GHZS-3760' into 'dev' 
feat: 帮助与反馈第二期迭代 https://jira.shanqu.cc/browse/GHZS-3760

See merge request halo/android/assistant-android!1424
 2023-11-22 17:16:10 +08:00
曾祥俊
1eeb34c93a Merge branch 'feature/GHZS-4272-patch' into 'dev' 
fix: 内容搜索新增搜索配置（客户端）-1117测试-客户端...

See merge request halo/android/assistant-android!1450
 2023-11-20 15:24:05 +08:00
曾祥俊
d18f3909ea fix: 内容搜索新增搜索配置（客户端）-1117测试-客户端... 2023-11-20 15:24:05 +08:00
chenjuntao
c23118e535 Merge remote-tracking branch 'origin/dev' into dev-5.33.0 
# Conflicts:
#	dependencies.gradle
 2023-11-20 14:41:30 +08:00
陈君陶
4d4498cdee Merge branch 'release' into 'dev' 
chore: 版本更新至 5.32.1

See merge request halo/android/assistant-android!1448
 2023-11-20 14:36:25 +08:00
陈君陶
a348b80eaf Merge branch 'dev' into 'dev-5.33.0' 
merge dev into dev-5.33.0

See merge request halo/android/assistant-android!1447
 2023-11-20 14:34:22 +08:00
chenjuntao
9691344e67 chore: 版本更新至 5.32.1 
Signed-off-by: chenjuntao <chenjuntao@ghzhushou.com>
v5.32.1-991 		2023-11-20 14:32:54 +08:00
曾祥俊
64bdbbf409 Merge branch 'feature-GHZS-4272' into 'dev-5.33.0' 
fix: 内容搜索新增搜索配置（客户端）-1117测试-客户端 https://jira.shanqu.cc/browse/GHZS-4272

See merge request halo/android/assistant-android!1446
 2023-11-20 10:51:36 +08:00
曾祥俊
984bb60e6a fix: 内容搜索新增搜索配置（客户端）-1117测试-客户端 https://jira.shanqu.cc/browse/GHZS-4272 2023-11-20 10:51:36 +08:00
陈君陶
41ba8c3e5a Merge branch 'fix/article_detail_culprit' into 'dev' 
fix: 修复不能同时打开两个社区文章详情页面的问题

See merge request halo/android/assistant-android!1445
 2023-11-17 15:11:31 +08:00
chenjuntao
b203d3a756 fix: 修复不能同时打开两个社区文章详情页面的问题 2023-11-16 14:36:45 +08:00
chenjuntao
1461af16b9 feat: 帮助与反馈第二期迭代 https://jira.shanqu.cc/browse/GHZS-3760 2023-11-15 14:14:28 +08:00
曾祥俊
14fca95ed6 Merge branch 'feature-GHZS-3949' into 'dev-5.33.0' 
fix: 内容搜索新增搜索配置(客-户-端)—1110测试-后端 https://jira.shanqu.cc/browse/GHZS-3949

See merge request halo/android/assistant-android!1442
 2023-11-15 11:21:50 +08:00
曾祥俊
c3926c85d8 fix: 内容搜索新增搜索配置(客-户-端)—1110测试-后端 https://jira.shanqu.cc/browse/GHZS-3949 2023-11-15 11:21:50 +08:00
陈君陶
9b73272019 Merge branch 'dev' into 'dev-5.33.0' 
合并 dev 到 dev-5.33.0

See merge request halo/android/assistant-android!1443
 2023-11-15 11:16:14 +08:00
chenjuntao
28bca22d93 ci: 变更编译文件存放的 OSS 地址 2023-11-15 11:13:51 +08:00
叶子维
905571a637 fix:【光环助手】单机插件跳转更新验收问题(1) https://jira.shanqu.cc/browse/GHZS-3870 2023-11-15 11:13:48 +08:00
张晨
5757df01e7 Merge branch 'dev-5.33.0-merged-dev' into 'dev-5.33.0' 
Dev 5.33.0 merged dev

See merge request halo/android/assistant-android!1436
 2023-11-10 14:12:42 +08:00
张晨
3f60f85992 Merge branch 'dev' into dev-5.33.0-merged-dev 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/forum/search/CommunitySearchEventListener.kt
#	app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt
#	app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListFragment.kt
 2023-11-10 14:05:20 +08:00
yangfei
dc9ac67e6e Merge branch 'feat/CWZS-79' into 'dev' 
畅玩安装本地apk

See merge request halo/android/assistant-android!1433
 2023-11-10 14:00:49 +08:00
yangfei
8c1d4a3778 feat: SD卡游戏按时间排序 https://jira.shanqu.cc/browse/CWZS-79 2023-11-10 13:58:38 +08:00
陈君陶
7189261c01 Merge branch 'feat/build_jira_comment' into 'dev' 
ci: jira 需求下补充 APK 附件评论

See merge request halo/android/assistant-android!1431
 2023-11-10 11:20:53 +08:00
chenjuntao
86c1781426 ci: jira 需求下补充 APK 附件评论 2023-11-10 11:20:31 +08:00
yangfei
4812e9258b fix: 过滤gh-files目录下的apk包无法正常解析。只扫描一级目录 2023-11-10 11:10:07 +08:00
陈君陶
b906fe7b47 Merge branch 'feat/build_jira_comment' into 'dev' 
ci: jira 需求下补充 APK 附件评论

See merge request halo/android/assistant-android!1428
 2023-11-10 10:43:30 +08:00
chenjuntao
846fd7222e ci: jira 需求下补充 APK 附件评论 2023-11-10 10:42:55 +08:00
张晨
1afabdfd94 Merge branch 'chen/202311/GHZS-3940' into 'dev' 
fix:埋点问题：内容内容推荐结果点击事件上报错误 https://jira.shanqu.cc/browse/GHZS-3940

See merge request halo/android/assistant-android!1427
 2023-11-10 10:37:44 +08:00
张晨
8ed2a13884 fix:埋点问题：内容内容推荐结果点击事件上报错误 https://jira.shanqu.cc/browse/GHZS-3940 2023-11-10 10:34:07 +08:00
张晨
52980189ed Merge branch 'chen/202310/GHZS-3730' into 'dev-5.33.0' 2023-11-09 14:01:17 +08:00
张晨
852f7734ef feat:论坛搜索排序逻辑优化—客户端 https://jira.shanqu.cc/browse/GHZS-3730 2023-11-09 14:01:17 +08:00
叶子维
a25503113b Merge branch 'docs/GHZS-3866' into 'dev-5.33.0' 
docs: 为首页所有现有的 ViewHolder 备注后台对应的样式名称 https://jira.shanqu.cc/browse/GHZS-3866

See merge request halo/android/assistant-android!1426
 2023-11-08 18:03:38 +08:00
叶子维
0d6b62b361 docs: 为首页所有现有的 ViewHolder 备注后台对应的样式名称 https://jira.shanqu.cc/browse/GHZS-3866 2023-11-08 14:34:29 +08:00
chenjuntao
e3b8ea74c1 fix: 处理与 5.32.0 的代码冲突 2023-11-08 11:44:15 +08:00
chenjuntao
bf10d5aa42 Merge remote-tracking branch 'origin/dev' into dev-5.33.0 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryFragment.kt
#	app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt
#	app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListFragment.kt
#	app/src/main/java/com/gh/gamecenter/forum/search/UserSearchListFragment.kt
#	app/src/main/res/layout/fragment_list_article_detail_comment.xml
 2023-11-08 11:30:16 +08:00
曾祥俊
cd13c98ac2 Merge branch 'feature-GHZS-3850' into 'dev' 
fix: 【光环助手】深夜模式帖子-相关tab展示错误 https://jira.shanqu.cc/browse/GHZS-3850

See merge request halo/android/assistant-android!1422
 2023-11-07 09:50:30 +08:00
曾祥俊
2c49b468e6 fix: 【光环助手】深夜模式帖子-相关tab展示错误 https://jira.shanqu.cc/browse/GHZS-3850 2023-11-07 09:45:44 +08:00
陈君陶
d175e895c3 Merge branch 'feat/GHZS-3613' into 'dev' 
feat: 设备ID重构 https://jira.shanqu.cc/browse/GHZS-3707

See merge request halo/android/assistant-android!1402
 2023-11-06 11:45:52 +08:00
陈君陶
1c0af1be7d feat: 设备ID重构 https://jira.shanqu.cc/browse/GHZS-3707 2023-11-06 11:45:52 +08:00
陈君陶
62f5a479c9 Merge branch 'fix/INTERACT_ACROSS_USERS_crash' into 'dev' 
fix: 尝试修复 INTERACT_ACROSS_USERS permission 闪退问题

See merge request halo/android/assistant-android!1420
 2023-11-06 10:43:44 +08:00
张晨
a87011d5b0 Merge branch 'chen/202311/fix-search-crash-when-exchange-dark' into 'dev' 
fix:社区搜索改为懒加载后，切换浅色模式crash

See merge request halo/android/assistant-android!1419
 2023-11-06 10:19:29 +08:00
chenjuntao
c6c2213a88 fix: 尝试修复 INTERACT_ACROSS_USERS permission 闪退问题 https://sentry.shanqu.cc/organizations/lightgame/issues/318432/events/ff3774f050c145b2a20ec69545fa3cac/?project=22&query=level%3Afatal&sort=user&statsPeriod=14d 2023-11-06 10:13:53 +08:00
张晨
9ede98deea fix:社区搜索改为懒加载后，切换浅色模式crash 2023-11-06 10:13:37 +08:00
曾祥俊
e46ec7c416 Merge branch 'feature-GHZS-3350-patch' into 'dev' 
feat: 游戏开服/开测消息通知—客户端 https://jira.shanqu.cc/browse/GHZS-3350

See merge request halo/android/assistant-android!1418
 2023-11-06 10:10:22 +08:00
曾祥俊
d49c6bc3ca feat: 游戏开服/开测消息通知—客户端 https://jira.shanqu.cc/browse/GHZS-3350 2023-11-06 10:10:22 +08:00
陈君陶
2bba43cf26 Merge branch 'feat/GHZS-3837' into 'dev' 
feat: 穿山甲广告替换定制版SDK

See merge request halo/android/assistant-android!1415
 2023-11-03 17:25:58 +08:00
叶子维
3efcd71046 Merge branch 'fix/GHZS-3853' into 'dev-5.33.0' 
fix: 畅玩游戏反馈优化—客户端 https://jira.shanqu.cc/browse/GHZS-3853

See merge request halo/android/assistant-android!1417
 2023-11-03 16:24:53 +08:00
陈君陶
19f54bb8d2 Merge branch 'feat/upload_test_apk' into 'dev' 
feat: 邮件包上传至内部测试平台

See merge request halo/android/assistant-android!1416
 2023-11-03 16:20:01 +08:00
叶子维
ce99eef958 fix: 畅玩游戏反馈优化—客户端 https://jira.shanqu.cc/browse/GHZS-3853 2023-11-03 16:17:49 +08:00
juntao
a167e7ff58 feat: 上传 APK 至内测平台 2023-11-03 16:14:30 +08:00
chenjuntao
ddd9032dbf feat: 穿山甲广告替换定制版SDK https://jira.shanqu.cc/browse/GHZS-3836 2023-11-03 10:09:26 +08:00