Commit Graph

255 Commits

Author SHA1 Message Date
011f8cc2b7 feat:优化设置模块 https://jira.shanqu.cc/browse/GHZS-796 2022-12-21 15:05:14 +08:00
e554b1681e fix:【V5.17.0】发现页相关功能优化(第一期)—1212测试-第2/6点 https://jira.shanqu.cc/browse/GHZS-650 2022-12-13 17:47:37 +08:00
772abccae5 【V5.17.0】发帖图片限制相关优化—1207测试 https://jira.shanqu.cc/browse/GHZS-606 2022-12-13 15:42:25 +08:00
64b4a6bef0 feat: 【V5.17.0】游戏详情-详情tab页面优化-专题游戏单推荐—客户端 https://jira.shanqu.cc/browse/GHZS-446 2022-12-09 15:37:18 +08:00
9a5e529eeb Merge branch 'dev-5.17.0' into 'feature-GHZS-420'
# Conflicts:
#   app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java
2022-12-09 03:16:53 +00:00
faac45e719 feat:【V5.17.0】发现页相关功能优化(第一期)—客户端 https://jira.shanqu.cc/browse/GHZS-420 2022-12-09 11:09:18 +08:00
6cf3786799 fix: 【V5.17.0】游戏详情-详情tab页面优化-游戏单推荐—1207UI测试 https://jira.shanqu.cc/browse/GHZS-603 2022-12-09 09:20:46 +08:00
b62ce00f7a fix:全局处理 Color.parseColor() 方法异常 https://git.shanqu.cc/halo/android/assistant-android/-/issues/99 2022-12-08 14:11:02 +08:00
51d42c96d3 feat: 【V5.17.0】游戏详情-详情tab页面优化-大家都在玩—客户端 https://jira.shanqu.cc/browse/GHZS-436 2022-12-07 11:29:18 +08:00
937109224c feat: 【V5.17.0】游戏详情-详情tab页面优化-游戏单推荐—客户端 https://jira.shanqu.cc/browse/GHZS-440 2022-12-02 15:30:14 +08:00
f6a67350b4 fix: 云存档第一期-测试问题-2022\11\30-第2点 https://jira.shanqu.cc/browse/GHZS-521 2022-11-30 16:35:45 +08:00
518eb222b9 fix:处理切换普通/深色模式时LazyListFragment页面变量未初始化导致的闪退问题 2022-11-25 14:26:43 +08:00
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
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
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
5cd9197d0f fix: 修复模拟器上部分副标题不显示的问题,为分类页面和开服表页面添加副标题支持 https://jira.shanqu.cc/browse/GHZS-319 2022-11-23 16:26:09 +08:00
28a97b0441 Merge branch 'feature-issues93' into 'dev-5.16.0'
feat: 移除冗余的 Splitties 依赖

See merge request halo/android/assistant-android!464
2022-11-23 16:03:25 +08:00
f87e0dfe3c feat:【V5.16.0】游戏评分相关优化—客户端(草稿功能由本地改为使用接口) https://jira.shanqu.cc/browse/GHZS-144 2022-11-23 11:44:21 +08:00
c838f1dc24 feat: 移除冗余的 Splitties 依赖 2022-11-23 11:26:22 +08:00
22cfe03a30 Merge remote-tracking branch 'origin/release' into dev
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/entity/PrivacyPolicyEntity.kt
#	dependencies.gradle
2022-11-23 10:36:10 +08:00
1fdb1bd24a Merge branch 'feature-GHZS-144' into 'dev-5.16.0'
feat:【V5.16.0】游戏评分相关优化—客户端 https://jira.shanqu.cc/browse/GHZS-144

See merge request halo/android/assistant-android!455
2022-11-22 10:11:08 +08:00
5881f70a9e feat:【V5.16.0】游戏评分相关优化—客户端 https://jira.shanqu.cc/browse/GHZS-144 2022-11-21 17:57:23 +08:00
d56a63236e Merge branch 'dev-5.16.0' into feature-GHZS-78 2022-11-21 17:33:08 +08:00
8564bc95e9 feat:【V5.16.0】光环下载进度条优化—客户端 https://jira.shanqu.cc/browse/GHZS-84 2022-11-21 15:28:01 +08:00
ba1a7d874f fix: 【V5.16.0】猜你喜欢-发现页优化—1118UI测试 https://jira.shanqu.cc/browse/GHZS-277 2022-11-21 11:52:17 +08:00
ec4d60b9f3 Merge remote-tracking branch 'origin/dev-5.16.0' into feature-GHZS-78 2022-11-18 16:36:06 +08:00
eac296a6fd fix:修复CloudArchiveFragment页面选择器监听报错问题 2022-11-18 16:32:01 +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
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
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
d306fb185c fix: 移除无用的 splitties 额外依赖(仅使用 DSL 相关对的依赖) 2022-11-17 15:25:44 +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
f689ef6228 feat:【V5.16.0】云存档第一期-游戏详情—客户端(剩余下载按钮处理)https://jira.shanqu.cc/browse/GHZS-80 2022-11-16 18:21:59 +08:00
102d285c09 Merge remote-tracking branch 'origin/legacy-release' into release-merge-legacy_release
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt
#	dependencies.gradle
2022-11-15 10:57:41 +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
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
115dc8ffab feat:【V5.16.0】游戏礼包优化(第三期)—客户端 https://jira.shanqu.cc/browse/GHZS-43 2022-11-10 18:03:51 +08:00
b602960882 feat:【光环助手】存储权限授权弹窗埋点补充 https://jira.shanqu.cc/browse/GHZS-163 2022-11-10 15:05:05 +08:00
6be3798b36 Merge branch 'feature-GHZS-116' into 'dev'
fix:【光环助手V5.15.0同步正式问题】登录闪退 https://jira.shanqu.cc/browse/GHZS-116

See merge request halo/android/assistant-android!424
2022-11-10 12:11:21 +08:00
424efdafcf fix:【光环助手V5.15.0同步正式问题】登录闪退 https://jira.shanqu.cc/browse/GHZS-116 2022-11-09 17:22:59 +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
5d1bc4aedd Merge remote-tracking branch 'origin/release' into dev
# Conflicts:
#	app/src/main/java/com/gh/common/constant/Config.java
#	app/src/main/java/com/gh/gamecenter/entity/NewSettingsEntity.kt
#	dependencies.gradle
#	module_common/src/main/java/com/gh/gamecenter/common/utils/Extensions.kt
2022-11-09 15:07:15 +08:00