yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,152 Commits 1 Branch 0 Tags
cd593acaa91fcdfa8a86cd77a2bab92ec57d04f8
Commit Graph

955 Commits

Author SHA1 Message Date
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
martindhy
ae6a736f2c Update map version 2021-09-07 01:30:33 +08:00
董宏宇
4306741795 Revert "升级了车聊聊，还是没能解决maven编译异常" 
This reverts commit e685ec7d
 2021-09-06 20:41:18 +08:00
董宏宇
e685ec7d77 升级了车聊聊，还是没能解决maven编译异常 2021-09-06 19:38:24 +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
zhongchao
dc1adf80d0 logic perform update 2021-09-01 17:16:00 +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
董宏宇
8e517485fc 升级自研地图 
版本	日志
1.0.1-vr-1.0.6
1.增加分区域获取高精数据功能
2.增加设置车相对于屏幕底部的位置
3.修改渲染线的绘制方式
4.增加动态3D模型
 2021-08-27 18:41:26 +08:00
liujing
f1fc89b3b1 [add] 首页监听车辆监控状态,修改检测入口预警标识的显示状态 2021-08-26 19:02:24 +08:00
董宏宇
7578f2c81f 增加判断逻辑OBU开启的时候关掉ADAS识别周边交通元素绘制 2021-08-26 10:28:53 +08:00
lixiaopeng
95bb6c154f opt obu status 2021-08-25 15:57:49 +08:00
董宏宇
f7214481a2 增加了OBU提供自车位置的功能 2021-08-25 12:53:50 +08:00
董宏宇
152c916a8e 调整Gradle依赖关系 2021-08-25 11:09:54 +08:00
zhongchao
c9bd2644ab fix bug 2021-08-24 14:54:30 +08:00
董宏宇
72a8677eed Merge branch 'qa_hengyang_base' into feature/feature_mogo_obu 
# Conflicts:
#	.idea/misc.xml
#	modules/mogo-module-service/src/main/assets/adas10.txt
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java
 2021-08-23 17:23:39 +08:00
董宏宇
0dabf6b433 Merge branch 'dev_hengyang_base' into feature/feature_mogo_obu 
# Conflicts:
#	.idea/misc.xml
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java
 2021-08-20 16:19:23 +08:00
lixiaopeng
411d6651a6 add obu status 2021-08-17 16:59:16 +08:00
lixiaopeng
b9261cd42d add test data 2021-08-16 18:14:48 +08:00
董宏宇
86021da238 增加测试资源 2021-08-16 17:07:23 +08:00
zhongchao
09071f3a9e changed the logic of autopilot status upload 2021-08-16 11:05:27 +08:00
zhongchao
64a6c9ca61 change ui 2021-08-11 20:16:48 +08:00
zhongchao
b8f8356c09 fix ui problem 2021-08-11 20:08:33 +08:00
zhongchao
ef0b48ec96 add envStatus item of sn 2021-08-10 16:40:27 +08:00
董宏宇
78d54d10bf 删除测试资源 2021-08-10 16:40:27 +08:00
zhongchao
8c808edc75 add the fit views of fentiji 2021-08-08 12:09:02 +08:00
zhongchao
2545d1c868 add func of upload autopilot status 2021-08-05 16:52:25 +08:00
zhongchao
ea4e380b35 add new func of ezhou airport and upgrade the aiSdkVersion to fit demo server 2021-08-05 10:50:05 +08:00
zhongchao
1904779627 envStatus add one item of sn 2021-08-02 17:12:47 +08:00
zhongchao
dc0c4af82a add envStatus item of sn 2021-08-02 17:11:24 +08:00
董宏宇
289e5ef997 删除测试资源 2021-08-02 12:21:29 +08:00
zhongchao
e89b315641 change the tiny difference of dev or qa branch 2021-07-31 09:13:02 +08:00
zhongchao
4ce4addb55 rebase 2021-07-30 19:07:46 +08:00
zhongchao
1804918edf rebase 2021-07-30 18:49:28 +08:00
zhongchao
a700bc5541 add new func of httpdns switch city to fit socketserver 2021-07-30 17:22:37 +08:00
董宏宇
78e869a3b4 修改小巴车 TTS 把语音播报中的【蘑菇车联】改成「’蘑菇车联‘」解决断句问题 2021-07-29 19:28:25 +08:00
董宏宇
19186cabdb 修改小巴车 TTS 把语音播报中的【蘑菇出行】改成【蘑菇车联】 2021-07-29 18:00:22 +08:00
董宏宇
3771ac0f07 删除测试资源 2021-07-26 14:48:32 +08:00
zhongchao
3d3a1ff69b add socket status register cod 2021-07-22 17:20:49 +08:00
zhongchao
cc1d77ffbd merge 2021-07-22 17:17:00 +08:00
董宏宇
a1137e3352 关闭融合感知数据绘制 2021-07-21 18:50:18 +08:00