Commit Graph

247 Commits

Author SHA1 Message Date
34b46a6143 正式环境接口切换到 5.5.0 2021-12-15 15:06:34 +08:00
39ec77faae 调整测试环境和正式环境切换的逻辑 2021-12-10 17:57:25 +08:00
553ab70d78 Merge remote-tracking branch 'origin/dev' into dev-5.5.0
# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/gh/common/DefaultUrlHandler.kt
#	app/src/main/java/com/gh/common/util/DirectUtils.kt
#	app/src/main/java/com/gh/common/util/EntranceUtils.java
#	build.gradle
2021-12-10 15:19:25 +08:00
2139c19b40 Merge branch 'feature-games_collection' into dev-5.5.0 2021-11-29 18:17:10 +08:00
7075f3bcc1 更新 gradle 版本 2021-11-10 18:13:07 +08:00
feb46a5887 测试环境api版本升级为v5d5d0 2021-11-08 18:12:53 +08:00
52294ebb3a Merge branch 'dev' into feature-flutter-game-comments
# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameLibaoAdapter.kt
#	app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt
#	app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt
#	gradle.properties
2021-11-04 16:54:56 +08:00
0cbc104092 正式环境切换到 5.4.0 的接口 2021-11-01 07:31:32 +01:00
0fe60f52e2 Revert "Merge branch 'revert-65a82369' into 'dev-5.4.0'"
This reverts merge request !130
2021-10-26 10:22:32 +08:00
31de4089ad Revert "Merge branch 'feature-fast_build' into 'dev-5.4.0'"
This reverts merge request !128
2021-10-25 18:17:15 +08:00
d73a4704c8 Merge remote-tracking branch 'origin/dev' into dev-5.4.0
# Conflicts:
#	app/src/main/res/layout/rank_collection_item.xml
2021-10-25 09:47:18 +08:00
050da95a8f 测试环境api版本升级为v5d4d0 2021-10-21 10:59:52 +08:00
516d8d8044 正式环境切换到 5.3.0 的接口 2021-10-11 10:35:08 +08:00
92841346cd Merge branch 'dev-5.3.0' into feature-flutter-feedback 2021-09-30 11:58:38 +08:00
d533e0ceab 提高项目的编译性能 https://git.ghzs.com/halo/android/assistant-android/-/issues/42 2021-09-30 10:15:27 +08:00
2b0abb1740 Added 添加可选优化编译选项 2021-09-07 12:49:17 +08:00
60e4f2a378 Fixed 解决接入Flutter模块后编译速度慢的问题,大大提升编译速度
Added 接口Host改为从app中读取
2021-09-07 12:28:52 +08:00
40aaabad7d 测试环境api版本改为v5d3d0 2021-09-03 15:49:11 +08:00
c2226f8452 Updated 提升编译速度 2021-09-03 11:21:57 +08:00
6bc7a9f504 Merge branch 'dev' into feature-flutter-feedback 2021-09-01 17:45:25 +08:00
25a95ddba0 Added Flutter Hook 2021-08-22 10:48:03 +08:00
c6f544136f 测试环境api版本改为v5d2d0 2021-08-19 11:13:42 +08:00
c30048c268 正式环境接口切换到 5.0 2021-07-29 11:01:41 +08:00
a0b8caa60a 完成5.0.0游戏专题功能优化 https://git.ghzs.com/pm/halo-app-issues/-/issues/1247 2021-06-03 16:38:12 +08:00
lyr
1bb4c1cc2c 光环助手V4.9.0-优化登录功能(第3期)https://git.ghzs.com/pm/halo-app-issues/-/issues/1206 2021-04-19 18:53:21 +08:00
6d2ae4dca5 版本号更新至 4.9.0 2021-04-12 17:31:08 +08:00
1fb8a60b2b 正式环境切换到 4.8.0 2021-03-31 09:34:46 +08:00
6f5b832a68 调整 R8 配置 2021-03-26 15:20:30 +08:00
1c51b2fe41 Merge branch 'release' into dev
# Conflicts:
#	dependencies.gradle
2021-03-26 15:09:26 +08:00
f23aa496ae 关闭 testOnly,避免部分 vivo 设备装不了 debug 包 2021-03-25 11:33:07 +08:00
c7a24555a2 "关闭 R8",因未知情况 sentry 没收到包里的 mapping id 2021-03-02 15:07:33 +08:00
e43c0efdcb 版本号更改为 4.8.0 2021-03-01 15:34:40 +08:00
df8b612188 恢复 R8 2021-02-24 18:01:30 +08:00
4d413eb1f2 关闭 R8 (Sentry 服务端暂未支持 mapping 自动上传) 2021-02-24 09:34:20 +08:00
f789f0cb73 正式环境接口改为 4.7.0 2021-02-04 20:57:44 +08:00
fd2d277470 启用 R8 2021-01-29 18:51:11 +08:00
0cd025b42d 更新依赖 2021-01-07 16:11:40 +08:00
dd1bfcaddd 正式接口切换到 4.6.0,测试接口更改 host 2021-01-05 15:47:02 +08:00
2020033bc0 测试环境API版本改为v4d6d0 2020-12-11 09:29:34 +08:00
e2de8cfb47 正式环境切换到4.5接口 2020-11-30 09:07:12 +08:00
c5c10ab208 版本号升至4.5.0 2020-11-09 16:16:07 +08:00
5cdc1635ca 正式环境接口改为 4.4 2020-11-03 18:11:18 +08:00
883a948b7b Merge branch 'feature-sdk-free' into dev
# Conflicts:
#	app/src/main/java/com/gh/common/LocalBroadcastReceiver.kt
#	app/src/main/java/com/gh/common/im/ImManager.kt
#	app/src/main/java/com/gh/common/im/ImReceiver.kt
#	app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailCustomColumnAdapter.kt
#	app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt
#	app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt
#	app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundViewModel.kt
#	app/src/main/java/com/gh/gamecenter/user/UserRepository.java
#	app/src/main/java/com/halo/assistant/HaloApp.java
#	dependencies.gradle
2020-11-02 10:03:28 +08:00
ebb279c42f 移除大部分第三方SDK 2020-11-02 09:45:24 +08:00
103ecc10d3 完成游戏下载状态新增"更新中" https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/1021 2020-10-19 18:30:05 +08:00
b795df2de8 正式环境切换到4.3.0 2020-09-28 09:47:27 +08:00
5cb6f9e296 Merge branch 'dev_4.3.0' into dev
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/fragment/SearchToolWrapperFragment.java
#	app/src/main/java/com/gh/gamecenter/security/SecurityFragment.kt
#	dependencies.gradle
2020-09-18 10:08:37 +08:00
41f78c365b 版本号更新至4.3.0 2020-09-11 18:09:40 +08:00
1ce04241f6 tinker base 4.2.0-202 2020-09-09 11:31:50 +08:00
99eddec84a tinker_base 4.2.0-201 2020-09-07 14:12:00 +08:00