Commit Graph

10747 Commits

Author SHA1 Message Date
a57f8ed305 fix: 调整神策 URL 存放位置,屏蔽神策 SDK 获取 MAC, IMEI 等相关数据 2023-03-28 10:55:10 +08:00
a22deaff04 Merge branch 'feat-GHZS-1807' into 'dev-5.23.0'
feat: 畅玩管理更多功能—客户端—埋点 https://jira.shanqu.cc/browse/GHZS-1807

See merge request halo/android/assistant-android!850
2023-03-28 10:35:20 +08:00
8c9201c401 feat: 畅玩管理更多功能—客户端—埋点 https://jira.shanqu.cc/browse/GHZS-1807 2023-03-28 10:30:12 +08:00
6fcfc2f4be Merge branch 'fix-GHZS-1788' into 'dev'
fix: 神策数据埋点第一期—0323测试(调整AppLaunch事件) https://jira.shanqu.cc/browse/GHZS-1788

See merge request halo/android/assistant-android!849
2023-03-28 09:47:17 +08:00
0ffbba06fc fix: 神策数据埋点第一期—0323测试(调整AppLaunch事件) https://jira.shanqu.cc/browse/GHZS-1788 2023-03-28 09:21:42 +08:00
1c8502608f Merge branch 'fix-sensors' into 'dev-5.23.0'
fix: 修复无法切换测试环境的问题

See merge request halo/android/assistant-android!848
2023-03-27 18:06:51 +08:00
baf33ca5db Merge branch 'fix-sensors' into 'dev'
fix: 修复无法切换测试环境的问题

See merge request halo/android/assistant-android!847
2023-03-27 18:04:39 +08:00
5f4ebea65e fix: 修复无法切换测试环境的问题 2023-03-27 16:46:18 +08:00
10eed8844d Merge branch 'merge-from-dev-to-dev-5.23.0' into 'dev-5.23.0'
合并 dev 分支变更到 dev-5.23.0

See merge request halo/android/assistant-android!846
2023-03-27 16:01:10 +08:00
2cbe13b8f8 Merge branch 'dev' into merge-from-dev-to-dev-5.23.0 2023-03-27 15:51:59 +08:00
b61558438e Merge branch 'fix-GHZS-1768' into 'dev-5.23.0'
fix: 游戏专题显示问题 https://jira.shanqu.cc/browse/GHZS-1768

See merge request halo/android/assistant-android!845
2023-03-27 15:42:13 +08:00
bc847a500e fix: 游戏专题显示问题 https://jira.shanqu.cc/browse/GHZS-1768 2023-03-27 15:35:39 +08:00
13d90793c4 Merge branch 'fix-GHZS-1783' into 'dev'
fix: 云存档点击问题 https://jira.shanqu.cc/browse/GHZS-1783

See merge request halo/android/assistant-android!844
2023-03-27 14:07:51 +08:00
85ab438e5f fix: 云存档点击问题 https://jira.shanqu.cc/browse/GHZS-1783 2023-03-27 14:05:16 +08:00
948adaa5ec Merge remote-tracking branch 'origin/release' into dev
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt
2023-03-27 13:48:41 +08:00
88dc6584e7 Merge branch 'hotfix-v5.21.0-770-crashes' into 'release'
Hotfix v5.21.0 770 crashes

See merge request halo/android/assistant-android!843
v5.21.0-770
2023-03-27 11:30:13 +08:00
7ed06b6c06 fix: 捕抓清理清理 APK 页面调起安装时没有 Activity 响应的问题 2023-03-27 11:26:15 +08:00
aa7bc499b2 fix: 捕抓畅玩 ContentProvider 数据插入异常 2023-03-27 11:24:51 +08:00
71abfe6a0d Merge branch 'feature-GHZS-1600' into 'dev-5.23.0'
feat: 谷歌框架功能 https://jira.shanqu.cc/browse/GHZS-1600

See merge request halo/android/assistant-android!842
2023-03-27 10:56:20 +08:00
126064c7f1 fix: 修复系统内存不足时启动光环或重启光环造成的闪退 2023-03-27 10:51:36 +08:00
d311d70bd1 feat: 谷歌框架功能 https://jira.shanqu.cc/browse/GHZS-1600 2023-03-27 10:08:18 +08:00
90de69b338 Merge branch 'fix-GHZS-1788' into 'dev'
fix: 神策数据埋点第一期—0323测试 https://jira.shanqu.cc/browse/GHZS-1788

See merge request halo/android/assistant-android!841
2023-03-24 16:13:42 +08:00
a16c52980f fix: 神策数据埋点第一期—0323测试 https://jira.shanqu.cc/browse/GHZS-1788 2023-03-24 15:32:07 +08:00
a63e9ed08e Merge branch 'fix-GHZS-1793' into 'dev-5.23.0'
fix:创建游戏快捷方式-03/24测试问题 https://jira.shanqu.cc/browse/GHZS-1793

See merge request halo/android/assistant-android!840
2023-03-24 14:21:37 +08:00
21a1573f2c fix:创建游戏快捷方式-03/24测试问题 https://jira.shanqu.cc/browse/GHZS-1793 2023-03-24 14:17:31 +08:00
9b0c9aceb8 Merge branch 'fix-GHZS-1790' into 'dev'
fix:【光环助手】同步正式环境问题-新发布的视频帖详情页展示错误 https://jira.shanqu.cc/browse/GHZS-1790

See merge request halo/android/assistant-android!839
2023-03-24 11:29:42 +08:00
e9c00b4a32 fix:【光环助手】同步正式环境问题-新发布的视频帖详情页展示错误 https://jira.shanqu.cc/browse/GHZS-1790 2023-03-24 11:04:32 +08:00
c05a82543a Merge branch 'fix-shortcut-dialog-ui' into 'dev-5.23.0'
fix:创建快捷方式权限弹框ui调整

See merge request halo/android/assistant-android!838
2023-03-24 09:47:55 +08:00
cafbc0efb0 fix:创建快捷方式权限弹框ui调整 2023-03-24 09:45:32 +08:00
cac6875044 Merge branch 'feat-GHZS-1690' into 'dev-5.23.0'
feat:首页-推荐入口展示调整—客户端 https://jira.shanqu.cc/browse/GHZS-1690

See merge request halo/android/assistant-android!837
2023-03-24 09:40:45 +08:00
e3d5923ff3 feat:首页-推荐入口展示调整—客户端 https://jira.shanqu.cc/browse/GHZS-1690 2023-03-24 09:40:45 +08:00
e5e21e8695 Merge branch 'fix-viewbinding_proguard_issue' into 'dev-5.23.0'
fix: 修复混淆问题

See merge request halo/android/assistant-android!836
2023-03-23 15:00:49 +08:00
4f2917e1ac fix: 修复混淆造成的闪退问题 2023-03-23 14:56:35 +08:00
0a3fd9a99e Merge branch 'feat-GHZS-1680' into 'dev-5.23.0'
feat: 畅玩助手-游戏桌面图标创建功能 https://jira.shanqu.cc/browse/GHZS-1680

See merge request halo/android/assistant-android!835
2023-03-23 10:55:28 +08:00
782bbd95b2 feat: 畅玩助手-游戏桌面图标创建功能 https://jira.shanqu.cc/browse/GHZS-1680 2023-03-23 10:55:28 +08:00
e2106dd7ca Merge branch 'fix-package_observer_crash' into 'dev'
fix: 修复多线程注册取消注册包名变更回调引起的闪退问题

See merge request halo/android/assistant-android!834
2023-03-23 09:57:00 +08:00
aad3186a5e fix: 修复多线程注册取消注册包名变更回调引起的闪退问题 2023-03-23 09:37:25 +08:00
311e2292be Merge branch 'fix-GHZS-1629' into 'dev'
fix: 神策数据埋点第一期--光环助手(修改游戏单相关事件埋点,增加web上报调用方法) https://jira.shanqu.cc/browse/GHZS-1629

See merge request halo/android/assistant-android!833
2023-03-22 18:03:21 +08:00
842999ec9d fix: 神策数据埋点第一期--光环助手(修改游戏单相关事件埋点,增加web上报调用方法) https://jira.shanqu.cc/browse/GHZS-1629 2023-03-22 18:03:21 +08:00
d4b3bc059a fix: 更新畅玩连接服务依赖,修复连接问题 2023-03-22 16:56:41 +08:00
8a47e867c7 fix: 更新畅玩连接服务依赖,修复连接问题 2023-03-22 14:28:04 +08:00
fcba306373 fix: 更新畅玩连接服务依赖,修复连接问题 2023-03-22 14:26:29 +08:00
2067b8dea3 Merge branch 'fix-GHZS-1649' into 'dev-5.23.0'
fix:【光环助手】版本更新提示问题(0322测试) https://jira.shanqu.cc/browse/GHZS-1649

See merge request halo/android/assistant-android!832
2023-03-22 11:09:40 +08:00
bc3bfb16c2 Merge branch 'feature-GHZS-1725' into 'dev-5.23.0'
feat: 游戏搜索-猜你想搜调整—客户端 https://jira.shanqu.cc/browse/GHZS-1725

See merge request halo/android/assistant-android!831
2023-03-22 11:09:33 +08:00
38e3b8471f fix:【光环助手】版本更新提示问题(0322测试) https://jira.shanqu.cc/browse/GHZS-1649 2023-03-22 10:53:14 +08:00
2aaac4faaf feat: 游戏搜索-猜你想搜调整—客户端 https://jira.shanqu.cc/browse/GHZS-1725 2023-03-22 10:13:32 +08:00
19ed5b963d Merge branch 'fix-GHZS-1756' into 'dev-5.23.0'
fix: 游戏未提示已安装问题 https://jira.shanqu.cc/browse/GHZS-1756

See merge request halo/android/assistant-android!830
2023-03-22 09:15:01 +08:00
77c725068b fix: 游戏未提示已安装问题 https://jira.shanqu.cc/browse/GHZS-1756 2023-03-21 17:49:07 +08:00
c05b3bdca6 chore: 版本更新至 5.23.0 2023-03-21 16:51:34 +08:00
1f630ae652 fix: 将快捷方式管理库移至自有 nexus 管理 2023-03-21 16:46:56 +08:00