Commit Graph

567 Commits

Author SHA1 Message Date
董宏宇
34975b4e10 Merge branch 'dev/dev_eagle_architecture_upgrade' into dev/dev_eagle_wuhan_sikua_obu 2021-09-17 15:39:39 +08:00
董宏宇
36335d28c0 抽离hmi到core
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-09-17 15:34:51 +08:00
董宏宇
6b959b12c6 Merge branch 'dev/dev_eagle_architecture_upgrade' into dev/dev_eagle_wuhan_sikua_obu 2021-09-17 10:54:47 +08:00
董宏宇
b58b1f2af5 修复首次启动小智语音崩溃问题
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-09-17 10:54:22 +08:00
董宏宇
f1fd446cad Merge branch 'dev/dev_eagle_architecture_upgrade' into dev/dev_eagle_wuhan_sikua_obu 2021-09-16 21:21:28 +08:00
董宏宇
b2f30750b3 增加开源Utils库,沉淀好久的工具类,后续将所有工具的调用替换成此库
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-09-16 21:20:29 +08:00
董宏宇
62bfbedaa3 调整探路目录关系
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-09-16 20:52:59 +08:00
董宏宇
5d35caa1d4 解决依赖关系
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-09-16 20:46:20 +08:00
董宏宇
bd771f483e 合并重构的项目模块
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-09-16 19:46:40 +08:00
董宏宇
771b5b88b4 Merge branch 'dev/dev_eagle_architecture_upgrade' into dev/dev_eagle_wuhan_sikua_obu
# Conflicts:
#	core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java
#	modules/mogo-module-common/src/main/java/com/mogo/module/common/enums/WarningTypeEnum.kt
#	modules/mogo-module-hmi/build.gradle
#	modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/WarningFloat.kt
#	modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/notification/WarningNotificationConfig.kt
#	modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningContract.kt
#	modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt
#	modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/widget/V2XWarningView.kt
#	modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/warning/MoGoWarningProvider.java
#	modules/mogo-module-obu-mogo/build.gradle
#	modules/mogo-module-obu-mogo/src/main/java/com/mogo/module/obu/mogo/MogoPrivateObuManager.kt
#	services/mogo-service-api/build.gradle
#	settings.gradle
2021-09-16 19:13:24 +08:00
董宏宇
af07586400 优化项目结构
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-09-16 18:23:44 +08:00
董宏宇
390fa9a2c2 架构升级增加目录结构
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-09-16 15:42:53 +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
董宏宇
396fb076fd Cherry pick
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-09-14 18:22:09 +08:00
董宏宇
09efe5abb5 修复同一类型弹窗展示时长重置 2021-09-14 11:21:49 +08:00
董宏宇
12df31f113 修复同一类型弹窗展示时长重置 2021-09-14 11:17:15 +08:00
董宏宇
16f47197e5 修复同一个appid下但是方向不一样的事件提醒tts播报 2021-09-13 20:18:43 +08:00
chenfufeng
1236316ba3 完成了预警红边的迁移HMI调用方式
Signed-off-by: chenfufeng <chenfufeng@zhidaoauto.com>
2021-09-13 14:35:12 +08:00
董宏宇
cd1e2cfcf6 完成了预警红边的迁移HMI
调用方式为
//显示警告红边
mIMoGoWaringProvider!!.showWarning(direction)

Signed-off-by: chenfufeng <chenfufeng@zhidaoauto.com>
2021-09-13 14:32:33 +08:00
董宏宇
2efc04d1d1 完成了预警红边的迁移HMI
调用方式为
//显示警告红边
mIMoGoWaringProvider!!.showWarning(direction)
2021-09-10 22:02:24 +08:00
chenfufeng
1e2bcfae84 删除无用的资源 2021-09-10 16:14:03 +08:00
chenfufeng
73da2deee3 数据下沉到common模块 2021-09-10 16:13:58 +08:00
董宏宇
47579f820f 修改项目名称-》MoGoEagleEye 2021-09-07 20:29:05 +08:00
董宏宇
0aacdacb31 升级room 2021-09-07 11:38:38 +08:00
martindhy
ae6a736f2c Update map version 2021-09-07 01:30:33 +08:00
董宏宇
7faa54ee97 解除高德地图模块依赖关系 2021-09-06 21:01:40 +08:00
董宏宇
5139a2f6e1 解决了一些发布maven的版本依赖,但是卡在了mogo-module-share 2021-09-03 20:01:05 +08:00
董宏宇
294c6d8054 整理gradle版本 2021-09-02 17:44:08 +08:00
董宏宇
b5540308c3 整理Gradle依赖关系 2021-09-02 16:28:16 +08:00
董宏宇
2dd8b53fad 删除 httpdns-tencent
mogo-base-services-apk
   mogo-base-services-sdk
2021-09-01 17:34:49 +08:00
zhongchao
cdcfd2eafa fix bug and circle dependence problem 2021-09-01 17:16:02 +08:00
zhongchao
9b41205800 logic perform upgrade 2021-09-01 17:16:02 +08:00
董宏宇
82852618e8 解除无用的功能模块
:modules:mogo-module-splash-noop
:modules:mogo-module-splash
:modules:mogo-module-media
:modules:mogo-module-guide
2021-08-31 18:44:49 +08:00
董宏宇
8fd7ea31be 删除小地图中没必要的依赖关系 2021-08-30 18:37:25 +08:00
董宏宇
add55b0cb7 升级自研地图
版本	日志
1.0.1-vr-1.0.6
1.增加分区域获取高精数据功能
2.增加设置车相对于屏幕底部的位置
3.修改渲染线的绘制方式
4.增加动态3D模型
2021-08-30 12:10:40 +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
董宏宇
8866bcfaf7 删除没有被依赖的工程初始化 2021-08-26 13:39:37 +08:00
董宏宇
c2d7d121f2 命名规范 2021-08-25 18:38:09 +08:00
zhongchao
5194d5dd49 .. 2021-08-24 11:35:36 +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
董宏宇
de99127baa 重命名脉速表空间 2021-08-20 16:13:08 +08:00
董宏宇
53c3e4bd3b 更新README 2021-08-20 15:29:28 +08:00
董宏宇
ac6b0aa0f4 修复UI,预警红边,红绿灯、限速位置 2021-08-20 13:21:49 +08:00
董宏宇
dffccf2f4a 修复限速位置 2021-08-20 12:10:17 +08:00
董宏宇
47eae5bf0b 修复红绿灯、弹窗背景问题 2021-08-20 12:07:09 +08:00
董宏宇
c73b5720de 处理红个色预警层层级 2021-08-18 17:16:27 +08:00
董宏宇
9da8b0c461 处理特殊车辆,不进行上色 2021-08-18 17:11:08 +08:00
董宏宇
75aed9e6cd 下沉周边交通元素绘制逻辑 2021-08-18 15:56:35 +08:00