|
|
9a55cc297a
|
Merge remote-tracking branch 'origin/dev' into dev-5.14.0
|
2022-09-09 16:25:32 +08:00 |
|
|
|
986d41d0c3
|
Merge remote-tracking branch 'origin/release' into dev
# Conflicts:
# app/src/main/java/com/gh/common/FixedRateJobHelper.kt
# app/src/main/java/com/gh/common/databind/BindingAdapters.java
# app/src/main/java/com/gh/common/util/DetailDownloadUtils.java
# app/src/main/java/com/gh/common/util/DialogUtils.java
# app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java
# app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListViewModel.kt
# dependencies.gradle
|
2022-09-09 16:02:17 +08:00 |
|
|
|
8384464066
|
perf: 微调横向专题的代码
|
2022-09-09 15:51:59 +08:00 |
|
|
|
22e92cdaf6
|
Merge branch 'feature-issues2047' into 'release'
feat:【光环助手】国际服游戏合规调整方案 https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/2047
See merge request halo/android/assistant-android!322
|
2022-09-06 17:32:04 +08:00 |
|
|
|
ac72abe105
|
feat:【光环助手】国际服游戏合规调整方案 https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/2047
|
2022-09-06 17:29:32 +08:00 |
|
|
|
dc4e345ea8
|
fix: 多线程上报日志导致的闪退
|
2022-09-02 11:12:58 +08:00 |
|
|
|
ebe560bc2b
|
Merge remote-tracking branch 'origin/dev' into dev-5.13.0
# Conflicts:
# app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt
# app/src/main/res/layout/home_game_item.xml
|
2022-08-30 14:16:21 +08:00 |
|
|
|
af3797afc7
|
feature:【光环助手V5.13.0】游戏搜索功能优化（第9期）(前端部分) https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/2011
|
2022-08-30 14:02:46 +08:00 |
|
|
|
848d3f27bd
|
feat: 邮件包添加最近代码变更弹窗 https://git.shanqu.cc/halo/android/assistant-android/-/issues/79
|
2022-08-25 11:08:26 +08:00 |
|
|
|
bb29702db8
|
fix:【光环助手V5.13.0】前端优化汇总8月第2周(3) https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/2026
|
2022-08-24 10:02:20 +08:00 |
|
|
|
9c066431b4
|
Merge remote-tracking branch 'origin/dev' into dev-5.13.0
# Conflicts:
# app/src/main/java/com/gh/common/util/DetailDownloadUtils.java
# app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityFragment.kt
# app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt
# app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareFragment.kt
|
2022-08-17 15:57:56 +08:00 |
|
|
|
b4d44d6e0a
|
fix: 处理合并冲突
|
2022-08-17 10:42:39 +08:00 |
|
|
|
bba8261d97
|
Merge remote-tracking branch 'origin/dev-5.13.0' into dev-5.13.0
# Conflicts:
# app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailAdapter.kt
# app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailAdapter.kt
|
2022-08-17 10:24:17 +08:00 |
|
|
|
134df71aba
|
Merge branch 'feature-module_login' into dev-5.13.0
# Conflicts:
# app/src/main/java/com/gh/common/constant/Config.java
# app/src/main/java/com/gh/common/simulator/SimulatorGameManager.kt
# app/src/main/java/com/gh/common/util/DirectUtils.kt
# app/src/main/java/com/gh/common/util/DownloadObserver.kt
# app/src/main/java/com/gh/common/util/GameActivityDownloadHelper.kt
# app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java
# app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt
# app/src/main/java/com/gh/gamecenter/category/NewCategoryListFragment.kt
# app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListFragment.kt
# app/src/main/java/com/gh/gamecenter/entity/GameEntity.kt
# app/src/main/java/com/gh/gamecenter/fragment/MainWrapperViewModel.kt
# app/src/main/java/com/gh/gamecenter/game/GameFragment.kt
# app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionPosterFragment.kt
# app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditActivity.kt
# app/src/main/java/com/gh/gamecenter/gamecollection/publish/GameCollectionEditViewModel.kt
# app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt
# app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyViewModel.kt
# app/src/main/java/com/gh/gamecenter/home/HomeFragmentAdapter.kt
# app/src/main/java/com/gh/gamecenter/home/HomeViewModel.kt
# app/src/main/java/com/gh/gamecenter/mygame/PlayedGameAdapter.kt
# app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.kt
# app/src/main/java/com/gh/gamecenter/personalhome/background/BackgroundPreviewFragment.kt
# app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListFragment.kt
# app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.kt
# app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt
# app/src/main/java/com/halo/assistant/HaloApp.java
# module_login/src/main/java/com/gh/gamecenter/login/user/UserManager.java
# module_login/src/main/java/com/gh/gamecenter/login/utils/LoginHelper.kt
|
2022-08-17 10:22:47 +08:00 |
|
|
|
9c2c4562aa
|
refactor: 组件化积分相关功能(可单独运行积分模块) https://git.shanqu.cc/halo/android/assistant-android/-/issues/73
|
2022-08-15 15:49:42 +08:00 |
|
|
|
d39755efe6
|
Merge remote-tracking branch 'origin/release' into dev
# Conflicts:
# dependencies.gradle
|
2022-08-15 10:45:01 +08:00 |
|
|
|
7936cb2b9f
|
feat: 预检查 Webview 是否安装/安装错误ABI
|
2022-08-13 16:45:19 +08:00 |
|
|
|
a0c1a14987
|
refactor: 组件化积分相关功能 https://git.shanqu.cc/halo/android/assistant-android/-/issues/73
|
2022-08-11 14:50:23 +08:00 |
|
|
|
ab01fac150
|
feat: 重构下载按钮的实现 https://git.shanqu.cc/halo/android/assistant-android/-/issues/75
|
2022-08-11 11:17:50 +08:00 |
|
|
|
18314347de
|
fix: 修复部分图片可能因为 jpegConfig 为空而导致加载失败的问题
|
2022-08-10 11:03:50 +08:00 |
|
|
|
e3f6d64fa9
|
refactor: 组件化登录功能 https://git.shanqu.cc/halo/android/assistant-android/-/issues/73
|
2022-08-04 11:28:24 +08:00 |
|
|
|
6f5f72194a
|
feat: 移除 log 线程，取消本地 log 数据库（由 loghub sdk 实现）
|
2022-08-03 16:15:16 +08:00 |
|
|
|
d1159c30d1
|
Merge remote-tracking branch 'origin/release' into dev
# Conflicts:
# dependencies.gradle
|
2022-08-02 14:59:01 +08:00 |
|
|
|
f8c61b5d53
|
feat: 添加全局畅玩游戏功能开关
|
2022-08-02 13:45:37 +08:00 |
|
|
|
c34e5f0a3d
|
Merge remote-tracking branch 'origin/dev' into feature-issues1801-v5.12.0
# Conflicts:
# app/src/main/java/com/gh/common/util/NewFlatLogUtils.kt
# app/src/main/java/com/gh/gamecenter/gamedetail/entity/NewGameDetailEntity.kt
# app/src/main/java/com/gh/gamecenter/home/HomeFragmentAdapter.kt
# app/src/main/java/com/gh/gamecenter/home/HomeViewModel.kt
# app/src/main/res/layout/fragment_forum_home.xml
# libraries/LGLibrary
|
2022-08-01 14:50:48 +08:00 |
|
|
|
596cc4ca15
|
feat: 移除无安装权限启动弹窗 https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/1994
|
2022-07-29 15:34:09 +08:00 |
|
|
|
a14ea13dd7
|
fix: 移除无用文件
|
2022-07-29 11:27:19 +08:00 |
|
|
|
0cfce764ff
|
Merge remote-tracking branch 'origin/release' into dev
# Conflicts:
# dependencies.gradle
# libraries/LGLibrary
|
2022-07-29 11:19:32 +08:00 |
|
|
|
c47ab8fc41
|
Merge remote-tracking branch 'origin/release' into feature-issues1801
|
2022-07-28 17:37:04 +08:00 |
|
|
|
6c88782635
|
feat: 完成获取应用列表权限相关处理 https://git.shanqu.cc/pm/halo-app-issues/-/issues/1292
|
2022-07-28 16:55:44 +08:00 |
|
|
|
5609a95382
|
feat:【光环助手V5.12.0】游戏详情新增“内容卡片”功能 https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/1953
|
2022-07-26 14:05:31 +08:00 |
|
|
|
965b6b3f66
|
fix: 修复5.0以下系统设置矢量图闪退的问题
|
2022-07-22 16:51:24 +08:00 |
|
|
|
495070a14e
|
feat: 添加畅玩助手隐私政策跳转地址
|
2022-07-22 15:14:55 +08:00 |
|
|
|
e8b00cc87f
|
Merge remote-tracking branch 'origin/release' into feature-issues1801
# Conflicts:
# app/src/main/java/com/gh/common/util/NewFlatLogUtils.kt
# libraries/LGLibrary
|
2022-07-22 14:19:53 +08:00 |
|
|
|
dd29cd586f
|
Merge remote-tracking branch 'origin/legacy-release' into release
# Conflicts:
# app/src/main/java/com/gh/gamecenter/SearchActivity.kt
# app/src/main/java/com/gh/gamecenter/SuggestionActivity.java
# dependencies.gradle
|
2022-07-18 16:12:02 +08:00 |
|
|
|
5f337e3905
|
chore: 更新Loghub SDK至2.6.4
|
2022-07-18 13:56:34 +08:00 |
|
|
|
e6191e8c37
|
feat: 【光环助手V5.12.0】版块内容列表优化(1) https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/1948
|
2022-07-15 18:09:56 +08:00 |
|
|
|
1042ed675f
|
fix: 修复反馈的闪退记录有机率不能上报到后台的问题
|
2022-07-15 14:31:37 +08:00 |
|
|
|
1a734c32a4
|
feat:【光环助手V5.12.0】游戏专题功能优化(前端部分(大致完成)) https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/1950
|
2022-07-13 16:35:36 +08:00 |
|
|
|
aa0f27c61b
|
ci: suppress SonarQube 问题
|
2022-07-12 10:59:40 +08:00 |
|
|
|
c1fd2e48db
|
feat:【光环助手V5.12.0】社区相关优化-第八期(1、2、3) https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/1943
|
2022-07-11 14:24:50 +08:00 |
|
|
|
3ed5795205
|
fix:【夜间模式】UI测试调整问题汇总（7月第1周）（0706补充）https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/1957
|
2022-07-11 10:16:23 +08:00 |
|
|
|
3deb83ac8d
|
fix:【夜间模式】UI测试调整问题汇总（7月第1周）https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/1957
|
2022-07-08 11:57:38 +08:00 |
|
|
|
28266cd06d
|
fix:修复升级Loghub数据库时未添加默认值的错误
(cherry picked from commit 919db31ec3)
|
2022-07-08 09:29:39 +08:00 |
|
|
|
35506c75f5
|
fix:修复升级Loghub数据库时未添加默认值的错误
(cherry picked from commit 919db31ec3)
|
2022-07-08 09:28:48 +08:00 |
|
|
|
919db31ec3
|
fix:修复升级Loghub数据库时未添加默认值的错误
|
2022-07-08 09:28:07 +08:00 |
|
|
|
6f01610d10
|
feat:升级Loghub数据库
(cherry picked from commit 78d5d4b39f)
|
2022-07-07 14:16:00 +08:00 |
|
|
|
2747857db3
|
feat:升级Loghub数据库
(cherry picked from commit 78d5d4b39f)
|
2022-07-07 14:14:11 +08:00 |
|
|
|
78d5d4b39f
|
feat:升级Loghub数据库
|
2022-07-07 14:09:20 +08:00 |
|
|
|
ad4ca04db3
|
feat:增加平铺埋点功能
(cherry picked from commit 040de6d458)
|
2022-07-07 10:30:12 +08:00 |
|
