Commit Graph

16867 Commits

Author SHA1 Message Date
unknown
cec0c52452 upgrade the version of v2x to 1.1.59 2020-07-02 12:44:13 +08:00
tongchenfei
8ff4ab2191 初始化事件面板模块 2020-07-02 12:40:00 +08:00
lixiaopeng
0c9efb1f7c modify tanlu verison 2020-07-02 12:33:20 +08:00
tongchenfei
0957dbae67 初始化事件面板模块 2020-07-02 10:53:03 +08:00
wangcongtao
7c17bb8be4 Merge branch 'qa' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into qa 2020-07-02 10:51:25 +08:00
wangcongtao
a6e94ae897 opt 2020-07-02 10:51:18 +08:00
tongchenfei
09f64dbab3 Merge remote-tracking branch 'origin/qa' into qa 2020-07-02 10:21:47 +08:00
tongchenfei
34e5632182 处理酷我音乐与蓝牙音乐同时播放时,酷我音乐状态异常导致点击浮窗没反应的问题 2020-07-02 10:21:30 +08:00
董宏宇
ace88a381c 将QA上有关于BootsMultidex ARouter 进行合并 2020-07-01 17:25:20 +08:00
wangcongtao
97d4ab7414 Merge branch 'qa' into dev_custom_map 2020-07-01 17:05:35 +08:00
wangcongtao
063f16bcd9 Merge branch 'qa' into demo/shunyi_v2v 2020-07-01 17:05:11 +08:00
wangcongtao
9ded3456ff Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev 2020-07-01 17:04:26 +08:00
wangcongtao
283fcb5735 Merge branch 'qa' into dev 2020-07-01 17:04:13 +08:00
wangcongtao
dde7367801 opt 2020-07-01 17:03:51 +08:00
tongchenfei
91c0421e96 Merge remote-tracking branch 'origin/dev' into dev 2020-07-01 16:09:23 +08:00
tongchenfei
e5cdc1d6e6 opt merge 2020-07-01 16:08:34 +08:00
wangcongtao
2e9228ccdf Merge branch 'qa' into dev 2020-07-01 15:15:11 +08:00
wangcongtao
1a817ceb09 Merge branch 'qa' into demo/shunyi_v2v 2020-07-01 15:14:40 +08:00
wangcongtao
90d5e2c4bb bugfix: E85XJD-65 2020-07-01 15:13:47 +08:00
tongchenfei
32528ff385 Merge branch 'dev_merge_extension_entrance' into dev
合并了右侧顶部的几个view,合并到了EntranceFragment中,ExtensionFragment暂时不使用了

# Conflicts:
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
2020-07-01 15:13:16 +08:00
wangcongtao
30620a74c7 Merge branch 'qa' into dev_custom_map 2020-07-01 11:34:02 +08:00
wangcongtao
3e19cab507 Merge branch 'demo/shunyi_v2v' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into demo/shunyi_v2v 2020-07-01 11:32:58 +08:00
wangcongtao
739a700303 opt 2020-07-01 11:32:52 +08:00
wangcongtao
aff9c5f576 Merge branch 'qa' into dev 2020-07-01 11:21:07 +08:00
wangcongtao
c3562cb796 opt 2020-07-01 11:20:38 +08:00
tongchenfei
ae7f61d310 1. 提升v2x版本,缩短vip变灯提示距离为100米
2. 增加obu重连机制
2020-06-30 22:38:33 +08:00
董宏宇
790b7b6bd6 升级V2X修复了
道路湿滑的问题
2020-06-30 18:24:01 +08:00
董宏宇
f9bf0b885f 升级V2X修复了
重复的道路预警
2020-06-30 17:44:45 +08:00
wangcongtao
fa235f9b6e Merge branch 'dev_custom_map' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev_custom_map 2020-06-30 17:43:56 +08:00
wangcongtao
c0c3a90a7d Merge branch 'qa' into dev_custom_map 2020-06-30 17:43:45 +08:00
wangcongtao
2f08754657 Merge branch 'qa' into dev 2020-06-30 17:41:33 +08:00
wangcongtao
67ae4efb31 opt' 2020-06-30 17:34:56 +08:00
wangcongtao
79ef14643f Merge branch 'qa' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into qa 2020-06-30 17:26:01 +08:00
wangcongtao
47cb98e26d opt 2020-06-30 17:25:56 +08:00
wangcongtao
3f3cf66eab Merge branch 'demo/shunyi_v2v' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into demo/shunyi_v2v 2020-06-30 17:23:44 +08:00
wangcongtao
79c51474a2 rc 2020-06-30 17:23:38 +08:00
lixiaopeng
2fe7ab32a4 opt 2020-06-30 17:17:59 +08:00
lixiaopeng
755c59199e opt 2020-06-30 17:09:01 +08:00
wangcongtao
45feba7261 Merge branch 'qa' into dev 2020-06-30 16:28:09 +08:00
wangcongtao
b6ad2d3add launch adas when acc on 2020-06-30 15:32:21 +08:00
wangcongtao
92e62a5531 Merge branch 'qa' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into qa 2020-06-30 15:11:22 +08:00
wangcongtao
82e0970319 bugfix 2020-06-30 15:11:11 +08:00
tongchenfei
2f0d627a64 提升v2x版本 2020-06-30 13:15:06 +08:00
董宏宇
8856874e46 Merge remote-tracking branch 'origin/qa' into qa 2020-06-30 12:27:24 +08:00
董宏宇
8c669c6c5b 升级V2X修复了
【违章高发地】修改了行驶的最低速度为3米/秒
2020-06-30 12:27:14 +08:00
wangcongtao
a14119e3d2 Merge branch 'qa' into demo/shunyi_v2v 2020-06-30 12:01:19 +08:00
wangcongtao
a9d1cde749 opt 2020-06-30 12:01:03 +08:00
wangcongtao
6d5ae4c382 opt 2020-06-30 12:00:18 +08:00
wangcongtao
8db3ef2c92 Merge branch 'qa' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into qa 2020-06-30 11:59:36 +08:00
wangcongtao
6a23dca5d1 opt 2020-06-30 11:59:29 +08:00