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

9436 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
张玉久
ecbdbf57db Merge branch 'feature-GHZS-277' into 'dev-5.16.0' 
fix: 【V5.16.0】猜你喜欢-发现页优化—1118UI测试 https://jira.shanqu.cc/browse/GHZS-277

See merge request halo/android/assistant-android!450
 2022-11-21 11:55:01 +08:00
张玉久
ba1a7d874f fix: 【V5.16.0】猜你喜欢-发现页优化—1118UI测试 https://jira.shanqu.cc/browse/GHZS-277 2022-11-21 11:52:17 +08:00
刘贻荣
c70f1aa267 Merge branch 'feature-GHZS-138' into 'dev-5.16.0' 
fix:【V5.16.0】通用弹窗UI优化—客户端(修复引导弹窗组件适配版本号弹窗问题) https://jira.shanqu.cc/browse/GHZS-138

See merge request halo/android/assistant-android!448
 2022-11-21 11:39:38 +08:00
张玉久
1189619bdd Merge branch 'feature-GHZS-279' into 'dev-5.16.0' 
fix: 【V5.16.0】视频分享面板UI优化—1118UI测试 https://jira.shanqu.cc/browse/GHZS-279

See merge request halo/android/assistant-android!449
 2022-11-21 11:33:41 +08:00
张玉久
a7898ff9bd fix: 【V5.16.0】视频分享面板UI优化—1118UI测试 https://jira.shanqu.cc/browse/GHZS-279 2022-11-21 10:55:56 +08:00
liuyirong
9b90f5bcab fix:【V5.16.0】通用弹窗UI优化—客户端(修复引导弹窗组件适配版本号弹窗问题) https://jira.shanqu.cc/browse/GHZS-138 2022-11-21 10:40:34 +08:00
陈君陶
99c3f3e735 Merge branch 'feature-GHZS-119' into 'dev-5.16.0' 
【V5.16.0】畅玩流程优化—客户端 https://jira.shanqu.cc/browse/GHZS-178

See merge request halo/android/assistant-android!446
 2022-11-18 16:00:32 +08:00
陈君陶
67400bb4cc 【V5.16.0】畅玩流程优化—客户端 https://jira.shanqu.cc/browse/GHZS-178 2022-11-18 16:00:31 +08:00
刘贻荣
e9f1346035 Merge branch 'feature-GHZS-140' into 'dev-5.16.0' 
feat:【V5.16.0】退出登录弹窗UI优化—客户端 https://jira.shanqu.cc/browse/GHZS-140

See merge request halo/android/assistant-android!444
 2022-11-18 14:07:33 +08:00
张玉久
4c40996a95 Merge branch 'feature-GHZS-256' into 'dev-5.16.0' 
fix: 【光环助手V5.16.0】首页弹窗数据上报问题 https://jira.shanqu.cc/browse/GHZS-256

See merge request halo/android/assistant-android!445
 2022-11-18 13:49:59 +08:00
张玉久
bdf7c7fcc8 fix: 【光环助手V5.16.0】首页弹窗数据上报问题 https://jira.shanqu.cc/browse/GHZS-256 2022-11-18 13:47:27 +08:00
liuyirong
a51019ea8b feat:【V5.16.0】退出登录弹窗UI优化—客户端 https://jira.shanqu.cc/browse/GHZS-140 2022-11-18 13:38:18 +08:00
张玉久
319bb3ac2c Merge branch 'feature-GHZS-231' into 'dev-5.16.0' 
feat: 【V5.16.0】游戏开服类标签UI优化—客户端 https://jira.shanqu.cc/browse/GHZS-231

See merge request halo/android/assistant-android!443
 2022-11-18 12:00:38 +08:00
张玉久
c675cba035 feat: 【V5.16.0】游戏开服类标签UI优化—客户端 https://jira.shanqu.cc/browse/GHZS-231 2022-11-18 11:45:08 +08:00
刘贻荣
7f1a0351a9 Merge branch 'feature-GHZS-138' into 'dev-5.16.0' 
feat:【V5.16.0】通用弹窗UI优化—客户端 https://jira.shanqu.cc/browse/GHZS-138

See merge request halo/android/assistant-android!442
 2022-11-18 09:57:54 +08:00
liuyirong
e120f22b57 feat:【V5.16.0】通用弹窗UI优化—客户端 https://jira.shanqu.cc/browse/GHZS-138 2022-11-17 18:00:34 +08:00
陈君陶
6d64b26e3d Revert "Merge branch 'fix-remove_duplicated_splitties' into 'dev-5.16.0'" 
This reverts merge request !441
 2022-11-17 17:11:22 +08:00
陈君陶
7ced550195 Merge branch 'fix-remove_duplicated_splitties' into 'dev-5.16.0' 
fix: 移除无用的 splitties 额外依赖(仅使用 DSL 相关对的依赖)

See merge request halo/android/assistant-android!441
 2022-11-17 16:09:07 +08:00
张玉久
ca1b812c30 Merge branch 'feature-issues-90' into 'dev-5.16.0' 
refactor: 为 TextView 添加 setDrawable extensions，整理旧代码 https://git.shanqu.cc/halo/android/assistant-android/-/issues/90

See merge request halo/android/assistant-android!440
 2022-11-17 15:57:30 +08:00
chenjuntao
d306fb185c fix: 移除无用的 splitties 额外依赖(仅使用 DSL 相关对的依赖) 2022-11-17 15:25:44 +08:00
刘贻荣
4b10019888 Merge branch 'feature-GHZS-136' into 'dev-5.16.0' 
feat:【V5.16.0】游戏搜索-搜索榜单的曝光数据修改—客户端 https://jira.shanqu.cc/browse/GHZS-136

See merge request halo/android/assistant-android!439
 2022-11-17 12:01:15 +08:00
张玉久
640dce271c refactor: 为 TextView 添加 setDrawable extensions，整理旧代码 https://git.shanqu.cc/halo/android/assistant-android/-/issues/90 2022-11-17 11:55:16 +08:00
liuyirong
b7b4ce8c83 feat:【V5.16.0】游戏搜索-搜索榜单的曝光数据修改—客户端 https://jira.shanqu.cc/browse/GHZS-136 2022-11-17 11:44:53 +08:00
张玉久
c9911a1a22 Merge branch 'feature-GHZS-135' into 'dev-5.16.0' 
feat: 【V5.16.0】猜你喜欢-发现页优化—客户端 https://jira.shanqu.cc/browse/GHZS-135

See merge request halo/android/assistant-android!438
 2022-11-16 16:47:13 +08:00
张玉久
b8fb3327b5 feat: 【V5.16.0】猜你喜欢-发现页优化—客户端 https://jira.shanqu.cc/browse/GHZS-135 2022-11-16 15:02:06 +08:00
张玉久
d20866a045 Merge branch 'feature-GHZS-244' into 'dev-5.16.0' 
fix: 【V5.16.0】游戏搜索-搜索榜单的曝光数据不匹配问题 https://jira.shanqu.cc/browse/GHZS-244

See merge request halo/android/assistant-android!437
 2022-11-15 16:40:48 +08:00
张玉久
110de25099 fix: 【V5.16.0】游戏搜索-搜索榜单的曝光数据不匹配问题 https://jira.shanqu.cc/browse/GHZS-244 2022-11-15 16:37:32 +08:00
张玉久
8e863bb7cc Merge branch 'feature-GHZS-179' into 'dev-5.16.0' 
feat: 【V5.16.0】数据埋点补充—客户端 https://jira.shanqu.cc/browse/GHZS-179

See merge request halo/android/assistant-android!436
 2022-11-15 15:48:56 +08:00
张玉久
9cf044ee2e feat: 【V5.16.0】数据埋点补充—客户端 https://jira.shanqu.cc/browse/GHZS-179 2022-11-15 15:28:46 +08:00
张玉久
04886fb265 Merge branch 'feature-GHZS-142' into 'dev-5.16.0' 
feat: 【V5.16.0】视频分享面板UI优化—客户端 https://jira.shanqu.cc/browse/GHZS-142

See merge request halo/android/assistant-android!435
 2022-11-15 14:33:15 +08:00
张玉久
ca26ccbecb feat: 【V5.16.0】视频分享面板UI优化—客户端 https://jira.shanqu.cc/browse/GHZS-142 2022-11-15 14:06:05 +08:00
陈君陶
092092fd6f Merge branch 'hotfix-installed_framgent_duplicated_refresh' into 'dev-5.16.0' 
fix: 统一安装事件字符串，修复下载管理-已安装列表多余的刷新问题

See merge request halo/android/assistant-android!433
 2022-11-14 16:48:11 +08:00
chenjuntao
97a54f1000 fix: 统一安装事件字符串，修复下载管理-已安装列表错误的刷新机制 2022-11-14 16:36:11 +08:00
张玉久
d3295f81f6 Merge branch 'feature-GHZS-132' into 'dev-5.16.0' 
feat: 【V5.16.0】游戏详情-内容卡片优化—客户端 https://jira.shanqu.cc/browse/GHZS-132

See merge request halo/android/assistant-android!432
 2022-11-14 15:27:19 +08:00
张玉久
77a512852b feat: 【V5.16.0】游戏详情-内容卡片优化—客户端 https://jira.shanqu.cc/browse/GHZS-132 2022-11-14 14:46:54 +08:00
张玉久
de08c5dc98 Merge branch 'feature-GHZS-106' into 'dev-5.16.0' 
fix: 【光环助手V5.16.0】游戏搜索-历史搜索显示问题 https://jira.shanqu.cc/browse/GHZS-106

See merge request halo/android/assistant-android!430
 2022-11-11 14:36:27 +08:00
张玉久
c2abe5be34 fix: 【光环助手V5.16.0】游戏搜索-历史搜索显示问题 https://jira.shanqu.cc/browse/GHZS-106 2022-11-11 14:21:18 +08:00
刘贻荣
1222b4cde4 Merge branch 'feature-GHZS-43' into 'dev-5.16.0' 
feat:【V5.16.0】游戏礼包优化（第三期）—客户端 https://jira.shanqu.cc/browse/GHZS-43

See merge request halo/android/assistant-android!429
 2022-11-11 11:38:13 +08:00
liuyirong
a3cf98196d feat:【V5.16.0】游戏礼包优化（第三期）—客户端 https://jira.shanqu.cc/browse/GHZS-43 2022-11-11 11:32:31 +08:00
刘贻荣
4839ee4aca Merge branch 'feature-GHZS-43' into 'dev-5.16.0' 
feat:【V5.16.0】游戏礼包优化（第三期）—客户端 https://jira.shanqu.cc/browse/GHZS-43

See merge request halo/android/assistant-android!428
 2022-11-11 11:00:28 +08:00
liuyirong
115dc8ffab feat:【V5.16.0】游戏礼包优化（第三期）—客户端 https://jira.shanqu.cc/browse/GHZS-43 2022-11-10 18:03:51 +08:00
张玉久
e174c882e6 Merge branch 'feature-GHZS-128' into 'dev-5.16.0' 
feat: 【V5.16.0】多版本下载面板-求版本优化—客户端 https://jira.shanqu.cc/browse/GHZS-128

See merge request halo/android/assistant-android!427
 2022-11-10 16:17:21 +08:00
张玉久
546f7fc122 feat: 【V5.16.0】多版本下载面板-求版本优化—客户端 https://jira.shanqu.cc/browse/GHZS-128 2022-11-10 16:00:30 +08:00
张玉久
73a473b1c1 Merge branch 'feature-GHZS-16' into 'dev-5.16.0' 
feat: 【V5.16.0】启动广告图—客户端 https://jira.shanqu.cc/browse/GHZS-16

See merge request halo/android/assistant-android!420
 2022-11-10 10:25:45 +08:00
张玉久
258ada53af fix: 启动广告图跳转按钮箭头改为用代码设置 2022-11-10 10:21:52 +08:00
张玉久
128f0e0e82 feat: 【V5.16.0】启动广告图—客户端 https://jira.shanqu.cc/browse/GHZS-16 2022-11-09 18:00:08 +08:00
张玉久
08e90bf923 Merge branch 'dev-5.16.0' into feature-GHZS-16 
# Conflicts:
#	app/src/main/java/com/gh/common/constant/Config.java
 2022-11-09 16:53:05 +08:00
张玉久
60c967808d Merge branch 'dev' into 'dev-5.16.0' 
合并dev分支的改动

See merge request halo/android/assistant-android!423
 2022-11-09 16:43:45 +08:00
陈君陶
44b776a156 Merge branch 'fixes-from-release' into 'dev' 
合并 release 分支的改动

See merge request halo/android/assistant-android!422
 2022-11-09 16:26:24 +08:00
chenjuntao
b17fa55f94 fix: 处理合并冲突 2022-11-09 16:06:23 +08:00