Commit Graph

6005 Commits

Author SHA1 Message Date
董宏宇
e49af51597 Merge remote-tracking branch 'origin/dev2_aiSdk' into dev2_aiSdk
# Conflicts:
#	modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data.json
#	modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_left.json
#	modules/mogo-module-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json
2021-04-25 16:56:27 +08:00
lixiaopeng
b87d8f38ff opt 2021-04-23 21:32:13 +08:00
zhongchao
48d5bc9044 fixbug 2021-04-23 21:02:02 +08:00
董宏宇
7a541c62e8 修改了测试数据 2021-04-23 20:22:54 +08:00
liujing
b90f5c5927 Merge branch 'jk' into dev2_aiSdk 2021-04-23 20:07:03 +08:00
liujing
4f1be59e06 测试数据 2021-04-23 20:06:44 +08:00
lixiaopeng
390da88ced fix conflict 2021-04-23 18:43:42 +08:00
zhongchao
cc08ef6a14 Merge branch 'dev2_aiSdk' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev2_aiSdk 2021-04-23 18:42:34 +08:00
zhongchao
aea4664a36 update custom-map version to 8.5.10 2021-04-23 18:41:52 +08:00
董宏宇
649cbbedeb Merge remote-tracking branch 'origin/dev2_aiSdk' into dev2_aiSdk 2021-04-23 18:39:37 +08:00
董宏宇
1639a93331 修改了测试数据 2021-04-23 18:39:31 +08:00
liujing
aa74a8440d tts播报测试数据 2021-04-23 18:39:11 +08:00
董宏宇
ed10bf56a8 将测试场景使用命令行adb 进行测试,不再推荐使用测试面板V2XTestConsoleWindow.java
TestPanelBroadcastReceiver.java
// 使用命令行触发各种测试场景演示
adb shell am broadcast -a com.v2x.test_panel_control   --ei sceneType 1
2021-04-23 18:02:31 +08:00
liujing
a1f12a7e68 Merge branch 'hj' into dev2_aiSdk 2021-04-23 17:03:44 +08:00
liujing
bb4632fc25 模拟数据判断条件 2021-04-23 17:03:32 +08:00
liujing
bfe76e0b25 Merge branch 'hj' into dev2_aiSdk 2021-04-23 16:39:41 +08:00
liujing
5701cf1927 根据识别物方向显示不同方向的红色蒙层 2021-04-23 16:39:04 +08:00
zhongchao
32cdf27dbf merge origin dev2_aiSdk 2021-04-23 15:59:06 +08:00
zhongchao
43c85593fb merge qa_aiSdk 2021-04-23 15:57:39 +08:00
zhongchao
ad72c1ca1d remove unuse code 2021-04-23 11:58:38 +08:00
董宏宇
3db946ebff Merge remote-tracking branch 'origin/dev2_aiSdk' into dev2_aiSdk 2021-04-22 17:51:49 +08:00
董宏宇
6b9cfd9273 Merge branch 'qa_och_bus2' into dev2_aiSdk 2021-04-22 17:51:36 +08:00
董宏宇
898f36b105 对广播测试模块增加了注释说明 2021-04-22 17:50:45 +08:00
zhongchao
4ce40db22b .. 2021-04-22 17:13:39 +08:00
lixiaopeng
e57d24c83a upgrade map version 2021-04-22 16:45:35 +08:00
lixiaopeng
821f532d04 opt 2021-04-22 16:37:33 +08:00
董宏宇
12993674a6 Merge branch 'qa_och_bus2' into dev2_aiSdk
# Conflicts:
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
2021-04-22 15:48:32 +08:00
董宏宇
c29dc67562 增加注释 2021-04-22 15:35:31 +08:00
liujing
36ae7ea52d Merge branch 'lk' into dev2_aiSdk 2021-04-22 11:49:29 +08:00
liujing
b8c6cc6765 预警数据渲染前清除其他类型 2021-04-22 11:49:07 +08:00
zhongchao
99b82ceeb6 add tileId in uploadData 2021-04-21 16:57:10 +08:00
liujing
e7435e3cc6 测试数据 2021-04-21 15:15:17 +08:00
liujing
9c38981e87 Merge branch 'ss' into dev2_aiSdk 2021-04-20 17:55:27 +08:00
liujing
c774dea2be no message 2021-04-20 17:54:55 +08:00
liujing
8d9a1a48b7 停止线绘制避免重复,绘制前先清除 2021-04-20 17:54:07 +08:00
liujing
f1786a705d 指引箭头资源替换 2021-04-20 17:21:17 +08:00
董宏宇
22c995973f Merge branch 'qa_och_taxi2' into dev2_aiSdk 2021-04-20 16:40:49 +08:00
董宏宇
eaa5db9b57 Merge branch 'qa_aiSdk' into dev2_aiSdk
# Conflicts:
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401020.java
2021-04-20 16:40:13 +08:00
董宏宇
afeb8d6362 Merge remote-tracking branch 'origin/dev2_aiSdk' into dev2_aiSdk 2021-04-20 16:39:38 +08:00
董宏宇
965aa42617 修改了最优路线推荐推送渠道 2021-04-20 16:38:47 +08:00
liujing
3c28f799d4 Merge branch 'kk' into dev2_aiSdk 2021-04-20 16:19:40 +08:00
liujing
4fd26996d1 [add] 测试数据 指引箭头3D资源替换 2021-04-20 16:19:18 +08:00
董宏宇
f35c0e9cda 升级AiSDK,解决了null异常 2021-04-20 12:50:24 +08:00
董宏宇
118fba9fe9 Merge remote-tracking branch 'origin/dev2_aiSdk' into dev2_aiSdk 2021-04-20 11:06:14 +08:00
董宏宇
8b93fd267e 将车辆位置观察者设置为单利模式 2021-04-20 11:06:10 +08:00
liujing
faaa832cb4 锚点改变角度 2021-04-20 11:05:34 +08:00
wujifei
3532f5c68d Merge remote-tracking branch 'origin/dev2_aiSdk' into dev2_aiSdk 2021-04-19 20:15:53 +08:00
wujifei
5a1cdf4ce1 fix#屏蔽vr模式下疲劳驾驶弹窗 2021-04-19 20:15:19 +08:00
董宏宇
1a79d96906 Merge remote-tracking branch 'origin/dev2_aiSdk' into dev2_aiSdk 2021-04-19 20:06:05 +08:00
董宏宇
de3fac9e82 删除app2模块,模块没有实际用处 2021-04-19 20:05:51 +08:00