Commit Graph

1637 Commits

Author SHA1 Message Date
jiaguofeng
382e82527c 修改zoom 2020-06-19 15:36:56 +08:00
jiaguofeng
922bde92d6 Merge remote-tracking branch 'origin/dev_custom_map' into dev_custom_map 2020-06-19 11:47:40 +08:00
jiaguofeng
a7107b2bea 修改锁车逻辑以及marker显示问题 2020-06-19 11:47:16 +08:00
wangcongtao
5b8cedfe60 Merge branch 'dev' into dev_custom_map 2020-06-19 11:25:00 +08:00
wangcongtao
d04d3c4602 opt 2020-06-19 11:21:48 +08:00
wangcongtao
5d6b5e0441 opt 2020-06-19 11:18:27 +08:00
wangcongtao
879a01d11b add acc status static broadcast 2020-06-19 11:16:23 +08:00
wangcongtao
d15b6773c2 opt 2020-06-19 10:03:10 +08:00
wangcongtao
89d20022bd Merge branch 'dev' into qa 2020-06-18 19:58:51 +08:00
wangcongtao
900389ff51 bugfix: D80XCD-1449 2020-06-18 19:58:14 +08:00
wangcongtao
35c10fa430 opt 2020-06-18 18:24:31 +08:00
董宏宇
240422a9ea 修复了V2X疲劳驾驶弹窗时机 2020-06-18 18:09:23 +08:00
wangcongtao
deb5e5176d Merge branch 'qa' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into qa 2020-06-18 17:40:56 +08:00
wangcongtao
1f0faeb720 opt 2020-06-18 17:40:20 +08:00
董宏宇
a371a3e154 Merge remote-tracking branch 'origin/qa' into qa 2020-06-18 17:04:40 +08:00
董宏宇
ece332dc5c 升级了V2X 修复了 2小时的疲劳驾驶提示不限时的bug 2020-06-18 17:04:32 +08:00
wangcongtao
20c8b8f8db Merge branch 'qa' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into qa 2020-06-18 16:45:15 +08:00
wangcongtao
9bc8255144 del build 2020-06-18 16:45:08 +08:00
wangcongtao
7373c45cfe opt 2020-06-18 16:44:50 +08:00
董宏宇
b3974b60a9 升级了V2X增加了 “取消求助” 2020-06-18 15:31:13 +08:00
董宏宇
48056e6238 升级了V2X增加了 “取消求助” 2020-06-18 15:29:33 +08:00
wangcongtao
d5f551228f Merge branch 'dev_custom_map' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev_custom_map 2020-06-18 15:27:51 +08:00
jiaguofeng
f4b788c31f 修改bug 2020-06-18 15:17:32 +08:00
tongchenfei
e61dae6966 opt top view 2020-06-18 15:12:50 +08:00
wangcongtao
8500cd4391 Merge branch 'dev_custom_map' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev_custom_map 2020-06-18 14:29:22 +08:00
wangcongtao
9cfada844c opt code 2020-06-18 14:29:16 +08:00
jiaguofeng
6778425b41 Merge remote-tracking branch 'origin/dev_custom_map' into dev_custom_map 2020-06-18 14:28:46 +08:00
jiaguofeng
37200e141e 修改bug 2020-06-18 14:28:31 +08:00
wangcongtao
7bcc738cf9 Merge branch 'dev' into dev_custom_map 2020-06-18 14:27:16 +08:00
tongchenfei
99da041604 Merge branch 'dev_sub_top_view' into qa 2020-06-18 12:40:34 +08:00
tongchenfei
1ff3393e1e Merge branch 'qa' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into qa 2020-06-18 12:40:11 +08:00
tongchenfei
63d62d70b4 opt ui 个人中心头像大小 2020-06-18 12:38:52 +08:00
wangcongtao
7632740229 Merge branch 'dev' into qa 2020-06-18 11:45:29 +08:00
wangcongtao
35390d39d2 bugfix: D80XCD-1441 2020-06-18 11:45:12 +08:00
wangcongtao
42880a79b2 Merge branch 'dev' into qa 2020-06-18 11:24:20 +08:00
wangcongtao
7c58c36b16 opt 2020-06-18 11:24:03 +08:00
wangcongtao
893fd233f7 merge 2020-06-18 11:23:34 +08:00
wangcongtao
6f28e0e0ec Merge branch 'dev' into qa 2020-06-18 11:18:41 +08:00
jiaguofeng
8105087605 增加锁车逻辑 2020-06-18 10:35:13 +08:00
wangcongtao
c44bb50ac2 Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev 2020-06-18 10:34:04 +08:00
wangcongtao
34177988c0 opt 2020-06-18 10:33:55 +08:00
jiaguofeng
5dd7f64f38 增加获取屏幕经纬度相关 2020-06-18 10:33:21 +08:00
董宏宇
88a4175457 Merge remote-tracking branch 'origin/qa' into qa 2020-06-17 20:19:50 +08:00
董宏宇
003acabead 升级V2X修复了
【桌面卡片】疲劳驾驶3小时TTS播报提示找到停车场导航前往,语音说导航前往,没有调起导航
http://jira.zhidaohulian.com/browse/D80XCD-1435
2020-06-17 20:13:03 +08:00
jiaguofeng
85482674fe 更新map版本,修改bug 2020-06-17 20:04:04 +08:00
tongchenfei
e6186f75a9 Merge branch 'qa' into dev_change_dialog 2020-06-17 19:02:53 +08:00
tongchenfei
71205f8cf0 Merge branch 'qa_topview' into dev 2020-06-17 19:00:29 +08:00
tongchenfei
087859ed6a topview添加subview支持 2020-06-17 18:57:40 +08:00
董宏宇
8fcc81e008 升级V2X修复了
删除了测试的颜色
2020-06-17 18:14:08 +08:00
wangcongtao
96a7af2ca2 add switch map logic 2020-06-17 17:56:43 +08:00