Commit Graph

3642 Commits

Author SHA1 Message Date
wangcongtao
d8e8775c5e Merge remote-tracking branch 'origin/qa_1.1.9' into qa_1.1.9 2021-01-08 15:51:40 +08:00
wangcongtao
9f693b62ad 解决内存泄漏3 2021-01-08 15:51:32 +08:00
unknown
3ffa127671 Merge branch 'qa_1.1.9' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_1.1.9 2021-01-08 15:38:29 +08:00
unknown
bcca60bb4c fix bug 2021-01-08 15:36:55 +08:00
wangcongtao
917de5ca76 Merge branch 'qa_merge_shunyi_vr_map' into qa_1.1.9 2021-01-08 15:10:29 +08:00
wangcongtao
96610e886e 解决内存泄漏2
# Conflicts:
#	modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
2021-01-08 15:09:47 +08:00
wangcongtao
59f095e295 解决内存泄漏2 2021-01-08 14:57:25 +08:00
wangcongtao
953ee21b8c Merge branch 'qa_merge_shunyi_vr_map' into qa_1.1.9 2021-01-08 11:28:53 +08:00
wangcongtao
14688750a6 Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map 2021-01-08 11:28:04 +08:00
wangcongtao
3dbb6b5d50 bugfix: #138,内存泄漏问题 2021-01-08 11:25:09 +08:00
wangcongtao
dd6d7c6746 bugfix: #138,内存泄漏问题 2021-01-08 11:03:40 +08:00
liujing
686660e5e4 故障求助弹框提示VR模式下隐藏,返回2D显示 2021-01-07 19:59:11 +08:00
wangcongtao
8e5767fd6c Merge branch 'qa_merge_shunyi_vr_map' into qa_1.1.9
# Conflicts:
#	services/mogo-service/src/main/java/com/mogo/service/impl/singleton/SingletonsHolder.java
2021-01-07 18:59:09 +08:00
wangcongtao
93afe6629b Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map 2021-01-07 18:14:02 +08:00
wangcongtao
610d599d43 优化已知问题 2021-01-07 18:13:54 +08:00
liujing
e7c6c2d016 VR模式下唤醒词:发起故障求助 不处理 2021-01-07 16:09:33 +08:00
wangcongtao
4b7a9e9b14 opt 2021-01-06 20:38:03 +08:00
wangcongtao
3a83102f35 opt 2021-01-06 19:49:41 +08:00
tongchenfei
21e11b4d41 bug fix: vip通行没有黑夜白天模式 2021-01-06 19:48:55 +08:00
wangcongtao
e3a8e56337 修复M3无法启动问题 2021-01-06 16:59:49 +08:00
wangcongtao
bccfd46b97 修复M3无法启动问题 2021-01-06 16:55:08 +08:00
tongchenfei
4557919dae Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map 2021-01-06 16:05:21 +08:00
tongchenfei
dd5e85039f opt topview 2021-01-06 16:05:15 +08:00
wangcongtao
b2c8c35efb Merge branch 'qa_merge_shunyi_vr_map' into qa_1.1.9 2021-01-06 14:57:16 +08:00
wangcongtao
bbd26cfbf5 Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map 2021-01-06 14:55:11 +08:00
wangcongtao
c6ce25c983 解决m3上无法启动的问题 2021-01-06 14:55:05 +08:00
董宏宇
28d7d97238 解决,M3、M4 因为hook 无法启动的bug 2021-01-06 11:55:17 +08:00
董宏宇
19a3144f3d Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map 2021-01-06 11:54:24 +08:00
董宏宇
8ac19f35e1 解决,M3、M4 因为hook 无法启动的bug 2021-01-06 11:43:05 +08:00
wangcongtao
b25b4732c5 Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map 2021-01-06 11:29:15 +08:00
wangcongtao
3e26011821 更新地图版本 2021-01-06 11:29:09 +08:00
董宏宇
7ab78ebc67 解决地图样式没有更新问题 2021-01-06 10:48:14 +08:00
董宏宇
81f0742808 解决地图样式没有更新问题 2021-01-06 10:47:23 +08:00
wangcongtao
e6600df3a3 Merge remote-tracking branch 'origin/dev_1.1.9' into dev_1.1.9
# Conflicts:
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
#	modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
2021-01-05 19:27:13 +08:00
wangcongtao
40afbccfcc 合并分支 2021-01-05 19:24:19 +08:00
lixiaopeng
a8d6d0df81 opt 2021-01-05 11:34:43 +08:00
wangcongtao
e94036f85e 更新切换道路匹配测试逻辑调用方法 2021-01-05 11:14:30 +08:00
wangcongtao
1b061c938a Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map 2021-01-05 11:04:55 +08:00
wangcongtao
5cbb771469 添加切换道路匹配测试逻辑 2021-01-05 11:04:49 +08:00
unknown
50b7f00cdf .. 2021-01-05 10:51:49 +08:00
tongchenfei
6a9e2392ec Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map 2021-01-05 10:46:59 +08:00
unknown
100c40c325 add new proguard rules in smp 2021-01-05 10:46:16 +08:00
tongchenfei
52827bbfbb bugfix: #103 红绿灯不消失,修改成无数据后1s,红绿灯数据隐藏 2021-01-05 10:45:59 +08:00
unknown
ee9ff0c457 Merge branch 'dev_1.1.9' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev_1.1.9 2021-01-05 10:11:49 +08:00
unknown
17cd8c57e3 proguard 2021-01-04 16:29:06 +08:00
wangcongtao
be42e43529 Merge remote-tracking branch 'origin/qa_merge_shunyi_vr_map' into qa_merge_shunyi_vr_map 2021-01-04 14:37:56 +08:00
wangcongtao
6661db0e83 opt 2021-01-04 14:37:39 +08:00
liujing
2c30d98311 +目的地停车场推荐数据 2021-01-04 14:18:41 +08:00
liujing
5c005e6db9 删除测试数据 2020-12-31 19:10:23 +08:00
wujifei
c16ad2bce4 new#修改编译错误 2020-12-31 18:55:58 +08:00