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

101 Commits

Author SHA1 Message Date
陈君陶
210f2240a3 feat: 【光环助手】头条SDK更新及投放渠道重打包任务—客户端 https://jira.shanqu.cc/browse/GHZS-541 2023-01-04 14:42:20 +08:00
chenjuntao
f1e3a21191 Merge remote-tracking branch 'origin/release' into dev 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/search/SearchGameIndexItemViewHolder.kt
#	dependencies.gradle
 2022-12-05 17:02:14 +08:00
chenjuntao
15de55ceae fix: 修复模拟器安装时的闪退 2022-12-02 13:45:42 +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
叶子维
5b266c91da refactor: 组件化设置功能 https://git.shanqu.cc/halo/android/assistant-android/-/issues/87 2022-11-09 14:35:41 +08:00
郭涛
f47b0326f4 fix:修复模拟器下载流程问题 https://jira.shanqu.cc/browse/GHZS-122 2022-11-08 09:26:58 +08:00
郭涛
da8717693d feat: 模拟器下载流程调整 https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/2125 2022-10-27 14:40:06 +08:00
chenjuntao
6dca8cf33c !format: 全局格式化代码 2022-10-26 18:16:47 +08:00
chenjuntao
f33b699723 !refactor: 完全解耦光能模块，默认不添加到依赖中，移除旧版我的光环页面代码，清理无用资源 2022-10-21 16:58:20 +08:00
liuyirong
0195af422c fix: 【光环助手V5.13.0】前端优化汇总8月第3周(1、2) https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/2032 2022-08-19 17:31:29 +08:00
liuyirong
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
liuyirong
a0c1a14987 refactor: 组件化积分相关功能 https://git.shanqu.cc/halo/android/assistant-android/-/issues/73 2022-08-11 14:50:23 +08:00
chenjuntao
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
张玉久
d00f50bcf8 feat: 【光环助手V5.12.0】违规管理整合 https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/1946 2022-07-25 15:48:20 +08:00
juntao
cf12312d97 feat: 使用独立的数据库来存已安装的畅玩游戏 2022-07-06 17:45:58 +08:00
lyr
8e5ceb1e0e feat:【光环助手V5.10.0】畅玩助手数据埋点 https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/1872 2022-07-06 17:45:58 +08:00
juntao
2c3a395b50 fix: 修复畅玩空间和畅玩游戏的更新问题 
feat: 添加暴力的畅玩游戏备份/恢复逻辑
 2022-07-06 17:45:58 +08:00
juntao
ee21dbc643 fix: 修复部分代码问题 https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/1923#note_154823 2022-07-06 17:45:57 +08:00
juntao
56c1dbb6cb fix: 处理合并冲突 2022-07-06 17:45:57 +08:00
juntao
477ffa0c33 添加简单首页列表项 2022-07-06 17:45:57 +08:00
juntao
57668ec97d 合并未接入防沉迷的代码 2022-07-06 17:45:57 +08:00
juntao
90e802c03b 处理 SonarQube 问题 2022-06-02 15:08:11 +08:00
juntao
c7d5dbb59c Merge remote-tracking branch 'origin/release' into dev 
# Conflicts:
#	dependencies.gradle
 2022-05-27 16:08:57 +08:00
张玉久
ec9797e932 模块/组件化前期改造 https://git.shanqu.cc/halo/android/assistant-android/-/issues/64 2022-05-23 11:33:38 +08:00
juntao
6a5f7f8284 【合规相关】单机游戏内实名校验功能（3） https://git.shanqu.cc/pm/halo-app-issues/-/issues/1865 2022-05-21 15:57:23 +08:00
张玉久
116702f7f0 模块/组件化前期改造 https://git.shanqu.cc/halo/android/assistant-android/-/issues/64 2022-05-17 17:34:21 +08:00
juntao
c627bfb994 删除部分无用代码 2022-05-13 14:13:16 +08:00
jack
e9ac9aab7f 模块/组件化前期改造 https://git.shanqu.cc/halo/android/assistant-android/-/issues/64 2022-04-09 19:48:45 +08:00
lyr
68ae4bf1b2 【光环助手V5.8.0】游戏活动模板功能（前端部分）(提供上报曝光方法) https://git.shanqu.cc/pm/halo-app-issues/-/issues/1741 2022-03-31 20:57:15 +08:00
lyr
dae4543a82 【光环助手V5.8.0】游戏活动模板功能（前端部分）(0328测试 8) https://git.shanqu.cc/pm/halo-app-issues/-/issues/1741 2022-03-28 18:37:10 +08:00
lyr
3003a310a0 【光环助手V5.8.0】游戏活动模板功能（前端部分）(优化游戏活动页下载按钮的JS调用方法、提供判断是否完成任务的JS调用方法) https://git.shanqu.cc/pm/halo-app-issues/-/issues/1741 2022-03-21 18:48:15 +08:00
jack
3d31d9a435 修改第二次下载相同的游戏不能自动触发安装操作问题 2022-03-07 18:23:21 +08:00
juntao
fc1710f3b9 Merge remote-tracking branch 'origin/dev-5.6.0' into dev 
# Conflicts:
#	app/src/main/java/com/gh/common/util/DownloadObserver.kt
#	app/src/main/java/com/gh/common/util/EnvHelper.kt
#	app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java
#	app/src/main/java/com/gh/gamecenter/collection/GamesCollectionAdapter.kt
#	app/src/main/java/com/gh/gamecenter/collection/GamesCollectionFragment.kt
#	app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt
#	app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt
#	app/src/main/java/com/gh/gamecenter/game/rank/RankCollectionAdapter.kt
#	app/src/main/java/com/gh/gamecenter/manager/DataCollectionManager.java
#	app/src/main/java/com/gh/gamecenter/message/MessageItemViewHolder.java
#	app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java
#	app/src/main/java/com/halo/assistant/HaloApp.java
#	dependencies.gradle
 2022-01-13 16:59:12 +08:00
juntao
37309918dd 临时处理因为优化性能而引起的重复触发下载完成事件的问题 2021-12-27 18:25:11 +08:00
lyr
9feb4e774a 处理 SonarQube 问题: 
双重检查锁方式实现的单例，改为使用静态内部类方式
 2021-12-21 16:51:44 +08:00
chenjuntao
1478b59479 相关版本合并及处理要求 https://git.ghzs.com/pm/halo-app-issues/-/issues/1605 2021-11-01 16:14:04 +08:00
juntao
3e8923f34a 完成实名认证优化第三期 https://git.ghzs.com/pm/halo-app-issues/-/issues/1572 2021-11-01 15:00:35 +08:00
juntao
f46b303a67 Merge branch 'feature-issues1526' into dev 
# Conflicts:
#	app/src/main/java/com/gh/download/DownloadManager.java
#	app/src/main/java/com/halo/assistant/fragment/WebFragment.java
#	dependencies.gradle
 2021-10-26 16:28:25 +08:00
juntao
a1ecb784e2 完成实名认证第二期优化 https://git.ghzs.com/pm/halo-app-issues/-/issues/1526 2021-10-26 16:16:08 +08:00
leafwai
2888ab56cd 【光环助手V5.3.0】客户端内部需求（整理简单弹窗样式测试）https://git.ghzs.com/pm/halo-app-issues/-/issues/1527 2021-09-28 15:30:45 +08:00
juntao
c9402dec4e 整理下载管理类方法描述 2021-09-18 15:39:51 +08:00
leafwai
4aacc425a9 简单弹窗样式整理https://git.ghzs.com/halo/android/assistant-android/-/issues/39 2021-09-17 16:28:24 +08:00
juntao
f865e95ae1 Revert "临时简单处理光遇游戏包点击更新时会卡住的问题" 
This reverts commit 86edc8b9
 2021-08-25 18:23:30 +08:00
juntao
86edc8b919 临时简单处理光遇游戏包点击更新时会卡住的问题 2021-08-16 15:30:15 +08:00
juntao
d96e02eca0 完成光环前端优化汇总第二周(1~3) https://git.ghzs.com/pm/halo-app-issues/-/issues/1342 2021-07-13 17:52:36 +08:00
lyr
ebe7b84dc8 【光环助手V5.1.0】个性化推荐合规相关（2）https://git.ghzs.com/pm/halo-app-issues/-/issues/1308 2021-07-13 09:38:49 +08:00
lyr
bc76e6eddb 光环助手V4.9.0-同步正式环境后测试问题汇总(14、16) https://git.ghzs.com/pm/halo-app-issues/-/issues/1262#note_101438 2021-05-18 11:59:50 +08:00
juntao
5f2ce22506 完成游戏相关优化汇总(1) https://git.ghzs.com/pm/halo-app-issues/-/issues/1211 2021-04-14 16:41:53 +08:00
juntao
1c51b2fe41 Merge branch 'release' into dev 
# Conflicts:
#	dependencies.gradle
 2021-03-26 15:09:26 +08:00
张玉久
e30ec540bd Merge branch 'feature-issues1157' into dev-4.8.0 2021-03-08 10:02:51 +08:00