Commit Graph

5477 Commits

Author SHA1 Message Date
tongchenfei
94a81d3d35 增加小巴进入vr模式 2021-02-02 20:35:32 +08:00
tongchenfei
9195d41b2a Merge remote-tracking branch 'origin/dev2' into dev2 2021-02-02 17:58:04 +08:00
wangcongtao
7b9daf7d58 提取资源到res目录
新增地图打开鹰眼模式接口
新增自动进入鹰眼模式逻辑
2021-02-02 17:56:39 +08:00
tongchenfei
d445e0c44f Merge remote-tracking branch 'origin/dev2' into dev2 2021-02-02 15:57:35 +08:00
tongchenfei
8a7bc28954 小巴ui fix 2021-02-02 15:57:21 +08:00
wangcongtao
89dc62477f opt 2021-02-02 15:53:13 +08:00
wangcongtao
f11e8c651e 调整订单面板背景 2021-02-02 15:30:28 +08:00
wangcongtao
6ce07b5a31 UI opt 2021-02-02 14:40:39 +08:00
wangcongtao
c6f6410062 Merge remote-tracking branch 'origin/dev2' into dev2 2021-02-02 14:17:56 +08:00
tongchenfei
358fe04e78 去掉showNotice的自动驾驶状态判断 2021-02-02 14:16:55 +08:00
wangcongtao
10026ea062 Merge branch 'qa_merge_shunyi_vr_map' into dev2 2021-02-02 11:19:32 +08:00
wangcongtao
69fc12ba2b rm build dir 2021-02-02 11:19:04 +08:00
wangcongtao
64b21da1f4 opt 2021-02-02 11:18:43 +08:00
wangcongtao
97314a67d3 opt 2021-02-01 16:56:30 +08:00
wangcongtao
e405bf4f0c test 2021-02-01 16:30:39 +08:00
wangcongtao
2ea8e34a8d Merge branch 'qa_merge_shunyi_vr_map' into dev2 2021-02-01 10:03:54 +08:00
wangcongtao
50c30eeea1 opt 2021-01-29 18:31:34 +08:00
wangcongtao
96767f4a99 Merge branch 'dev2' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev2 2021-01-29 18:20:42 +08:00
wangcongtao
3f83ed844e opt 2021-01-29 18:20:36 +08:00
tongchenfei
a0ee69291b Merge remote-tracking branch 'origin/dev2' into dev2
# Conflicts:
#	services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
2021-01-29 11:25:59 +08:00
tongchenfei
3bdf068499 opt och bus 2021-01-29 11:23:10 +08:00
wangcongtao
e90e299b95 rm build dir 2021-01-28 21:21:54 +08:00
wangcongtao
6e05b2685a opt 2021-01-28 21:21:31 +08:00
wangcongtao
61ec921f39 rc 2021-01-28 21:20:08 +08:00
wangcongtao
c2f8f5739f opt 2021-01-28 21:19:26 +08:00
tongchenfei
5f33eaca9a opt 2021-01-28 20:59:58 +08:00
tongchenfei
45b3e7c65b 增加取消自动驾驶接口 2021-01-28 16:43:14 +08:00
wangcongtao
3e8a241aaa 重新联网时刷新订单状态 2021-01-28 09:44:45 +08:00
tongchenfei
0aee7e19fe add log 2021-01-27 20:33:41 +08:00
wangcongtao
7fe3d60fa1 使用车辆定位获取车速 2021-01-27 20:26:05 +08:00
wangcongtao
5bcd35cb78 尝试替换marker动效方案 2021-01-27 19:39:41 +08:00
wangcongtao
ce1a5f9396 重新联网时刷新订单状态 2021-01-27 19:18:35 +08:00
tongchenfei
3d10f31737 更新adas版本,修改数据流向问题 2021-01-27 14:34:14 +08:00
tongchenfei
805e18c6e3 应用启动时根据自动驾驶状态改变tvc状态 2021-01-27 11:08:19 +08:00
tongchenfei
3fb4144b47 Merge remote-tracking branch 'origin/dev2' into dev2 2021-01-27 10:39:29 +08:00
tongchenfei
bd57ecb74d opt och bus 2021-01-27 10:39:23 +08:00
wangcongtao
cbd77ac2a2 优化车机号查询订单逻辑、优化剩余距离显示 2021-01-27 09:44:12 +08:00
tongchenfei
54b8bc0556 Merge remote-tracking branch 'origin/dev2' into dev2 2021-01-26 20:32:56 +08:00
tongchenfei
d2933a09b4 增加测试按钮 2021-01-26 20:32:48 +08:00
wangcongtao
71061385ff 添加自动计算剩余距离的逻辑、添加通过sn也可以请求未完成订单的逻辑 2021-01-26 19:47:45 +08:00
wangcongtao
85526c021c 添加自动驾驶状态切换逻辑、异常状态处理 2021-01-26 19:14:08 +08:00
wangcongtao
366107226d Merge remote-tracking branch 'origin/dev2' into dev2 2021-01-26 18:47:34 +08:00
tongchenfei
41a1c60718 opt adas callback 2021-01-26 18:47:22 +08:00
wangcongtao
65e46e9905 Merge remote-tracking branch 'origin/dev2' into dev2 2021-01-26 18:27:21 +08:00
tongchenfei
49874015aa 增加adas状态同步,增加自动驾驶异常状态处理 2021-01-26 18:26:51 +08:00
wangcongtao
e2f87ae11b Merge branch 'qa_merge_shunyi_vr_map' into dev2 2021-01-26 18:15:18 +08:00
wangcongtao
7f68d53d1f 优化 2021-01-26 18:13:31 +08:00
wangcongtao
233ba7b89f Merge branch 'qa_merge_shunyi_vr_map' into dev2
# Conflicts:
#	config.gradle
#	modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/CloudLocationInfo.java
#	services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
2021-01-26 09:26:48 +08:00
wangcongtao
0d0c39af67 opt 2021-01-25 18:42:18 +08:00
tongchenfei
f16d5f9a66 Merge remote-tracking branch 'origin/dev2' into dev2 2021-01-25 17:58:31 +08:00