Commit Graph

1328 Commits

Author SHA1 Message Date
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
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
wangcongtao
79c51474a2 rc 2020-06-30 17:23:38 +08:00
wangcongtao
b6ad2d3add launch adas when acc on 2020-06-30 15:32:21 +08:00
wangcongtao
82e0970319 bugfix 2020-06-30 15:11:11 +08:00
wangcongtao
a14119e3d2 Merge branch 'qa' into demo/shunyi_v2v 2020-06-30 12:01:19 +08:00
wangcongtao
6d5ae4c382 opt 2020-06-30 12:00:18 +08:00
wangcongtao
6a23dca5d1 opt 2020-06-30 11:59:29 +08:00
wangcongtao
46ccbe50ea rc 2020-06-30 10:58:23 +08:00
wangcongtao
2d4f1f2c2f Merge branch 'qa' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into qa 2020-06-30 10:37:51 +08:00
wangcongtao
ac439dbb99 opt 2020-06-30 10:37:43 +08:00
lixiaopeng
940b60fda7 fixed bug 2020-06-29 20:00:34 +08:00
wangcongtao
989066952c opt 2020-06-29 15:58:15 +08:00
wangcongtao
0375d7a8d8 opt 2020-06-29 15:45:36 +08:00
wangcongtao
63465fa6ce Merge branch 'demo/shunyi_v2v' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into demo/shunyi_v2v 2020-06-29 14:17:42 +08:00
wangcongtao
ca9e207e1a opt 2020-06-29 14:17:33 +08:00
tongchenfei
477ea20b74 Merge remote-tracking branch 'origin/demo/shunyi_v2v' into demo/shunyi_v2v
# Conflicts:
#	gradle.properties
2020-06-29 14:15:09 +08:00
wangcongtao
31b530eea9 opt 2020-06-29 14:15:02 +08:00
tongchenfei
e54bf2c005 升级v2x版本 2020-06-29 14:13:20 +08:00
wangcongtao
9f8e9c0de2 opt 2020-06-29 11:11:16 +08:00
wangcongtao
eb05a851d2 rc 2020-06-29 10:28:32 +08:00
wangcongtao
0f72f9a30b opt 2020-06-29 10:25:16 +08:00
wangcongtao
a876fef33c opt 2020-06-29 10:10:33 +08:00
tongchenfei
f41f21483d 增加vip变灯提醒类型模拟数据 2020-06-29 09:59:45 +08:00
tongchenfei
79a0ad0f2f Merge remote-tracking branch 'origin/demo/shunyi_v2v' into demo/shunyi_v2v 2020-06-29 09:52:47 +08:00
tongchenfei
4ff3c0e2cc 增加vip变灯提醒类型 2020-06-29 09:52:21 +08:00
wangcongtao
aa028e5b3c rc 2020-06-28 20:17:28 +08:00
wangcongtao
afd03008cd bugfix: E85XJD-50 2020-06-28 20:11:36 +08:00
wangcongtao
bf52b95175 Merge branch 'demo/shunyi_v2v' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into demo/shunyi_v2v 2020-06-28 19:56:30 +08:00
wangcongtao
1ee1cf90b4 opt 2020-06-28 19:56:24 +08:00
tongchenfei
f8e084334b 新增obu容错重连机制 2020-06-28 19:35:30 +08:00
tongchenfei
3e27bcd671 Merge branch 'demo/shunyi_v2v' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into demo/shunyi_v2v 2020-06-28 15:37:45 +08:00
tongchenfei
dcb88d70dc opt 2020-06-28 15:37:34 +08:00
lixiaopeng
8ee50c7635 add road type 2020-06-28 11:11:38 +08:00
tongchenfei
2cf3bc8463 opt 2020-06-28 10:00:32 +08:00
tongchenfei
79f47c67a9 删除测试代码 2020-06-24 19:14:52 +08:00
tongchenfei
014af4adb5 dev分支去掉obu的依赖,代码保留,以待后用 2020-06-24 18:57:07 +08:00
tongchenfei
cd27017f6e Merge branch 'dev_obu' into dev
# Conflicts:
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
2020-06-24 15:12:34 +08:00
lixiaopeng
308b77ac06 add accon action 2020-06-24 14:28:05 +08:00
tongchenfei
20de31120a Merge remote-tracking branch 'origin/qa' into qa 2020-06-24 14:07:14 +08:00
tongchenfei
d247c99c7f bug fix 点击上报没有语音播报,酷我音乐异常死亡后点击播放没反应 2020-06-24 14:06:58 +08:00
tongchenfei
432f53c151 sdk接入基本完成,待验证 2020-06-24 13:43:08 +08:00
wangcongtao
a2a7c69f46 opt 2020-06-24 13:42:41 +08:00
yangjingjing
babbd47562 obu数据通道基本打通,待实车验证 2020-06-23 23:56:38 +08:00
tongchenfei
0066123855 bug fix 2020-06-23 20:50:23 +08:00
tongchenfei
a96acc698c 1. 接入obu sdk
2. 进行数据转发功能开发
2020-06-23 20:22:05 +08:00
wangcongtao
90b39c717a Merge branch 'dev' into qa 2020-06-23 16:18:56 +08:00
wangcongtao
8536776bf7 Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev 2020-06-23 16:18:09 +08:00