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

11918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
叶子维
5c8a275b3e Merge branch 'fix/build_scripts' into 'dev' 
build: 默认使用极光推送

See merge request halo/android/assistant-android!1624
 2024-04-16 09:26:45 +08:00
叶子维
405fd6c698 build: 默认使用极光推送 2024-04-16 09:22:59 +08:00
叶子维
d70c8f2b78 Merge branch 'fix/build_gradle' into 'dev' 
build: 默认使用极光推送

See merge request halo/android/assistant-android!1623
 2024-04-15 18:09:19 +08:00
叶子维
2700b309dd build: 默认使用极光推送 2024-04-15 18:08:09 +08:00
chenjuntao
832509a124 fix: 修复下载模块回调两次 downloadComplete 的问题 
Signed-off-by: chenjuntao <chenjuntao@ghzhushou.com>
 2024-04-15 17:50:38 +08:00
曾祥俊
36e69ece10 Merge branch 'feature-GHZS-4991' into 'dev' 
feat: 闪指H5落地页新增获取光环游戏数据及相关优化—客户端 https://jira.shanqu.cc/browse/GHZS-4991

See merge request halo/android/assistant-android!1585
 2024-04-15 16:15:53 +08:00
曾祥俊
7d56f92535 feat: 闪指H5落地页新增获取光环游戏数据及相关优化—客户端 https://jira.shanqu.cc/browse/GHZS-4991 2024-04-15 15:46:28 +08:00
chenjuntao
9fe58a72c7 Merge remote-tracking branch 'origin/release' into dev 
# Conflicts:
#	dependencies.gradle
 2024-04-15 15:13:09 +08:00
陈君陶
4c79c49506 Merge branch 'feat/GHZS-3758' into 'release' 
feat: targetSDK 调整至 30

See merge request halo/android/assistant-android!1514
 2024-04-15 15:08:25 +08:00
chenjuntao
c4a622a55c fix: 合并冲突 
Signed-off-by: chenjuntao <chenjuntao@ghzhushou.com>
 2024-04-15 15:06:53 +08:00
陈君陶
3a02823ea9 Merge branch 'feat/GHZS-4988' into 'dev' 
feat: 重构图片加载相关代码 https://jira.shanqu.cc/browse/GHZS-4988

See merge request halo/android/assistant-android!1622
 2024-04-15 13:49:46 +08:00
chenjuntao
7d816c00c4 feat: 重构图片加载相关代码 https://jira.shanqu.cc/browse/GHZS-4988 2024-04-15 10:02:15 +08:00
曾祥俊
1214a6fb13 Merge branch 'feature-fix-sentry-376330' into 'release' 
fix: 修复开服日历反馈在低版本Android系统中，SimpleDateFormat的日期格式兼容问题

See merge request halo/android/assistant-android!1621
 2024-04-12 16:32:52 +08:00
曾祥俊
e90053bdc9 fix: 修复开服日历反馈在低版本Android系统中，SimpleDateFormat的日期格式兼容问题 2024-04-12 16:29:48 +08:00
陈君陶
de9980af6a Merge branch 'feat/refactor_do_on_main_process_implementation' into 'dev' 
feat: 重构限制主进程执行的相关代码

See merge request halo/android/assistant-android!1620
 2024-04-12 15:29:54 +08:00
chenjuntao
ec6ad35ade feat: 重构限制主进程执行的相关代码 2024-04-12 14:52:46 +08:00
张晨
c199487c51 Merge branch 'chen/202404/fix-common-content-reuse' into 'release' 
fix:修复通用内容合集显示错乱问题（考虑极端情况：数据完全相同，样式不同）

See merge request halo/android/assistant-android!1619
 2024-04-12 13:48:25 +08:00
张晨
a1ac427540 fix:修复通用内容合集显示错乱问题（考虑极端情况：数据完全相同，样式不同） 2024-04-12 13:45:51 +08:00
叶子维
1e2755c82c Merge branch 'hotfix/v5.34.5-1035/game_detail_crash' into 'release' 
fix: 修复游戏详情页闪退问题 https://sentry.shanqu.cc/organizations/lightgame/issues/376726/?project=22

See merge request halo/android/assistant-android!1618
 2024-04-12 10:58:14 +08:00
叶子维
a05e31705f fix: 修复游戏详情页闪退问题 https://sentry.shanqu.cc/organizations/lightgame/issues/376726/?project=22 2024-04-12 10:37:38 +08:00
叶子维
62f2bb40df Merge branch 'hotfix/v5.34.5-1035/forum_article_ask_list_crash' into 'release' 
fix: 修复论坛详情页闪退问题 https://sentry.shanqu.cc/organizations/lightgame/issues/378960/?project=22

See merge request halo/android/assistant-android!1617
 2024-04-12 09:52:06 +08:00
叶子维
eabb277c7b fix: 修复论坛详情页闪退问题 https://sentry.shanqu.cc/organizations/lightgame/issues/378960/?project=22 2024-04-12 09:45:36 +08:00
曾祥俊
fb7cdd5ce7 Merge branch 'feature-GHZS-4956' into 'dev' 
feat: 内容卡片新增提示弹窗—客户端 https://jira.shanqu.cc/browse/GHZS-4956

See merge request halo/android/assistant-android!1595
 2024-04-11 17:31:58 +08:00
曾祥俊
3bbfd676fb feat: 内容卡片新增提示弹窗—客户端 https://jira.shanqu.cc/browse/GHZS-4956 2024-04-11 17:31:58 +08:00
张晨
7be6af5f08 Merge branch 'chen/202404/GHZS-5197' into 'release' 
fix:【光环助手】同一页面使用相同样式组件的图片复用 https://jira.shanqu.cc/browse/GHZS-5197

See merge request halo/android/assistant-android!1616
 2024-04-11 15:50:29 +08:00
张晨
982f5faf97 fix:【光环助手】同一页面使用相同样式组件的图片复用 https://jira.shanqu.cc/browse/GHZS-5197 2024-04-11 15:47:58 +08:00
叶子维
81c8469e7b Merge branch 'feat/GHZS-5075' into 'dev' 
feat: 搜索页面专区文案修改—客户端 https://jira.shanqu.cc/browse/GHZS-5075

See merge request halo/android/assistant-android!1615
 2024-04-10 15:50:54 +08:00
叶子维
2e03e9f4f5 feat: 搜索页面专区文案修改—客户端 https://jira.shanqu.cc/browse/GHZS-5075 2024-04-10 15:50:54 +08:00
叶子维
6ab10a0eee Merge branch 'feat/GHZS-5050' into 'dev' 
feat: 消息推送：接入极光消息推送系统—客户端 https://jira.shanqu.cc/browse/GHZS-5050

See merge request halo/android/assistant-android!1613
 2024-04-10 14:46:35 +08:00
叶子维
23f7d1f32c feat: 消息推送：接入极光消息推送系统—客户端 https://jira.shanqu.cc/browse/GHZS-5050 2024-04-10 14:46:35 +08:00
叶子维
93f5343106 Merge branch 'feat/GHZS-5150' into 'dev' 
feat: 下拉推送弹窗规则优化—客户端 https://jira.shanqu.cc/browse/GHZS-5150

See merge request halo/android/assistant-android!1614
 2024-04-10 14:41:45 +08:00
叶子维
6846a61dd5 feat: 下拉推送弹窗规则优化—客户端 https://jira.shanqu.cc/browse/GHZS-5150 2024-04-10 14:41:45 +08:00
juntao
1a99fec286 chore: 版本更新至 5.34.6 v5.34.6-1036 2024-04-10 11:44:34 +08:00
chenjuntao
3d77c1ed3a fix: 处理合并冲突 2024-04-10 11:39:07 +08:00
chenjuntao
c312d616da feat: 更改下载地址 https://jira.shanqu.cc/browse/GHZS-3737 2024-04-10 11:27:05 +08:00
叶子维
8f1affeb74 fix: targetSDK版本升级—1019测试-客户端（修复xapk无法安装的问题） https://jira.shanqu.cc/browse/GHZS-3737 2024-04-10 11:25:43 +08:00
chenjuntao
fdbfdecb2d fix: 处理代码冲突 2024-04-10 11:24:36 +08:00
chenjuntao
e84b814d2c fix: 修复使用非可见 context 获取屏幕高度时的 IllegalAccessException 2024-04-10 11:24:36 +08:00
chenjuntao
14c8591a99 fix: 修复调用 telephonyManager.getNetworkType() 造成的闪退问题 2024-04-10 11:24:36 +08:00
叶子维
95d073a50d feat: 修改DeviceId文件保存路径，升级版本后迁移文件至新路径 2024-04-10 11:24:36 +08:00
叶子维
edec43aea2 fix: 修改分享图片保存路径 2024-04-10 11:24:36 +08:00
叶子维
188b5bdd7f fix: 修改阿里云OSS断点记录文件夹路径 2024-04-10 11:24:36 +08:00
叶子维
c454b092b2 feat: FileUtils移至module_common 2024-04-10 11:23:37 +08:00
叶子维
c70b1c962b fix: 修复编辑帖子无法预览上传图片的问题 2024-04-10 11:07:57 +08:00
叶子维
e71b2b0a56 feat: 游戏下载目录修改为Download文件夹内 2024-04-10 11:07:57 +08:00
叶子维
c010b7aba4 fix: matisse适配 targetSdk 30 2024-04-10 11:07:57 +08:00
juntao
2c23c4f0eb build: 修复特殊包的编译问题 v5.34.5-1035 2024-04-10 10:46:53 +08:00
juntao
2c2031f623 chore: 版本更新至 5.34.5 2024-04-08 15:42:29 +08:00
曾祥俊
41ddf53e23 Merge branch 'feature-fix-comment-like' into 'release' 
fix: 修复评论详情点赞异常的问题

See merge request halo/android/assistant-android!1612
 2024-04-08 14:21:32 +08:00
曾祥俊
b911edb83c fix: 修复评论详情点赞异常的问题 2024-04-08 14:16:00 +08:00