Commit Graph

294 Commits

Author SHA1 Message Date
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
donghongyu
5716dc1f4b Cherry pick
Signed-off-by: 董宏宇 <martindhy@gmail.com>
2021-09-14 18:05:02 +08:00
chenfufeng
c2ab7087cb 修复同一个appid下但方向不同的事件提醒tts播报 2021-09-14 11:13:14 +08:00
chenfufeng
63c64cb28e 修复TTS逻辑并解决合并3ee50537时产生的冲突 2021-09-14 11:04:15 +08:00
chenfufeng
1236316ba3 完成了预警红边的迁移HMI调用方式
Signed-off-by: chenfufeng <chenfufeng@zhidaoauto.com>
2021-09-13 14:35:12 +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
董宏宇
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
董宏宇
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
liujing
f1fc89b3b1 [add] 首页监听车辆监控状态,修改检测入口预警标识的显示状态 2021-08-26 19:02:24 +08:00
董宏宇
f7214481a2 增加了OBU提供自车位置的功能 2021-08-25 12:53:50 +08:00
董宏宇
3b84838817 完成红绿灯逻辑 2021-08-18 18:47:33 +08:00
liujing
736d97d13b 后台任务添加:根据后期需求修改指标监测轮询时间,缺少对自动驾驶状态变化的监听 2021-08-17 14:47:24 +08:00
liujing
f27bf40572 [add] 弹框临时测试入口添加 路由接口增加 2021-08-16 20:00:15 +08:00
董宏宇
48b4492938 完成了弹窗 show disable 功能 2021-08-06 16:34:57 +08:00
董宏宇
d6f2721a1c 完成HMI弹窗功能 2021-08-06 14:58:32 +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
董宏宇
be361ca514 升级kotlin版本 2021-08-04 21:08:51 +08:00
董宏宇
c2abe34d00 完成调用接口封装 2021-08-04 18:12:30 +08:00
董宏宇
4a9d18fe5a Rename .java to .kt 2021-08-04 18:12:30 +08:00
董宏宇
5abaeb8554 Complete mogo-module-warning fragment show 2021-08-03 16:44:35 +08:00
董宏宇
98de735586 构建预警模块与OBU模块 2021-08-03 10:33:42 +08:00
董宏宇
9068bf1f8f Add MogoLauncher.modules.mogo-module-hmi 2021-08-02 19:06:32 +08:00
zhongchao
a700bc5541 add new func of httpdns switch city to fit socketserver 2021-07-30 17:22:37 +08:00
董宏宇
e408181eee Merge branch 'qa_hengyang_base' into feature/feature_hengyang_base
# Conflicts:
#	.idea/runConfigurations.xml
2021-07-26 11:08:53 +08:00
lianglihui
831e7ec43c och_taxi 升级socket长连接版本 2021-07-22 14:49:59 +08:00
liujing
322228d906 add testpanel of mock 2021-07-20 13:21:30 +08:00
董宏宇
99c680719f Merge branch 'qa_hengyang_base' into feature/feature_hengyang_base 2021-07-15 17:26:43 +08:00
董宏宇
57a1da6892 增加日志信息 2021-07-13 15:04:48 +08:00
zhongchao
ff61d92a89 fix bug of delay and update map version 2021-07-09 09:25:09 +08:00
martindhy
347f2cbc71 Add check activity 2021-07-04 13:08:03 +08:00
martindhy
19b53e6e87 Init check module 2021-07-04 12:22:38 +08:00
董宏宇
4a5110b5de Complete small map draw line and remove line 2021-06-28 15:45:40 +08:00
zhongchao
512d39b258 Merge branch 'qa_hengyang_base' into dev_hengyang_base 2021-06-25 19:41:13 +08:00
zhongchao
8e506f2da9 add queryRoute interface 2021-06-25 11:00:27 +08:00
lianglihui
e3532f4573 taxi 自动驾驶画线 2021-06-24 12:19:02 +08:00
董宏宇
a55759fa00 Fix small map location follow bug 2021-06-23 21:13:45 +08:00
zhongchao
0a8c361153 finish the route search and wait to finish interface 2021-06-23 16:01:00 +08:00
liujing
45e6382a79 2D弹框预警-进入3D-展示2DUI样式修改:进入3D模式remove掉2D模式下弹框 2021-06-07 19:42:53 +08:00
liujing
374ae7bbbe [add] 暂存-2D进入3D,消除2D下V2X弹框 2021-06-07 10:54:53 +08:00
董宏宇
bb74e84427 Fix bug
修复查看路口、前方车辆直播弹窗动画异常
关闭了一些不必要的bug
删除了测试面板
升级地图版本1.0.0-vr-8.5.36
2021-06-01 20:28:52 +08:00
zhongchao
2eb75905b7 merge dev2_adas 2021-05-25 17:31:31 +08:00
zhongchao
d2773ce83c merge qa_yingyan_custom 2021-05-25 16:25:41 +08:00
zhongchao
4010c27dbe remix the aiCloudSocketData 2021-05-25 15:55:08 +08:00
suyong
d3cdcb14f8 Merge branch 'dev2_aiSdk' into dev2_adas 2021-05-20 13:50:43 +08:00
董宏宇
3d9db5f491 解决小地图在联想pad加载异常的问题 2021-05-19 19:53:14 +08:00
zhongchao
1711747a45 fix bug and wait to finish 2021-05-13 11:31:00 +08:00
suyong
0e4793d9c9 merge aisdk 2021-05-10 15:17:36 +08:00
董宏宇
39d9878d30 改版小地图 实现 方式 2021-05-10 12:05:39 +08:00