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

11046 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
叶子维
daab20424e Merge branch 'fix/GHZS-2848' into 'dev' 
fix: 游戏单功能优化-游戏单合集-前端部分—0704测试-客户端 https://jira.shanqu.cc/browse/GHZS-2848

See merge request halo/android/assistant-android!1184
 2023-07-05 16:55:40 +08:00
叶子维
63f2adade2 fix: 游戏单功能优化-游戏单合集-前端部分—0704测试-客户端 https://jira.shanqu.cc/browse/GHZS-2848 2023-07-05 15:39:04 +08:00
陈君陶
f30d647936 Merge branch 'feat/enable_log_in_internal_build' into 'dev' 
feat: 邮件包保留日志输出，方便无编译条件时简单调试

See merge request halo/android/assistant-android!1182
 2023-07-05 10:50:06 +08:00
chenjuntao
c7dd449899 feat: 邮件包保留日志输出，方便无编译条件时简单调试 2023-07-05 10:13:09 +08:00
陈君陶
0e9f7feff9 Merge branch 'feature/CWZS-80' into 'dev-5.29.0' 
feat: 新增谷歌框架版本管理 https://jira.shanqu.cc/browse/CWZS-81

See merge request halo/android/assistant-android!1181
 2023-07-04 17:45:56 +08:00
chenjuntao
3697cd720e feat: 新增谷歌框架版本管理 https://jira.shanqu.cc/browse/CWZS-81 2023-07-04 17:38:55 +08:00
陈君陶
07a3c06804 Merge branch 'feature/GHZS-2738' into 'dev-5.29.0' 
feat: 相关曝光数据埋点补充 https://jira.shanqu.cc/browse/GHZS-2738

See merge request halo/android/assistant-android!1180
 2023-07-04 16:13:09 +08:00
陈君陶
2fce492689 feat: 相关曝光数据埋点补充 https://jira.shanqu.cc/browse/GHZS-2738 2023-07-04 16:13:09 +08:00
chenjuntao
d87d12e1ec fix: 合并冲突 2023-07-04 14:58:57 +08:00
chenjuntao
a595730c50 Merge remote-tracking branch 'origin/dev' into dev-5.29.0 
# Conflicts:
#	libraries/LGLibrary
 2023-07-04 14:45:40 +08:00
陈君陶
7976355e34 Merge branch 'release' into 'dev' 
Release

See merge request halo/android/assistant-android!1178
 2023-07-04 14:41:38 +08:00
曾祥俊
a9097793ac Merge branch 'feature-forum-tag-icon-not-display' into 'release' 
fix: 修复社区-推荐列表项论坛入口图标不显示以及点击无反应的问题

See merge request halo/android/assistant-android!1177
 2023-07-04 13:38:53 +08:00
曾祥俊
86e4ddd3f7 fix: 修复社区-推荐列表项论坛入口图标不显示以及点击无反应的问题 2023-07-04 12:45:53 +08:00
叶子维
b9abf2009d Merge branch 'fix/GHZS-2838' into 'dev-5.29.0' 
fix: 游戏单功能优化-游戏单合集-前端部分—0703UI优化(2、6) https://jira.shanqu.cc/browse/GHZS-2838

See merge request halo/android/assistant-android!1176
 2023-07-04 11:55:37 +08:00
叶子维
a7dfd6c16c fix: 游戏单功能优化-游戏单合集-前端部分—0703UI优化(2、6) https://jira.shanqu.cc/browse/GHZS-2838 2023-07-04 11:51:05 +08:00
陈君陶
07dcb4aca2 Merge branch 'fix/web_share_info' into 'dev-5.29.0' 
fix: 修复网页分享时分享回调类型为与需求对应不上的问题

See merge request halo/android/assistant-android!1175
 2023-07-04 11:09:45 +08:00
chenjuntao
48123ff991 fix: 修复网页分享时分享回调类型为与需求对应不上的问题 2023-07-04 11:08:56 +08:00
曾祥俊
8312d8e5fe Merge branch 'feature-GHZS-2771-patch' into 'dev' 
feat:支持xapk格式的apks文件解压—0620测试 https://jira.shanqu.cc/browse/GHZS-2771

See merge request halo/android/assistant-android!1174
 2023-07-04 10:34:40 +08:00
曾祥俊
98b4901d55 feat:支持xapk格式的apks文件解压—0620测试 https://jira.shanqu.cc/browse/GHZS-2771 2023-07-04 10:34:40 +08:00
叶子维
a6a411f2e3 Merge branch 'fix/GHZS-2838' into 'dev-5.29.0' 
fix: 游戏单功能优化-游戏单合集-前端部分—0703UI优化 https://jira.shanqu.cc/browse/GHZS-2838

See merge request halo/android/assistant-android!1172
 2023-07-03 17:48:47 +08:00
叶子维
59976dcccd fix: 游戏单功能优化-游戏单合集-前端部分—0703UI优化 https://jira.shanqu.cc/browse/GHZS-2838 2023-07-03 17:47:18 +08:00
陈君陶
e22a3ddcdb Merge branch 'fix/web_share_info' into 'dev-5.29.0' 
feat: JS 分享结果回调添加分享类型

See merge request halo/android/assistant-android!1173
 2023-07-03 17:41:50 +08:00
chenjuntao
ecfd133ce2 feat: JS 分享结果回调添加分享类型 2023-07-03 17:36:37 +08:00
叶子维
d13ef56eb8 Merge branch 'fix/GHZS-2831' into 'dev-5.29.0' 
fix: 游戏单功能优化-游戏单合集-前端部分—0630测试-客户端 https://jira.shanqu.cc/browse/GHZS-2831

See merge request halo/android/assistant-android!1171
 2023-07-03 13:36:19 +08:00
叶子维
66f2d1df99 fix: 游戏单功能优化-游戏单合集-前端部分—0630测试-客户端 https://jira.shanqu.cc/browse/GHZS-2831 2023-07-03 11:38:09 +08:00
陈君陶
8555673d71 Merge branch 'feat/GHZS-2797' into 'dev' 
feat: 推广打包配置项增加关键行为上报 https://jira.shanqu.cc/browse/GHZS-2797

See merge request halo/android/assistant-android!1170
 2023-06-30 17:43:55 +08:00
juntao
cfe4c243e6 feat: 推广打包配置项增加关键行为上报 https://jira.shanqu.cc/browse/GHZS-2797 2023-06-30 17:30:18 +08:00
叶子维
c999ddf914 Merge branch 'fix/GHZS-2818' into 'dev' 
fix: 【光环助手】神策埋点问题(1) https://jira.shanqu.cc/browse/GHZS-2818

See merge request halo/android/assistant-android!1169
 2023-06-30 17:03:53 +08:00
叶子维
f9004bf884 fix: 【光环助手】神策埋点问题(1) https://jira.shanqu.cc/browse/GHZS-2818 2023-06-30 16:50:29 +08:00
叶子维
7794ef4acf fix: 【光环助手】神策埋点问题(1) https://jira.shanqu.cc/browse/GHZS-2818 2023-06-30 16:05:51 +08:00
陈君陶
1ef9c1fc23 Merge branch 'fix/vgame_download_flicker' into 'dev' 
fix: 修复列表下载畅玩游戏时下载按钮闪烁并频繁切换状态的问题

See merge request halo/android/assistant-android!1166
 2023-06-30 15:48:54 +08:00
chenjuntao
1b1b753feb Merge remote-tracking branch 'origin/dev' into dev-5.29.0 2023-06-30 14:40:29 +08:00
chenjuntao
2561767b9a Merge remote-tracking branch 'origin/release' into dev 
# Conflicts:
#	app/src/main/java/com/gh/download/DownloadManager.java
#	dependencies.gradle
#	module_common/src/main/java/com/gh/gamecenter/common/constant/Constants.java
 2023-06-30 14:34:01 +08:00
叶子维
8bda0e178e Merge branch 'fix/GHZS-2818' into 'dev' 
fix: 【光环助手】神策埋点问题(1) https://jira.shanqu.cc/browse/GHZS-2818

See merge request halo/android/assistant-android!1167
 2023-06-30 14:10:27 +08:00
chenjuntao
f634d60605 Merge remote-tracking branch 'origin/dev' into dev-5.29.0 2023-06-30 13:52:06 +08:00
陈君陶
1dcc7654e8 Merge branch 'fix/wrong_game_category' into 'dev' 
fix: 更正游戏类型在 downloadEntity 的记录

See merge request halo/android/assistant-android!1168
 2023-06-30 11:54:34 +08:00
chenjuntao
3579b9d808 fix: 更正游戏类型在 downloadEntity 的记录 2023-06-30 11:51:38 +08:00
叶子维
c74663c082 fix: 【光环助手】神策埋点问题(1) https://jira.shanqu.cc/browse/GHZS-2818 2023-06-30 11:35:36 +08:00
叶子维
848d352c60 fix: 【光环助手】神策埋点问题(1) https://jira.shanqu.cc/browse/GHZS-2818 2023-06-30 10:20:53 +08:00
chenjuntao
5176766b29 fix: 修复列表下载畅玩游戏时下载按钮闪烁并频繁切换状态的问题 2023-06-30 10:10:47 +08:00
陈君陶
0a90a7ddd9 Merge branch 'feature/GHZS-2748' into 'dev-5.29.0' 
feat: 游戏单活动：游戏单狂欢季—客户端-埋点 https://jira.shanqu.cc/browse/GHZS-2748

See merge request halo/android/assistant-android!1165
 2023-06-29 17:47:32 +08:00
chenjuntao
27ca5073d7 feat: 游戏单活动：游戏单狂欢季—客户端-埋点 https://jira.shanqu.cc/browse/GHZS-2748 2023-06-29 17:39:04 +08:00
chenjuntao
e3eb8178a3 fix: merge conflict 2023-06-29 14:52:21 +08:00
chenjuntao
10104812d6 Merge remote-tracking branch 'origin/dev' into dev-5.29.0 2023-06-29 14:29:23 +08:00
陈君陶
12cb9a4883 Merge branch 'fix/CWZS-86' into 'dev' 
fix: 修复推送更新测试问题 https://jira.shanqu.cc/browse/CWZS-86

See merge request halo/android/assistant-android!1164
 2023-06-29 14:08:18 +08:00
chenjuntao
a30cc8c273 fix: 修复推送更新测试问题 https://jira.shanqu.cc/browse/CWZS-86 2023-06-29 13:55:19 +08:00
叶子维
0f0620586b Merge branch 'fix/GHZS-2516' into 'dev' 
fix: 【光环助手】神策首次事件取值的相关排查 (修复用户首次启动退出后再次热启动时用户第一次打开的标记仍为true的问题)...

See merge request halo/android/assistant-android!1163
 2023-06-28 15:20:24 +08:00
叶子维
b9e86dd67a fix: 【光环助手】神策首次事件取值的相关排查 (修复用户首次启动退出后再次热启动时用户第一次打开的标记仍为true的问题) https://jira.shanqu.cc/browse/GHZS-2516 2023-06-28 14:47:07 +08:00
叶子维
9ce793d47e Merge branch 'fix/GHZS-2561' into 'dev' 
fix:【光环助手】动态设置-公告文章支持通用链接（修改接口字段的处理方式）https://jira.shanqu.cc/browse/GHZS-2561

See merge request halo/android/assistant-android!1162
 2023-06-28 11:31:37 +08:00
叶子维
43cb18d6e0 fix:【光环助手】动态设置-公告文章支持通用链接（修改接口字段的处理方式）https://jira.shanqu.cc/browse/GHZS-2561 2023-06-28 11:26:42 +08:00