Commit Graph

937 Commits

Author SHA1 Message Date
zhongchao
ebc451d00d [2.13.0]gradle 2022-11-28 17:31:58 +08:00
zhongchao
a18bc05194 [2.13.0] merge problem 2022-11-21 20:51:10 +08:00
zhongchao
5389db47c4 [2.13.0] merge 2.13.0 branch 2022-11-21 18:32:51 +08:00
zhongchao
8a75f3bb22 [2.13.0] merge yakun and code style 2022-11-21 18:30:49 +08:00
zhongchao
ad2d2c2cdf [2.13.0-merge]yakun and code style 2022-11-21 18:07:52 +08:00
yangyakun
1607c60435 Merge branch 'master' into dev_robouiadapter_1062_221117_1.6.2
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml
#	OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/video/VideoActivity.kt
#	OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml
#	OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml
#	OCH/mogo-och-taxi/src/main/res/layout/taxi_navi_view.xml
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
#	core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml
#	core/function-impl/mogo-core-function-hmi/src/main/res/values-xhdpi-2560x1440/color.xml
#	gradle.properties
2022-11-18 10:36:15 +08:00
lixiaopeng
dcf780ed55 同步212 版本 2022-11-15 19:05:33 +08:00
lixiaopeng
30a9c2507c obu 完善 同时兼容两种 obu能力 2022-11-15 17:36:53 +08:00
zhongchao
5489eed272 wait 2022-11-11 13:38:24 +08:00
zhongchao
2156d2cd18 wait 2022-11-10 16:54:26 +08:00
zhongchao
5322d03ec1 wait 2022-11-10 11:58:05 +08:00
zhongchao
a836c31728 wait to finish 2022-11-10 10:54:57 +08:00
lixiaopeng
01d1f42eb5 2.11.1 添加新老obu的兼容,默认ip都不需要修改 2022-11-08 17:55:39 +08:00
zhongchao
fbe1801488 [2.12.0] local code style change 2022-11-08 11:03:10 +08:00
yangyakun
1264c60ab1 [2.8.0-f] dialog适配 2022-11-02 15:47:09 +08:00
yangyakun
0bc581a394 [2.8.0-f] bus busp taxi 适配完成 2022-11-01 17:21:42 +08:00
lixiaopeng
b086425f01 修改事件可能冲突的问题 2022-10-31 17:40:49 +08:00
chenfufeng
0b1370eb65 [Fix]修改'前方施工'为'道路施工' 2022-10-31 11:13:10 +08:00
yangyakun
20509fce0c [2.8.0-f] 屏幕适配 2022-10-28 20:44:07 +08:00
renwj
bc87e347d7 [V2X]弱势交通参与者下发后没有解析 2022-10-28 16:00:37 +08:00
lixiaopeng
076fdc7cae opt 2022-10-27 20:18:18 +08:00
yangyakun
79de6f731f [2.12.0-f] tts 级别 2022-10-25 17:58:48 +08:00
lixiaopeng
3bd3ece6c4 修改cmdb接口 2022-10-20 14:32:43 +08:00
lixiaopeng
f7b2fdd014 统一域名 2022-10-10 15:17:43 +08:00
renwj
850fa814bc [V2X][Road]施工占道事件触发后,标记道路颜色 2022-09-23 19:57:58 +08:00
zhongchao
d7f2c3dad1 add func of identify obj to filter source and add limit twice , demo mode in take over 2022-09-22 14:29:25 +08:00
lixiaopeng
055d186b6d 修改升级接口 2022-09-21 11:13:34 +08:00
zhongchao
f25f909efc add func of take over view and fix bug of tts speak 2022-09-20 19:11:27 +08:00
zhongchao
5303103646 fix the logger add add func of vip check and take over 2022-09-20 15:56:26 +08:00
zhongchao
19e252334a add func of func biz config 2022-09-20 15:56:26 +08:00
zhongchao
699389a794 .. 2022-09-20 15:56:26 +08:00
zhongchao
501e82ea45 wait to finiah 2022-09-20 15:56:26 +08:00
zhongchao
23a648483a add func of configbiz and wait to finish 2022-09-20 15:56:26 +08:00
lixiaopeng
39f95b9aab 添加标牌分类,添加测试数据 2022-09-08 11:39:29 +08:00
lixiaopeng
f8442908cc 修改默认使用obu数据,数据类型修改, 2022-09-07 18:37:19 +08:00
lixiaopeng
c5def34a1a 优化数据,自车正常移动 2022-09-06 17:19:39 +08:00
lixiaopeng
fa019d9755 优化细节 2022-09-05 17:39:25 +08:00
lixiaopeng
1d3a2657e0 添加自研obu的实现 2022-09-02 14:04:09 +08:00
zhongchao
12a925fcbd add func of tracker select of origin and obu sourve 2022-08-29 14:26:10 +08:00
renwj
115f80a972 [V2X]道路施工事件添加多边形区域绘制 2022-08-25 19:35:23 +08:00
zhongchao
d2c11480be fix bug of model and add func obu track 2022-08-25 13:16:39 +08:00
zhongchao
05f4a8b371 ui problem 2022-08-03 20:16:39 +08:00
liujing
34c9bc21e8 [add] UI优化 2022-07-25 21:43:13 +08:00
liujing
fd1461684f Merge branch 'feat_overview_mode_290' into dev_robotaxi-d-app-module_290_220715_2.9.0
全览模式合并到远端290
2022-07-20 11:54:05 +08:00
zhongchao
9c033855af fix bug of map track to show and froze frame obj 2022-06-30 16:19:34 +08:00
renwj
d977d338c8 [V2X]优化道路施工事件的触发逻辑 2022-06-29 18:26:09 +08:00
lixiaopeng
c4c2b3ce7a modify app upgrade 2022-06-29 18:18:52 +08:00
lixiaopeng
c814c59ca5 add app upgrade 2022-06-29 18:18:20 +08:00
renwj
53d8abc954 [V2X]新增道路事件ID 2022-06-29 18:18:20 +08:00
renwj
dec42eabcc [V2X]优化道路施工事件的触发逻辑 2022-06-29 17:12:34 +08:00