Commit Graph

4266 Commits

Author SHA1 Message Date
zhongchao
2eb75905b7 merge dev2_adas 2021-05-25 17:31:31 +08:00
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
suyong
d3cdcb14f8 Merge branch 'dev2_aiSdk' into dev2_adas 2021-05-20 13:50:43 +08:00
suyong
33a59ed884 adas版本升级 2021-05-20 10:41:56 +08:00
董宏宇
e61195150d 解决小地图在联想pad加载异常的问题 2021-05-19 19:59:31 +08:00
董宏宇
1f82226ffc Merge branch 'dev2_smp_change' into dev2_aiSdk 2021-05-19 19:54:44 +08:00
董宏宇
3d9db5f491 解决小地图在联想pad加载异常的问题 2021-05-19 19:53:14 +08:00
zhongchao
29ffe0e810 add log 2021-05-19 17:17:31 +08:00
zhongchao
add1a658c8 add filter channel 2021-05-19 16:34:33 +08:00
suyong
e513eba5ae Revert "增加Log"
This reverts commit eebf438322.
2021-05-19 14:30:42 +08:00
zhongchao
f6e359bb61 add log 2021-05-19 14:14:20 +08:00
wujifei
fa07292841 Merge remote-tracking branch 'origin/dev2_aiSdk' into dev2_aiSdk 2021-05-19 11:05:22 +08:00
wujifei
a3735fdc7f new#优化V2X事件UI 2021-05-19 11:05:03 +08:00
zhongchao
8d61b025e0 wait to finish 2021-05-19 10:34:23 +08:00
suyong
eebf438322 增加Log 2021-05-18 19:43:12 +08:00
zhongchao
e71fa7325d remake code 2021-05-18 19:37:30 +08:00
董宏宇
2f864fc3d5 Merge branch 'dev2_aiSdk' into dev2_smp_change 2021-05-18 17:43:11 +08:00
zhongchao
05793420de Merge branch 'dev2_aiSdk' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev2_aiSdk 2021-05-18 16:30:42 +08:00
zhongchao
71f8f71a3b wait to finish 2021-05-18 16:30:34 +08:00
wujifei
83331bbaa5 new#优化V2X事件UI 2021-05-18 11:19:36 +08:00
zhongchao
485a95561a fix bug 2021-05-18 10:28:32 +08:00
wujifei
e2a2c306bb Merge remote-tracking branch 'origin/dev2_aiSdk' into dev2_aiSdk
# Conflicts:
#	modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml
2021-05-17 17:43:07 +08:00
wujifei
2843807e1a new#优化V2X事件UI 2021-05-17 17:42:12 +08:00
zhongchao
5ea0007c55 Merge branch 'dev2_aiSdk' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev2_aiSdk 2021-05-17 16:50:29 +08:00
zhongchao
9f2eb25774 add new func of mockData 2021-05-17 16:50:17 +08:00
wujifei
fecfd46b84 Merge remote-tracking branch 'origin/dev2_aiSdk' into dev2_aiSdk 2021-05-17 16:49:52 +08:00
wujifei
1b2feb6c47 new#优化速度表盘UI 2021-05-17 16:49:33 +08:00
董宏宇
728b4bd2de 修改最优车道推荐ui适配 2021-05-17 16:27:17 +08:00
zhongchao
5ea48d4f35 adjust view of live 2021-05-17 14:54:06 +08:00
zhongchao
a397ef82f4 add log 2021-05-14 17:59:31 +08:00
董宏宇
e44f0daf58 Merge remote-tracking branch 'origin/dev2_aiSdk' into dev2_aiSdk 2021-05-14 15:55:26 +08:00
wujifei
4b9f6cdbe8 Merge remote-tracking branch 'origin/dev2_aiSdk' into dev2_aiSdk
# Conflicts:
#	modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
2021-05-14 14:53:04 +08:00
wujifei
4ef9314aac new#适配联想pad 2021-05-14 14:51:51 +08:00
zhongchao
76acb2bf3c add log 2021-05-14 14:29:43 +08:00
董宏宇
19dd3996e9 适配切换视角样式 2021-05-14 13:10:25 +08:00
董宏宇
3f2a2db46d 适配切换视角样式 2021-05-14 12:50:29 +08:00
liujing
06f41295e6 [add] 联想适配v2n-弹框UI 2021-05-13 18:25:35 +08:00
zhongchao
fc00bc297a Merge branch 'dev2_aiSdk' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev2_aiSdk 2021-05-13 18:05:17 +08:00
zhongchao
8bcb1c996e fix bug 2021-05-13 18:05:06 +08:00
zhongchao
c316825da7 fix bug 2021-05-13 18:03:48 +08:00
lixiaopeng
ff340e54b8 opt 2021-05-13 16:44:10 +08:00
zhongchao
0da0cdc378 Merge branch 'dev2_aiSdk' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev2_aiSdk 2021-05-13 16:40:04 +08:00
zhongchao
9490abefb2 fix bug of addOnlinecar in vrmode 2021-05-13 16:39:52 +08:00
zhongchao
37256012ba fix bug of add onlinecar 2021-05-13 16:38:52 +08:00
董宏宇
a936d37e46 Merge remote-tracking branch 'origin/dev2_aiSdk' into dev2_aiSdk 2021-05-13 16:35:31 +08:00
董宏宇
e3104e2c45 增加了V2X中Pad适配 2021-05-13 16:35:24 +08:00
lixiaopeng
744117770b opt 2021-05-13 16:34:55 +08:00