Commit Graph

897 Commits

Author SHA1 Message Date
zhongchao
6c094debd8 rebase 2021-11-05 22:59:09 +08:00
董宏宇
6eee4b7678 迁移 MogoLocation 位置,准备修复RTK位置回调未更新问题
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-11-01 21:08:13 +08:00
董宏宇
2561a5d38b 删除无用的 gradle配置
对Hmi增加res依赖

Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-11-01 17:32:43 +08:00
董宏宇
d85e60f15e 迁移网络基础数据BaseData.java
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-29 17:05:48 +08:00
董宏宇
a70eed4475 合并dev_MogoAP_eagle-930_210926_8.0.12分支,并将规划全局路径以及引导线按照新架构中的监听合并,测试可用,在工控机上执行sh roadPlanning.sh 使用带有引导线的数据包
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-28 15:25:26 +08:00
董宏宇
02f5f7cbee Merge branch 'dev_MogoAP_eagle-930_210926_8.0.12' into dev_MogoAP_eagle-1030_211020_8.0.14
# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt
#	gradle.properties
#	modules/mogo-module-adas/build.gradle
#	modules/mogo-module-adas/src/main/java/com/mogo/module/adas/AdasEventManager.java
#	modules/mogo-module-adas/src/main/java/com/mogo/module/adas/IAdasDataListener.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-10-28 10:20:23 +08:00
lianglihui
0fea60b5f1 eagle 小地图去掉已行进路径擦除 2021-10-27 10:44:40 +08:00
lianglihui
5742f2ad93 eagle 工控机提供车前引导线数据 2021-10-22 19:39:45 +08:00
董宏宇
a8d8e19f67 删除旧版本的感知数据绘制
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-20 14:56:32 +08:00
董宏宇
c0f02ce58d 增加了对识别数据的绘制动态控制
增加动态控制自车定位数据源

Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-20 12:46:43 +08:00
董宏宇
8d784b4014 完成识别元素绘制逻辑替换
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-19 15:14:52 +08:00
董宏宇
b31f2b64c7 修改类文件名称大小写问题2
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-18 20:01:06 +08:00
董宏宇
cf9767436f 修改类文件名称大小写问题2
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-18 19:53:42 +08:00
董宏宇
1f4f906748 修改类文件名称大小写问题
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-18 19:50:39 +08:00
董宏宇
8a3e122518 完成新架构的域控制器的监听及数据改造
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-18 19:16:41 +08:00
董宏宇
831c686e26 Merge branch 'dev_MogoAP_eagle-930_210926_8.0.12' into dev/dev_eagle_architecture_upgrade 2021-10-15 21:08:27 +08:00
lianglihui
dc31e46fc0 eagle 顺义测试 调整路线绘制策略 2021-10-15 19:46:54 +08:00
zhongchao
c7f3f8d5a1 add chain lig 2021-10-15 18:36:03 +08:00
董宏宇
9e00205cdf 整理ADAS相关代码,删除无用代码
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-15 11:26:58 +08:00
董宏宇
fc47f7233a Merge branch 'dev_MogoAP_eagle-930_210926_8.0.12' into dev/dev_eagle_architecture_upgrade
# Conflicts:
#	config.gradle
#	core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/AutoPilotStatusView.kt
#	core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt
2021-10-15 10:47:43 +08:00
董宏宇
8f9bcb9098 遗留地图模式修改没切换2D左侧UI
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-13 18:58:46 +08:00
lianglihui
846b6b591c eagle 处理绘制轨迹所需的坐标转换 2021-10-13 15:26:32 +08:00
董宏宇
ef0c6da1d8 规范自动驾驶命名
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-13 15:01:01 +08:00
董宏宇
78daacaae7 迁移MogoServicePaths位置到com.mogo.eagle.core.data.constants
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-10-13 14:46:34 +08:00
lianglihui
e99d7db445 eagle 处理异常 2021-10-13 09:57:48 +08:00
董宏宇
6ce0845f8a Merge branch 'dev/dev_eagle_architecture_upgrade' into dev/dev_eagle_wuhan_sikua_obu
# Conflicts:
#	core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt
2021-10-09 14:26:38 +08:00
lianglihui
3ec9b359ed eagle930 路测调整 2021-09-28 21:18:51 +08:00
董宏宇
1f410f98f4 Merge branch 'dev/dev_eagle_architecture_upgrade' into dev/dev_eagle_wuhan_sikua_obu 2021-09-27 10:20:48 +08:00
lianglihui
ff3f2d20e2 eagle 小地图导航 车前引导线 2021-09-27 10:03:43 +08:00
zhongchao
44d203f8db add note 2021-09-24 15:39:42 +08:00
董宏宇
974cf5f8fe // TODO 这里需要根据到达终点站的时候将监听移除,否则后续的正常站点都会触发到这里
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-09-23 11:02:29 +08:00
董宏宇
d80348b32f 完成了自动驾驶按钮的点击触发逻辑抽离
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-09-23 10:57:34 +08:00
董宏宇
808e772cce 准备抽离AutoPilot调用逻辑,有些多,放在10月份进行
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-09-22 21:14:08 +08:00
董宏宇
834ea1245e Merge branch 'dev/dev_eagle_architecture_upgrade' into dev/dev_eagle_wuhan_sikua_obu 2021-09-17 19:06:31 +08:00
董宏宇
65cc40d6c3 修改废弃的字段调用
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-09-17 17:50:37 +08:00
董宏宇
3d6470e140 Merge branch 'dev/dev_eagle_architecture_upgrade' into dev/dev_eagle_wuhan_sikua_obu 2021-09-17 17:41:02 +08:00
董宏宇
4556727d23 下沉经纬度公用信息实体
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-09-17 17:40:45 +08:00
lixiaopeng
cd593acaa9 opt 2021-09-17 16:28:43 +08:00
liujing
99cd66191c 解决冲突-EntranceFragment再验证一遍 2021-09-15 19:57:10 +08:00
liujing
a4631f7880 Merge branch 'dev/dev_eagle_architecture_upgrade' into dev/dev_eagle_check
# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	gradle.properties
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java
#	services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
#	services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
2021-09-15 18:09:27 +08:00
董宏宇
1d00537cbd 解决分体机识别他车不展示问题
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-09-15 17:57:18 +08:00
chenfufeng
ec8d5e0a5b 解决空指针异常
原因:缺少ADAS数据文件导致异常,被捕获后往下执行,遍历BufferReader数组中元素然后调用close(),但数组中
元素为null。

Signed-off-by: chenfufeng <chenfufeng@zhidaoauto.com>
2021-09-15 15:49:05 +08:00
董宏宇
56a695ae89 放开了工控机识别渲染它车逻辑
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-09-15 14:27:57 +08:00
董宏宇
c65db97c3c Cherry pick
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-09-14 18:09:58 +08:00
donghongyu
1538356f16 Cherry pick
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-09-14 18:08:32 +08:00
donghongyu
5716dc1f4b Cherry pick
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-09-14 18:05:02 +08:00
lixiaopeng
44d1248d47 delete perception data 2021-09-08 11:39:08 +08:00
zhongchao
5d49589203 code style 2021-09-02 10:50:37 +08:00
zhongchao
9b41205800 logic perform upgrade 2021-09-01 17:16:02 +08:00
董宏宇
ff017d4adf Merge branch 'feature/feature_show_dispatch' into feature/feature_mogo_obu
# Conflicts:
#	.idea/gradle.xml
#	.idea/misc.xml
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java
#	OCH/mogo-och-taxi/src/main/res/values/strings.xml
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	config.gradle
#	foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java
#	foudations/mogo-aicloud-services-apk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java
#	foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java
#	foudations/mogo-commons/src/main/java/com/mogo/commons/constants/SharedPrefsConstants.java
#	gradle.properties
#	libraries/map-custom/build.gradle
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java
#	modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java
#	modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java
#	modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/spi/SPIRealTimeUpload.java
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java
#	modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
#	modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java
#	services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java
#	services/mogo-service-api/src/main/java/com/mogo/service/connection/IMogoSocketManager.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/connection/MogoSocketManager.java
2021-08-30 11:59:44 +08:00