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

423 Commits

Author SHA1 Message Date
chenjuntao
deb2b07644 Merge remote-tracking branch 'origin/dev' into dev-5.26.0 2023-05-22 11:27:59 +08:00
叶子维
74364cd452 合并开屏广告SDK相关代码 2023-05-18 11:48:52 +08:00
chenjuntao
5477a4a4cc fix: 处理编译问题 2023-05-11 10:36:01 +08:00
陈君陶
0e988b2b49 Merge branch 'dev' into 'dev-5.26.0' 
合并 5.24 & 5.25 变更

See merge request halo/android/assistant-android!1010
 2023-05-08 10:40:28 +08:00
chenjuntao
0a8211d40b Merge remote-tracking branch 'origin/release' into dev 
# Conflicts:
#	app/build.gradle
#	dependencies.gradle
 2023-05-08 09:50:13 +08:00
chenjuntao
f6b1813e88 feat: 推广打包增加配置信息及快速打包功能 https://jira.shanqu.cc/browse/GHZS-2082 2023-05-06 16:19:57 +08:00
chenjuntao
c293a4485e feat: 临时屏蔽 VPN 相关功能 2023-05-05 11:32:25 +08:00
chenjuntao
228a786f6c feat: 光环助手支持神策测试环境与正式环境切换 https://jira.shanqu.cc/browse/GHZS-2041 2023-04-28 10:32:36 +08:00
chenjuntao
dc39f9f207 feat: 首页tab栏新增上传图片 https://jira.shanqu.cc/browse/GHZS-2141 2023-04-26 10:10:52 +08:00
chenjuntao
f631810acc refactor: 将特殊打包模块和 VPN 模块移动到 feature 目录下 2023-04-19 10:38:58 +08:00
chenjuntao
7559e87117 feat: 新增右下角悬浮窗 https://jira.shanqu.cc/browse/GHZS-1962 2023-04-13 17:49:39 +08:00
chenjuntao
6950c9af09 Merge remote-tracking branch 'origin/dev' into dev-5.24.0 
# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/gh/common/xapk/XapkInstaller.kt
 2023-04-11 10:37:40 +08:00
chenjuntao
7ef2d9b193 Merge remote-tracking branch 'origin/release' into dev 
# Conflicts:
#	app/src/main/java/com/gh/download/DownloadManager.java
#	dependencies.gradle
#	module_common/src/main/java/com/gh/gamecenter/common/utils/Extensions.kt
 2023-04-11 10:21:54 +08:00
chenjuntao
7a6afa9f6c feat: 移除光能部分代码 2023-04-11 09:49:44 +08:00
juntao
3e3f276cc4 fix: 头条 SDK 基础版本升级为 6.14.3 2023-04-10 18:01:32 +08:00
chenjuntao
18e96d1c0c feat: 【光环助手】推广组测试打包任务 https://jira.shanqu.cc/browse/GHZS-972 2023-04-10 10:04:32 +08:00
叶子维
11482d2318 fix: 首页轮播图样式改版-前端部分-0331测试 https://jira.shanqu.cc/browse/GHZS-1966 2023-04-03 15:49:08 +08:00
叶子维
744a3331f7 fix: 首页轮播图样式改版-前端部分—0329测试 https://jira.shanqu.cc/browse/GHZS-1841 2023-03-30 15:52:38 +08:00
chenjuntao
1f630ae652 fix: 将快捷方式管理库移至自有 nexus 管理 2023-03-21 16:46:56 +08:00
陈君陶
6d2e0853ff feat: 【光环助手】OPPO手机拦截安装相关优化 https://jira.shanqu.cc/browse/GHZS-1343 2023-03-13 11:01:02 +08:00
chenjuntao
9451f9bae3 Merge remote-tracking branch 'origin/release' into dev 
# Conflicts:
#	dependencies.gradle
 2023-03-06 19:55:40 +08:00
chenjuntao
ac18a678ff Merge remote-tracking branch 'origin/legacy-release' into release 
# Conflicts:
#	app/proguard-rules.txt
 2023-03-06 19:55:05 +08:00
叶子维
1e9e39eea9 feat: 神策埋点接入测试--SDK接入 https://jira.shanqu.cc/browse/GHZS-1417 2023-03-06 16:10:51 +08:00
juntao
d966f83b2d fix: 更换 7zip 二进制文件源 2023-02-23 11:54:07 +08:00
juntao
ca547d9ee3 Revert "fix: 将 andResGuard 移动至 init.gradle 避免 arm 处理器找不到处理文件无法正常编译运行" 
This reverts commit 462e407238.
 2023-02-23 11:40:56 +08:00
chenjuntao
462e407238 fix: 将 andResGuard 移动至 init.gradle 避免 arm 处理器找不到处理文件无法正常编译运行 2023-02-23 10:40:11 +08:00
叶子维
572cbba819 feat: 对接广点通SDK—客户端 https://jira.shanqu.cc/browse/GHZS-1254 2023-02-16 11:41:00 +08:00
chenjuntao
89b463f40b Merge remote-tracking branch 'origin/release' into dev 
# Conflicts:
#	dependencies.gradle
 2023-02-13 17:29:50 +08:00
叶子维
7e004c5bbd feat:【光环助手】快手SDK对接需求—客户端 https://jira.shanqu.cc/browse/GHZS-1074 2023-01-31 14:52:43 +08:00
叶子维
2f1f061c87 将 feature-module_setting_compose 分支的代码 rebase 到 dev-5.18.0 https://jira.shanqu.cc/browse/GHZS-828 2022-12-30 09:46:35 +08:00
张玉久
1a653b551e feat: 组件化帮助与反馈功能 https://jira.shanqu.cc/browse/GHZS-797 2022-12-22 13:50:18 +08:00
陈君陶
67400bb4cc 【V5.16.0】畅玩流程优化—客户端 https://jira.shanqu.cc/browse/GHZS-178 2022-11-18 16:00:31 +08:00
叶子维
5b266c91da refactor: 组件化设置功能 https://git.shanqu.cc/halo/android/assistant-android/-/issues/87 2022-11-09 14:35:41 +08:00
chenjuntao
8be8430543 fix: 清理冗余无用资源 #91 2022-11-03 16:32:00 +08:00
liuyirong
322774fc78 fix:【光环助手V5.15.0】登录相关优化(1024UI测试问题) https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/2049#note_174815 2022-10-26 16:59:25 +08:00
liuyirong
896f43246b feat:【光环助手V5.15.0】登录相关优化(处理一键登录图片资源找不到问题) https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/2049 2022-10-24 17:06:15 +08:00
liuyirong
82300e4b4e feat:【光环助手V5.15.0】登录相关优化 https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/2049 2022-10-21 18:41:15 +08:00
chenjuntao
f33b699723 !refactor: 完全解耦光能模块，默认不添加到依赖中，移除旧版我的光环页面代码，清理无用资源 2022-10-21 16:58:20 +08:00
liuyirong
a68782203b fix:【光环助手V5.15.0】前端优化汇总10月第1周(7、8) https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/2114 2022-10-12 17:47:08 +08:00
chenjuntao
68061d96ed refactor!: 移除 flutter 相关代码 2022-10-10 14:51:05 +08:00
chenjuntao
077b865b81 Merge remote-tracking branch 'origin/release' into dev 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/receiver/InstallReceiver.java
#	app/src/main/java/com/gh/gamecenter/setting/VideoSettingFragment.kt
#	app/src/main/java/com/halo/assistant/HaloApp.java
#	dependencies.gradle
 2022-10-09 17:36:11 +08:00
chenjuntao
50e15fa79a Merge remote-tracking branch 'origin/legacy-release' into release 
# Conflicts:
#	app/src/main/java/com/halo/assistant/HaloApp.java
#	module_login/src/main/java/com/gh/gamecenter/login/utils/LoginHelper.kt
 2022-10-09 17:20:32 +08:00
chenjuntao
2a79c9cddd fix: 禁用 WorkManager ，减少非必要权限 2022-10-09 16:43:26 +08:00
张玉久
f486b3aba9 build: 升级leakcanary版本至2.9.1 2022-09-21 14:22:17 +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
juntao
5dd0734aad fix: 修复正式包畅玩链接不正确的问题 2022-08-30 18:13:59 +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
liuyirong
e3f6d64fa9 refactor: 组件化登录功能 https://git.shanqu.cc/halo/android/assistant-android/-/issues/73 2022-08-04 11:28:24 +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