Commit Graph

606 Commits

Author SHA1 Message Date
zhongchao
2c78c3d5cb fix bug of merge 2021-05-25 16:34:21 +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
zhongchao
656f968e6c note the matchRoad and new thead of handle to deal with addDynamicAnchorPosition 2021-05-24 10:56:46 +08:00
zhongchao
29ffe0e810 add log 2021-05-19 17:17:31 +08:00
zhongchao
f6e359bb61 add log 2021-05-19 14:14:20 +08:00
zhongchao
e71fa7325d remake code 2021-05-18 19:37:30 +08:00
zhongchao
485a95561a fix bug 2021-05-18 10:28:32 +08:00
zhongchao
a397ef82f4 add log 2021-05-14 17:59:31 +08:00
zhongchao
76acb2bf3c add log 2021-05-14 14:29:43 +08:00
liujing
06f41295e6 [add] 联想适配v2n-弹框UI 2021-05-13 18:25:35 +08:00
zhongchao
c316825da7 fix bug 2021-05-13 18:03:48 +08:00
zhongchao
a53c0dcf75 add new func of click static marker to change visual and position 2021-05-13 15:29:02 +08:00
zhongchao
1711747a45 fix bug and wait to finish 2021-05-13 11:31:00 +08:00
董宏宇
5bfbca8bb2 Merge remote-tracking branch 'origin/dev2_aiSdk' into dev2_aiSdk 2021-05-12 20:29:06 +08:00
董宏宇
d1dae71bdb 开始小巴车PAD适配工作 2021-05-12 20:29:00 +08:00
liujing
1a8e8663e1 车路云预警-显示时间;中景切换部分代码添加(未完成) 2021-05-12 18:20:06 +08:00
liujing
9ae5f05b1d 线绘制代码迁移
首次预警拿不到车的位置,因为未接入ADAS,等提测
2021-05-11 17:15:13 +08:00
zhongchao
b467198505 fix bug of addMarker 2021-05-11 16:54:35 +08:00
liujing
4d81407678 替换3D模型 2021-05-10 19:43:29 +08:00
zhongchao
470fabfe1b replace the n3d model to fix box length 2021-05-10 16:12:56 +08:00
zhongchao
0739089a30 replace tache.n3d 2021-05-10 15:11:23 +08:00
zhongchao
a3bfafcb67 replace unknow car type 2021-05-08 20:38:55 +08:00
董宏宇
8a9e82954f Merge branch 'dev2_aiSdk' into qa_yingyan_custom
# Conflicts:
#	libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
#	libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java
#	libraries/map-custom/build.gradle
2021-05-08 17:23:44 +08:00
lixiaopeng
1f58033c15 replace n3d 2021-05-08 16:23:08 +08:00
zhongchao
8255967ba1 add new type of adasRecognize is unKnow 2021-05-08 15:13:23 +08:00
zhongchao
21f4aba822 merge 2021-05-07 20:33:45 +08:00
zhongchao
f3510e3570 add new func 2021-05-07 20:29:59 +08:00
liujing
2cf4ed0280 车路云-模拟数据添加 高德坐标 2021-04-30 18:00:51 +08:00
liujing
475089c733 2D图与3D模型规则等设计给出
vrmode暂时关闭,方便测试
2021-04-29 19:57:58 +08:00
liujing
10578f47d8 删除测试数据;gps参数添加,地图侧根据非gps坐标做处理 2021-04-29 11:47:36 +08:00
liujing
47bb176dff 打点option传gps字段 2021-04-28 21:01:50 +08:00
wujifei
d577daf150 Merge remote-tracking branch 'origin/dev2_aiSdk' into dev2_aiSdk 2021-04-28 20:06:08 +08:00
wujifei
4ab0a97121 fix#更换道路事件3D资源 2021-04-28 20:05:48 +08:00
zhongchao
ec5fc67ab6 merge 2021-04-28 19:56:00 +08:00
zhongchao
a19789abf7 add new function of click map static marker 2021-04-28 19:55:10 +08:00
lixiaopeng
f8845daf0e update cloundsdk version and opt collision 2021-04-28 17:24:59 +08:00
董宏宇
0a53b3901d Merge branch 'qa_yingyan_custom' into qa_och_bus2
# Conflicts:
#	modules/mogo-module-common/src/main/java/com/mogo/module/common/uploadintime/SnapshotLocationController.java
2021-04-26 20:44:04 +08:00
董宏宇
635f032bcf 关闭了一些日志
增加了一些注释
删除了一些废弃的UI代码
2021-04-26 20:41:37 +08:00
zhongchao
ec7a407ec9 Merge branch 'qa_yingyan_custom' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_yingyan_custom 2021-04-26 15:08:13 +08:00
zhongchao
2b3a7c2928 add lat lon in test panel 2021-04-26 15:07:56 +08:00
zhongchao
24d97544bc Merge branch 'dev2_aiSdk' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev2_aiSdk 2021-04-26 14:15:07 +08:00
zhongchao
74b2ce27dd add lonlat in testPanel 2021-04-26 14:14:56 +08:00
修改测试数据
3a252c0a75 修改测试数据 2021-04-25 13:18:57 +08:00
lixiaopeng
b87d8f38ff opt 2021-04-23 21:32:13 +08:00
lixiaopeng
390da88ced fix conflict 2021-04-23 18:43:42 +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
liujing
b8c6cc6765 预警数据渲染前清除其他类型 2021-04-22 11:49:07 +08:00
zhongchao
99b82ceeb6 add tileId in uploadData 2021-04-21 16:57:10 +08:00