|
|
bad1e32fda
|
Merge branch 'feature-GHZS-163' into 'legacy-release'
feat:【光环助手】存储权限授权弹窗埋点补充 https://jira.shanqu.cc/browse/GHZS-163
See merge request halo/android/assistant-android!426
|
2022-11-10 15:11:40 +08:00 |
|
|
|
b602960882
|
feat:【光环助手】存储权限授权弹窗埋点补充 https://jira.shanqu.cc/browse/GHZS-163
|
2022-11-10 15:05:05 +08:00 |
|
|
|
6be3798b36
|
Merge branch 'feature-GHZS-116' into 'dev'
fix:【光环助手V5.15.0同步正式问题】登录闪退 https://jira.shanqu.cc/browse/GHZS-116
See merge request halo/android/assistant-android!424
|
2022-11-10 12:11:21 +08:00 |
|
|
|
5cf7ab8159
|
Merge branch 'dev-fix-vector_crash' into 'dev'
fix: 修复5.0以下系统矢量图的闪退问题
See merge request halo/android/assistant-android!425
|
2022-11-10 11:00:43 +08:00 |
|
|
|
1e7c56221a
|
fix: 修复5.0以下系统矢量图的闪退问题
|
2022-11-10 10:52:09 +08:00 |
|
|
|
73a473b1c1
|
Merge branch 'feature-GHZS-16' into 'dev-5.16.0'
feat: 【V5.16.0】启动广告图—客户端 https://jira.shanqu.cc/browse/GHZS-16
See merge request halo/android/assistant-android!420
|
2022-11-10 10:25:45 +08:00 |
|
|
|
258ada53af
|
fix: 启动广告图跳转按钮箭头改为用代码设置
|
2022-11-10 10:21:52 +08:00 |
|
|
|
128f0e0e82
|
feat: 【V5.16.0】启动广告图—客户端 https://jira.shanqu.cc/browse/GHZS-16
|
2022-11-09 18:00:08 +08:00 |
|
|
|
424efdafcf
|
fix:【光环助手V5.15.0同步正式问题】登录闪退 https://jira.shanqu.cc/browse/GHZS-116
|
2022-11-09 17:22:59 +08:00 |
|
|
|
08e90bf923
|
Merge branch 'dev-5.16.0' into feature-GHZS-16
# Conflicts:
# app/src/main/java/com/gh/common/constant/Config.java
|
2022-11-09 16:53:05 +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 |
|
|
|
44b776a156
|
Merge branch 'fixes-from-release' into 'dev'
合并 release 分支的改动
See merge request halo/android/assistant-android!422
|
2022-11-09 16:26:24 +08:00 |
|
|
|
b17fa55f94
|
fix: 处理合并冲突
|
2022-11-09 16:06:23 +08:00 |
|
|
|
5d1bc4aedd
|
Merge remote-tracking branch 'origin/release' into dev
# Conflicts:
# app/src/main/java/com/gh/common/constant/Config.java
# app/src/main/java/com/gh/gamecenter/entity/NewSettingsEntity.kt
# dependencies.gradle
# module_common/src/main/java/com/gh/gamecenter/common/utils/Extensions.kt
|
2022-11-09 15:07:15 +08:00 |
|
|
|
b5c265e0d6
|
Merge branch 'feature-module_setting' into 'dev-5.16.0'
refactor: 组件化设置功能 https://git.shanqu.cc/halo/android/assistant-android/-/issues/87
See merge request halo/android/assistant-android!411
|
2022-11-09 14:35:41 +08:00 |
|
|
|
5b266c91da
|
refactor: 组件化设置功能 https://git.shanqu.cc/halo/android/assistant-android/-/issues/87
|
2022-11-09 14:35:41 +08:00 |
|
|
|
fadd165e68
|
Merge branch 'hotfix-v5.14.3-633-setting_datas_error' into 'release'
fix: 修改设置接口数据保存错误问题
See merge request halo/android/assistant-android!421
|
2022-11-09 14:34:50 +08:00 |
|
|
|
255b6ea141
|
fix: 修改设置接口数据保存错误问题
|
2022-11-09 13:46:20 +08:00 |
|
|
|
7712039804
|
chore: 版本更新至 5.14.3
v5.14.3-633
|
2022-11-08 15:15:57 +08:00 |
|
|
|
fee65172d1
|
Merge branch 'hotfix-v5.14.2-632-delete_apk_crash' into 'release'
fix: 捕抓清理安装包时的 concurrent 异常
See merge request halo/android/assistant-android!419
|
2022-11-08 15:13:36 +08:00 |
|
|
|
89846e04f3
|
Merge branch 'dev-5.16.0' into feature-GHZS-16
|
2022-11-08 15:07:00 +08:00 |
|
|
|
b09f0cde18
|
fix: 捕抓清理安装包时的 concurrent 异常
|
2022-11-08 15:04:12 +08:00 |
|
|
|
0e16aa7dd4
|
feat: 【V5.16.0】启动广告图—客户端 https://jira.shanqu.cc/browse/GHZS-16
|
2022-11-08 15:03:10 +08:00 |
|
|
|
cb355b2490
|
Merge branch 'hotfix-v5.14.2-632-wrong_dark_mode_setting' into 'release'
fix: 修复错误的深色模式切换开关配置
See merge request halo/android/assistant-android!418
|
2022-11-08 12:01:27 +08:00 |
|
|
|
806ceee7e7
|
Merge branch 'hotfix-v5.14.2-632-super_did_not_called_crash' into 'release'
fix: 修复因为混淆问题导致 onConfigurationChanged 没有调用 super.onConfigurationChanged 而造成的闪退
See merge request halo/android/assistant-android!417
|
2022-11-08 11:55:35 +08:00 |
|
|
|
0cc8904852
|
fix: 修复错误的深色模式切换开关配置
|
2022-11-08 11:33:33 +08:00 |
|
|
|
1ffb58feea
|
fix: 修复因为混淆问题导致 onConfigurationChanged 没有调用 super.onConfigurationChanged 而造成的闪退
|
2022-11-08 11:09:32 +08:00 |
|
|
|
b0ad6ff8c5
|
chore: 版本更新至 5.16.0
|
2022-11-08 10:37:46 +08:00 |
|
|
|
ccbe6650d1
|
Merge branch 'feature-GHZS-28' into 'dev-5.16.0'
feat:【V5.16.0】游戏广告管理功能（前端部分）—客户端 https://jira.shanqu.cc/browse/GHZS-28
See merge request halo/android/assistant-android!416
|
2022-11-08 10:14:18 +08:00 |
|
|
|
f99b3af9c6
|
feat:【V5.16.0】游戏广告管理功能（前端部分）—客户端 https://jira.shanqu.cc/browse/GHZS-28
|
2022-11-08 10:14:18 +08:00 |
|
|
|
e80c8d76cd
|
Merge branch 'dev-fix-issues2125-gt' into 'dev'
fix:修复模拟器下载流程问题 https://jira.shanqu.cc/browse/GHZS-122
See merge request halo/android/assistant-android!415
|
2022-11-08 09:26:58 +08:00 |
|
|
|
f47b0326f4
|
fix:修复模拟器下载流程问题 https://jira.shanqu.cc/browse/GHZS-122
|
2022-11-08 09:26:58 +08:00 |
|
|
|
a5ce8f389c
|
Merge branch 'feature-GHZS-55' into 'dev-5.16.0'
feat:【V5.16.0】游戏搜索-热门榜单功能优化—客户端 https://jira.shanqu.cc/browse/GHZS-55
See merge request halo/android/assistant-android!414
|
2022-11-08 09:19:55 +08:00 |
|
|
|
8f5daed7a7
|
feat:【V5.16.0】游戏搜索-热门榜单功能优化—客户端 https://jira.shanqu.cc/browse/GHZS-55
|
2022-11-08 09:19:55 +08:00 |
|
|
|
a1aada02d6
|
Merge branch 'dev-fix-issues2125-gt' into 'dev'
光环助手V5.15.0同步正式问题】游戏卡片UI问题
See merge request halo/android/assistant-android!413
|
2022-11-07 16:19:54 +08:00 |
|
|
|
659469aabc
|
光环助手V5.15.0同步正式问题】游戏卡片UI问题
|
2022-11-07 16:19:54 +08:00 |
|
|
|
9ee743c14f
|
Merge branch 'feature-issues91' into 'dev'
清理冗余无用资源
See merge request halo/android/assistant-android!412
|
2022-11-03 16:34:17 +08:00 |
|
|
|
8be8430543
|
fix: 清理冗余无用资源 #91
|
2022-11-03 16:32:00 +08:00 |
|
|
|
de2c0dc0c3
|
fix: 清理冗余无用资源 https://git.shanqu.cc/halo/android/assistant-android/-/issues/91
|
2022-11-03 14:03:32 +08:00 |
|
|
|
e961642cf7
|
fix: 清理冗余无用资源 https://git.shanqu.cc/halo/android/assistant-android/-/issues/91
|
2022-11-03 10:51:57 +08:00 |
|
|
|
fb8bd8b440
|
Merge branch 'fix-ci-chucker' into 'dev'
ci: 更新含 chucker 的编译脚本
See merge request halo/android/assistant-android!410
|
2022-11-02 17:29:30 +08:00 |
|
|
|
ed19677568
|
ci: 更新含 chucker 的编译脚本
|
2022-11-02 17:12:48 +08:00 |
|
|
|
c4cf232d35
|
fix: 清理冗余无用资源 https://git.shanqu.cc/halo/android/assistant-android/-/issues/91
|
2022-11-02 16:35:37 +08:00 |
|
|
|
5fe552ad91
|
fix:清理无用资源 https://git.shanqu.cc/halo/android/assistant-android/-/issues/91
|
2022-11-02 16:20:46 +08:00 |
|
|
|
1db87a4152
|
Merge branch 'dev-fix-compress_resource' into 'dev'
fix:压缩我的光环背景资源
See merge request halo/android/assistant-android!409
|
2022-11-02 16:16:33 +08:00 |
|
|
|
1bd741be9c
|
fix:压缩我的光环背景资源
|
2022-11-02 15:28:10 +08:00 |
|
|
|
7570e3e14e
|
Merge branch 'feature-issues89' into 'dev'
refactor: 移除废弃的旧问答相关代码和资源 https://git.shanqu.cc/halo/android/assistant-android/-/issues/89
See merge request halo/android/assistant-android!408
|
2022-11-02 11:29:04 +08:00 |
|
|
|
ca009fb1b2
|
refactor: 移除废弃的旧问答相关代码和资源 https://git.shanqu.cc/halo/android/assistant-android/-/issues/89
|
2022-11-02 11:29:04 +08:00 |
|
|
|
872ac7bb85
|
Merge branch 'feature-issuess81' into 'dev'
feat:数据解析异常以 toast 形式抛出 https://git.shanqu.cc/halo/android/assistant-android/-/issues/81
See merge request halo/android/assistant-android!400
|
2022-11-02 10:53:42 +08:00 |
|
|
|
8ce13fd0db
|
feat:数据解析异常以 toast 形式抛出 https://git.shanqu.cc/halo/android/assistant-android/-/issues/81
|
2022-11-02 10:53:42 +08:00 |
|
