Commit Graph

5988 Commits

Author SHA1 Message Date
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
lixiaopeng
56d0a5b812 add mock data 2021-04-19 18:10:59 +08:00
lixiaopeng
b675432059 add push and opt 2021-04-19 18:10:58 +08:00
liujing
b72c490664 右侧识别物测试数据添加 2021-04-19 17:51:29 +08:00
liujing
3abac37a29 代码整理 2021-04-19 17:13:50 +08:00
liujing
3f76d88562 Merge branch 'jk' into dev2_aiSdk 2021-04-19 17:08:10 +08:00
liujing
cefa9a2c78 识别物与碰撞点之间的引导箭头角度调整(未生效) 2021-04-19 17:08:01 +08:00
liujing
4cdb73b8f4 [add] 3d资源添加(箭头) 根据行驶角度调整箭头角度 2021-04-19 17:08:01 +08:00
董宏宇
aef10d0f36 修复小巴车,出租车样式UI 2021-04-16 17:59:47 +08:00
董宏宇
a2ef2bbd44 完成最优路线的颜色梯度计算
增加逻辑,3D模式下关闭道路事件连线的绘制
2021-04-16 17:53:54 +08:00
董宏宇
af05b71bdd 修复小巴车,出租车样式UI 2021-04-16 17:52:38 +08:00
董宏宇
6c9f3180cf Merge branch 'qa_och_bus2' into dev2_aiSdk 2021-04-16 17:04:48 +08:00
lixiaopeng
a003e642b4 opt 2021-04-16 16:03:18 +08:00
liujing
dc314f31cd 前方预警2D红色圆圈位置调整修改,测试代码删除 2021-04-16 14:53:40 +08:00
liujing
cee262b6f3 Merge branch 'ad' into dev2_aiSdk 2021-04-16 14:15:16 +08:00
liujing
91fe226d28 [add] 停止线3D资源添加,红色预警区域补点修改 2021-04-16 14:15:00 +08:00
lixiaopeng
efa66bfac9 opt 2021-04-16 11:30:18 +08:00
liujing
81924502f3 Merge branch 'lk' into dev2_aiSdk 2021-04-16 11:03:01 +08:00