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

9749 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
叶子维
a22e26aec3 Merge branch 'feature-GHZS-478' into 'dev' 
fix:【光环助手V5.16.0】光环下载进度条优化-1128测试 https://jira.shanqu.cc/browse/GHZS-478

See merge request halo/android/assistant-android!488
 2022-11-30 10:31:42 +08:00
叶子维
fa33fe3d71 fix:【光环助手V5.16.0】光环下载进度条优化-1128测试 https://jira.shanqu.cc/browse/GHZS-478 
fix:【光环助手V5.16.0】光环下载进度条优化-测试问题-2022\\11\\29 https://jira.shanqu.cc/browse/GHZS-484
fix:【光环助手V5.16.0】光环下载进度条优化-1129测试 https://jira.shanqu.cc/browse/GHZS-486
 2022-11-30 10:31:42 +08:00
郭涛
f9e16d1f32 Merge branch 'feature_GHZS_93' into 'dev' 
fix:更换游戏存档-推荐游戏接口

See merge request halo/android/assistant-android!489
 2022-11-30 09:55:18 +08:00
郭涛
8584e12a7e fix:更换游戏存档-推荐游戏接口 2022-11-30 09:55:18 +08:00
郭涛
5ffd28de1b Merge branch 'feature_GHZS_93' into 'dev' 
fix:添加筛选云存档的游戏接口

See merge request halo/android/assistant-android!487
 2022-11-29 16:22:17 +08:00
郭涛
fff91052ff fix:添加筛选云存档的游戏接口 2022-11-29 16:22:17 +08:00
刘贻荣
0e0812c00e Merge branch 'feature-GHZS-310' into 'dev' 
feat:【光环助手V5.16.0】云存档第一期—数据埋点—客户端-1-10 https://jira.shanqu.cc/browse/GHZS-310

See merge request halo/android/assistant-android!485
 2022-11-29 10:44:06 +08:00
liuyirong
efe0efa0f8 feat:【光环助手V5.16.0】云存档第一期—数据埋点—客户端-1-10 https://jira.shanqu.cc/browse/GHZS-310 2022-11-28 18:22:52 +08:00
chenjuntao
bdb7336d16 Merge remote-tracking branch 'origin/release' into dev 2022-11-28 17:03:28 +08:00
chenjuntao
2ee01a0819 Merge remote-tracking branch 'origin/legacy-release' into release 
# Conflicts:
#	app/src/main/java/com/gh/common/history/HistoryDatabase.kt
#	app/src/main/java/com/gh/gamecenter/entity/AmwayCommentEntity.kt
#	app/src/main/java/com/gh/gamecenter/entity/HistoryGameEntity.kt
#	dependencies.gradle
 2022-11-28 16:53:02 +08:00
刘贻荣
d322c0c500 Merge branch 'hotfix-dev-game_detail_bbs_tab_click' into 'dev' 
fix: 游戏详情页-跳转论坛Tab增加是否存在云存档Tab的判断

See merge request halo/android/assistant-android!484
 2022-11-28 16:46:03 +08:00
liuyirong
be43470066 fix: 游戏详情页-跳转论坛Tab增加是否存在云存档Tab的判断 2022-11-28 16:41:15 +08:00
陈君陶
ade40c49ef Merge branch 'merge-from_dev_to_feature-GHZS-78' into 'dev' 
合并云存档代码至 dev

See merge request halo/android/assistant-android!483
 2022-11-28 16:24:27 +08:00
chenjuntao
31d23a3a02 Merge remote-tracking branch 'origin/dev' into feature-GHZS-78 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt
 2022-11-28 15:34:57 +08:00
张玉久
22e56e838a Merge branch 'feature-GHZS-380' into 'dev' 
fix: 【V5.16.0】启动广告图-1125测试结果反馈-第1/4点 https://jira.shanqu.cc/browse/GHZS-380

See merge request halo/android/assistant-android!480
 2022-11-28 14:27:29 +08:00
chenjuntao
2242de5f83 chore: 版本更新至 5.14.7-637 v5.14.7-637 2022-11-28 14:26:48 +08:00
陈君陶
b684fff4f1 Merge branch 'hotfix-v5.14.6-636-subtitle' into 'legacy-release' 
fix: 补充遗漏的副标题(游戏动态页) https://jira.shanqu.cc/browse/GHZS-344

See merge request halo/android/assistant-android!479
 2022-11-28 14:22:37 +08:00
张玉久
001a472b8e fix: 【V5.16.0】启动广告图-1125测试结果反馈-第1/4点 https://jira.shanqu.cc/browse/GHZS-380 2022-11-28 14:17:18 +08:00
chenjuntao
0b0f575c41 fix: 补充遗漏的副标题(游戏动态页) https://jira.shanqu.cc/browse/GHZS-344 2022-11-28 14:05:15 +08:00
guotao
da25541147 fix:添加我的光环-游戏存档入口 2022-11-28 11:57:18 +08:00
叶子维
e57ba6ed71 feat:【光环助手V5.16.0】云存档第一期—数据埋点—客户端-11-20 (12、19) https://jira.shanqu.cc/browse/GHZS-314 2022-11-28 11:37:44 +08:00
陈君陶
fad7083a2c Merge branch 'feature-GHZS-344' into 'legacy-release' 
feat: 【光环助手】副标题遗漏场景补充 https://jira.shanqu.cc/browse/GHZS-344

See merge request halo/android/assistant-android!477
 2022-11-28 11:25:05 +08:00
郭涛
9254c9ef7d Merge branch 'feature_GHZS_93' into 'feature-GHZS-78' 
feat:添加我的光环-游戏存档https://jira.shanqu.cc/browse/GHZS-93

See merge request halo/android/assistant-android!478
 2022-11-28 10:41:47 +08:00
郭涛
d3042b9199 feat:添加我的光环-游戏存档https://jira.shanqu.cc/browse/GHZS-93 2022-11-28 10:41:47 +08:00
叶子维
0893a34dff feat:【光环助手V5.16.0】云存档第一期—数据埋点—客户端-11-20 (除12、19) https://jira.shanqu.cc/browse/GHZS-314 2022-11-25 16:49:27 +08:00
chenjuntao
da22540af3 feat: 【光环助手】副标题遗漏场景补充 https://jira.shanqu.cc/browse/GHZS-344 2022-11-25 16:23:06 +08:00
叶子维
fffc27e779 fix:【V5.16.0】云存档第一期-云存档管理—客户端(修改编辑存档接口,处理一些细节问题) https://jira.shanqu.cc/browse/GHZS-92 2022-11-25 15:00:58 +08:00
刘贻荣
2f246da269 Merge branch 'feature-GHZS-348' into 'dev' 
fix:【V5.16.0】游戏搜索-热门榜单功能优化-1124UI测试 https://jira.shanqu.cc/browse/GHZS-348

See merge request halo/android/assistant-android!476
 2022-11-25 14:40:04 +08:00
liuyirong
c6137fc3c9 fix:【V5.16.0】游戏搜索-热门榜单功能优化-1124UI测试 https://jira.shanqu.cc/browse/GHZS-348 2022-11-25 14:36:23 +08:00
liuyirong
518eb222b9 fix：处理切换普通/深色模式时LazyListFragment页面变量未初始化导致的闪退问题 2022-11-25 14:26:43 +08:00
张玉久
8bf7c61690 Merge branch 'fix-gamedetail_tab_error' into 'dev' 
fix: 修改游戏详情tab跳转错误问题

See merge request halo/android/assistant-android!475
 2022-11-25 14:11:05 +08:00
张玉久
a28169eeae fix: 修改游戏详情tab跳转错误问题 2022-11-25 14:07:04 +08:00
liuyirong
fb1968b402 fix：处理合并遗漏 2022-11-25 13:56:54 +08:00
liuyirong
f479c789e9 Merge remote-tracking branch 'origin/dev' into feature-GHZS-78 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt
#	app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java
 2022-11-25 13:40:34 +08:00
叶子维
67fb1948b4 feat:【V5.16.0】云存档第一期-云存档管理—客户端 https://jira.shanqu.cc/browse/GHZS-92 2022-11-24 17:51:14 +08:00
刘贻荣
cd39a497e9 Merge branch 'feature-GHZS-336' into 'dev' 
fix:【光环助手V5.16.0】游戏评分相关优化-1124UI测试 https://jira.shanqu.cc/browse/GHZS-336

See merge request halo/android/assistant-android!473
 2022-11-24 17:49:13 +08:00
liuyirong
2398795438 fix:【光环助手V5.16.0】游戏评分相关优化-1124UI测试 https://jira.shanqu.cc/browse/GHZS-336 2022-11-24 17:45:50 +08:00
刘贻荣
2d41122c1c Merge branch 'feature-GHZS-334' into 'dev' 
fix:【光环助手V5.16.0】游戏评分相关优化-1124测试-第1点 https://jira.shanqu.cc/browse/GHZS-334

See merge request halo/android/assistant-android!472
 2022-11-24 17:22:13 +08:00
liuyirong
ec576900e8 fix:【光环助手V5.16.0】游戏评分相关优化-1124测试-第1点 https://jira.shanqu.cc/browse/GHZS-334 2022-11-24 17:15:49 +08:00
liuyirong
47549d788b fix:【光环助手V5.16.0】游戏评分相关优化-1124测试-第1点 https://jira.shanqu.cc/browse/GHZS-334 2022-11-24 16:51:48 +08:00
liuyirong
34f1dd057c feat:【V5.16.0】云存档第一期-游戏详情—客户端（创建下载按钮辅助类）https://jira.shanqu.cc/browse/GHZS-80 2022-11-24 15:41:31 +08:00
刘贻荣
20e8fa451c Merge branch 'feature-GHZS-282' into 'dev' 
fix：【V5.16.0】游戏搜索-热门榜单功能优化-1118UI测试(修复动图设置圆角无效问题) https://jira.shanqu.cc/browse/GHZS-282

See merge request halo/android/assistant-android!471
 2022-11-24 15:07:11 +08:00
刘贻荣
f92fb6a1c7 fix：【V5.16.0】游戏搜索-热门榜单功能优化-1118UI测试(修复动图设置圆角无效问题) https://jira.shanqu.cc/browse/GHZS-282 2022-11-24 15:07:10 +08:00
叶子维
0e71b917c5 Merge branch 'feature-GHZS-340' into 'dev' 
fix:【光环助手V5.16.0】光环下载进度条优化-1124UI测试 https://jira.shanqu.cc/browse/GHZS-340

See merge request halo/android/assistant-android!470
 2022-11-24 15:00:52 +08:00
叶子维
d48947b256 fix:【光环助手V5.16.0】光环下载进度条优化-1124UI测试 https://jira.shanqu.cc/browse/GHZS-340 2022-11-24 14:46:47 +08:00
陈君陶
7f5605a1a7 Merge branch 'merge-dev_to_dev-5.16.0' into 'dev-5.16.0' 
Merge dev to dev 5.16.0

See merge request halo/android/assistant-android!469
 2022-11-24 13:43:42 +08:00
chenjuntao
f0ed0ae612 fix: 处理合并冲突 2022-11-24 11:15:58 +08:00
chenjuntao
2c7997aa57 Merge remote-tracking branch 'origin/dev' into dev-5.16.0 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/game/GameItemViewHolder.kt
#	app/src/main/java/com/gh/gamecenter/game/vertical/GameVerticalAdapter.kt
#	app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListAdapter.kt
#	app/src/main/java/com/gh/vspace/VDownloadManagerAdapter.kt
#	module_common/src/main/java/com/gh/gamecenter/common/view/DrawableView.kt
 2022-11-24 11:06:06 +08:00
陈君陶
0bc638a2f9 Merge branch 'merge-release_to_dev' into 'dev' 
Merge release to dev

See merge request halo/android/assistant-android!468
 2022-11-24 10:50:10 +08:00
chenjuntao
1ae64c35b9 Merge remote-tracking branch 'origin/release' into dev 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/game/GameItemViewHolder.kt
#	dependencies.gradle
 2022-11-24 10:38:48 +08:00