Commit Graph

6137 Commits

Author SHA1 Message Date
zhongchao
642bb6ca65 wait to finish TimeDelayUploadServer 2021-05-13 16:26:56 +08:00
zhongchao
ba23415a24 Merge branch 'dev2_aiSdk' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev2_aiSdk 2021-05-13 15:32:57 +08:00
zhongchao
be30ac60a3 add new func of clicking static marker should visual change ,plus move to marker position 2021-05-13 15:32:47 +08:00
董宏宇
90d02880a2 完成网约车,出租车的Pad适配 2021-05-13 15:11:50 +08:00
董宏宇
9eb3ae86ed Merge remote-tracking branch 'origin/dev2_aiSdk' into dev2_aiSdk 2021-05-13 13:20:51 +08:00
董宏宇
4cd35941ac 完成网约车的滑动View适配 2021-05-13 13:20:45 +08:00
lixiaopeng
71b88892ec opt 2021-05-13 12:39:51 +08:00
lixiaopeng
45cac0d9aa opt 2021-05-13 12:32:50 +08:00
lixiaopeng
b4bb395cca add switch map view 2021-05-13 12:00:28 +08:00
zhongchao
41fed0e1ec add invisible and visible all markers 2021-05-13 11:35:56 +08:00
董宏宇
288f9602d9 修复自动驾驶按钮适配 2021-05-13 10:48:55 +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
41cb1dfd27 Merge branch 'km' into dev2_aiSdk 2021-05-12 18:20:28 +08:00
liujing
1a8e8663e1 车路云预警-显示时间;中景切换部分代码添加(未完成) 2021-05-12 18:20:06 +08:00
董宏宇
d1a943f7a0 Merge remote-tracking branch 'origin/dev2_aiSdk' into dev2_aiSdk 2021-05-11 19:39:29 +08:00
董宏宇
e93a753b71 增加了升级模块,可以通过bugly进行配置
https://beta.bugly.qq.com/apps/f3f8b0b2f1/allupdate?pid=1
2021-05-11 19:39:22 +08:00
liujing
df63e2ac75 Merge branch 'jk' into dev2_aiSdk 2021-05-11 17:15:36 +08:00
liujing
9ae5f05b1d 线绘制代码迁移
首次预警拿不到车的位置,因为未接入ADAS,等提测
2021-05-11 17:15:13 +08:00
liujing
5da8e0ad1d Merge branch 'bb' into dev2_aiSdk 2021-05-11 13:22:38 +08:00
liujing
7393d969af socket消息接受类更名,待联调 2021-05-11 13:22:15 +08:00
liujing
dea7ab363c 备注 2021-05-11 11:56:47 +08:00
liujing
4246be5b38 Merge branch 'mm' into dev2_aiSdk 2021-05-11 11:49:09 +08:00
liujing
13c8c8100c [add] 添加车路云预警socket消息listener 2021-05-11 11:49:00 +08:00
liujing
fdafe4a7e8 Merge branch 'mm' into dev2_aiSdk 2021-05-11 11:14:26 +08:00
liujing
b45b2ac598 车路云预警-代码合并到V2X原代码结构 2021-05-11 11:14:01 +08:00
liujing
6187be62f4 测试代码迁移 2021-05-10 21:01:25 +08:00
liujing
857247e807 统一V2X原有代码设计(scenario+window+marker) 2021-05-10 19:48:01 +08:00
liujing
179166850a Merge branch 'jj' into dev2_aiSdk 2021-05-10 19:43:48 +08:00
liujing
4d81407678 替换3D模型 2021-05-10 19:43:29 +08:00
董宏宇
7a5bc651ad 增加注释 2021-05-10 10:28:43 +08:00
董宏宇
71a7d57b85 优化启动占位 2021-05-08 20:42:33 +08:00
董宏宇
7019d6e392 Merge branch 'qa_yingyan_custom' into dev2_aiSdk 2021-05-08 18:22:56 +08:00
liujing
e6f3814532 Merge branch 'lk' into dev2_aiSdk 2021-05-08 17:40:00 +08:00
liujing
b9a300179e [add] 添加xxhdpi像素车路云预警图片资源 2021-05-08 17:39:32 +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
董宏宇
0d1e192277 删除无效依赖 2021-05-08 16:47:52 +08:00
董宏宇
ef580a5264 Merge remote-tracking branch 'origin/dev2_aiSdk' into dev2_aiSdk 2021-05-08 16:38:33 +08:00
董宏宇
aeadd92db0 删除了位置模拟模块,可使用单独的位置模拟APP来实现,效率更高,且更符合实际驾驶场景 2021-05-08 16:38:21 +08:00
zhongchao
e7dc330fc8 Merge branch 'dev2_aiSdk' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev2_aiSdk 2021-05-08 16:32:18 +08:00
zhongchao
c2bbc0407f fix bug 2021-05-08 16:32:01 +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
董宏宇
223fc500a8 完成最优车道连调 2021-05-07 18:51:20 +08:00
董宏宇
53216f2ca7 删除空模块mogo-tanlu-api 2021-05-07 17:40:00 +08:00
董宏宇
2f1b0071c0 升级地图版本
implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.21'
2021-05-07 17:29:54 +08:00
董宏宇
5f70d7be87 删除了部分测试数据
增加了高德系经纬度
2021-05-07 17:07:07 +08:00
liujing
2ae5f0b80b Merge branch 'km' into dev2_aiSdk 2021-05-07 16:33:20 +08:00