Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,966 Commits 121 Branches 327 Tags
2bbe14897182885dec283d21f3a5ee6cd7bf0bdd
Commit Graph

82 Commits

Author SHA1 Message Date
chenjuntao
2bbe148971 fix: 处理合并冲突 2022-09-09 16:25:04 +08:00
chenjuntao
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
张玉久
a805e56a7c Merge branch 'release' into feature-issues1933 
# Conflicts:
#	app/src/main/java/com/gh/common/databind/BindingAdapters.java
#	app/src/main/java/com/gh/common/filter/RegionSetting.kt
#	app/src/main/java/com/gh/common/filter/RegionSettingHelper.kt
#	app/src/main/java/com/gh/common/util/DetailDownloadUtils.java
#	app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java
#	dependencies.gradle
 2022-09-07 19:11:20 +08:00
liuyirong
ce840cf33e feat:【光环助手】国际服游戏合规调整方案(需求变动) https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/2047#note_169012 2022-09-07 17:41:00 +08:00
张玉久
37a2c5171d fix: 【光环助手V_5.11.0】国际服游戏下载弹窗优化(20220907需求补充) https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/1933 2022-09-07 17:30:06 +08:00
liuyirong
ac72abe105 feat:【光环助手】国际服游戏合规调整方案 https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/2047 2022-09-06 17:29:32 +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
叶子维
ab01fac150 feat: 重构下载按钮的实现 https://git.shanqu.cc/halo/android/assistant-android/-/issues/75 2022-08-11 11:17:50 +08:00
张玉久
a4c7aa6338 fix: 修复资讯详情闪退问题 2022-08-09 16:42:34 +08:00
张玉久
e84973f0e6 fix: 【光环助手V5.13.0】前端优化汇总8月第1周(2,3) https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/2014 2022-08-08 12:05:33 +08:00
chenjuntao
9c11f7f70e fix: 处理部分 SonarQube 问题 2022-08-02 16:22:45 +08:00
chenjuntao
3e74b39b45 fix: 修复畅玩游戏安装完成后会取消相同包名游戏下载任务的问题(20220729需求补充：测试反馈) https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/1955 2022-08-02 11:13:11 +08:00
chenjuntao
13ab6f7b38 fix: 修复畅玩游戏下载进度状态同步问题(20220729需求补充：测试反馈) https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/1955 2022-08-01 17:45:29 +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
chenjuntao
c58db04155 fix: 修复在那无下载的游戏打开详情页闪退的问题 2022-07-28 17:42:04 +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
juntao
3bd4427348 fix!: 修复畅玩游戏的更新问题 （修改了通用的下载功能，可能会有其它次生 bug） 2022-07-06 17:45:58 +08:00
juntao
2c3a395b50 fix: 修复畅玩空间和畅玩游戏的更新问题 
feat: 添加暴力的畅玩游戏备份/恢复逻辑
 2022-07-06 17:45:58 +08:00
juntao
a488608969 fix: 调整游戏详情页按钮文案 2022-07-06 17:45:57 +08:00
juntao
4e53b1fb91 fix: 修复更新判断异常和首页最近在玩的排序问题 2022-07-06 17:45:57 +08:00
juntao
36704af531 feat: UI 细节完善 2022-07-06 17:45:57 +08:00
juntao
88842de6c7 完成粗暴的安装启动流程 2022-07-06 17:45:57 +08:00
juntao
417633b623 调整部分点击逻辑 2022-07-06 17:45:56 +08:00
juntao
9d00e53b73 添加畅玩管理页 2022-07-06 17:45:56 +08:00
juntao
898f72a218 简单对接空间助手接口 2022-07-06 17:45:56 +08:00
chenjuntao
49091b7a72 添加简单的交互工具类 2022-07-06 17:45:09 +08:00
juntao
c7d5dbb59c Merge remote-tracking branch 'origin/release' into dev 
# Conflicts:
#	dependencies.gradle
 2022-05-27 16:08:57 +08:00
juntao
6a5f7f8284 【合规相关】单机游戏内实名校验功能（3） https://git.shanqu.cc/pm/halo-app-issues/-/issues/1865 2022-05-21 15:57:23 +08:00
jack
e9ac9aab7f 模块/组件化前期改造 https://git.shanqu.cc/halo/android/assistant-android/-/issues/64 2022-04-09 19:48:45 +08:00
lyr
9feb4e774a 处理 SonarQube 问题: 
双重检查锁方式实现的单例，改为使用静态内部类方式
 2021-12-21 16:51:44 +08:00
juntao
1d254248d9 Merge remote-tracking branch 'origin/release' into dev 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/personal/PersonalFunctionAdapter.kt
#	dependencies.gradle
 2021-11-09 17:52:15 +08:00
juntao
3e8923f34a 完成实名认证优化第三期 https://git.ghzs.com/pm/halo-app-issues/-/issues/1572 2021-11-01 15:00:35 +08:00
juntao
86330c74b5 Merge remote-tracking branch 'origin/dev' into dev-5.4.0 2021-10-27 11:00:54 +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
3aafc3fcbe 【光环助手V5.4.0】儿童/青少年模式https://git.ghzs.com/pm/halo-app-issues/-/issues/1571 2021-10-21 11:57:22 +08:00
lyr
16091f759c 【光环助手V5.4.0】儿童/青少年模式（客户端展示，未对接设置页面）https://git.ghzs.com/pm/halo-app-issues/-/issues/1571 2021-10-20 17:55:41 +08:00
leafwai
63b7f294c4 【光环助手V5.2.0】浏览器安装功能优化(1-3)https://git.ghzs.com/pm/halo-app-issues/-/issues/1323 2021-08-18 10:10:48 +08:00
张玉久
379650a0f5 Merge branch 'emulator' into dev_4.4.0 
# Conflicts:
#	app/src/main/java/com/gh/common/util/EntranceUtils.java
#	app/src/main/java/com/gh/common/util/LogUtils.java
#	app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java
#	app/src/main/java/com/halo/assistant/HaloApp.java
#	app/src/main/res/values/colors.xml
 2020-10-22 16:12:24 +08:00
张玉久
3796eb46bd 启动模拟器游戏 2020-10-22 15:46:49 +08:00
juntao
103ecc10d3 完成游戏下载状态新增"更新中" https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/1021 2020-10-19 18:30:05 +08:00
张玉久
b1079e84d8 大致完成模拟器游戏下载、模拟器下载与安装 2020-10-16 17:15:51 +08:00
kehaoyuan
e63a374da1 重新整理Xapk解压部分以及增加取消操作 2020-07-09 09:28:57 +08:00
kehaoyuan
d57ac57f43 尝试将Xapk安装部分接入到原有的下载体系 2020-07-03 17:09:50 +08:00
kehaoyuan@ghzhushou.com
32a7f37b6a 20200508补充规则(1,2,3)https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/838 2020-05-09 11:48:45 +08:00
kehaoyuan@ghzhushou.com
2038b16dce 修改下载按钮样式 2020-04-20 18:38:12 +08:00
kehaoyuan
4f77781e24 下载按钮状态优化(三) https://gitlab.ghzs.com/pm/halo-app-issues/issues/838 2020-04-17 18:50:28 +08:00
kehaoyuan
3e94cd9d8c 下载按钮状态优化(一,二) https://gitlab.ghzs.com/pm/halo-app-issues/issues/838 2020-04-17 16:38:06 +08:00