Commit Graph

1285 Commits

Author SHA1 Message Date
lixiaopeng
27e2aa93d9 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into dev_robotaxi-d-app-module_mogo-obu-sdk_220926_2.11.1_temp 2022-11-16 21:38:13 +08:00
pangfan
2b38bf67c0 Merge remote-tracking branch 'origin/release_robotaxi-d-app-module_2120_221017_2.12.0.1'
# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
#	core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/MessageType.java
2022-11-15 11:23:39 +08:00
xinfengkun
5f972dd012 [change] 更新MAP2.10.0 监控事件 2022-11-14 15:43:26 +08:00
lianglihui
b9c0718d63 2.12.0 hdmap mapParams 增加地图显示数据类型 2022-11-09 16:28:07 +08:00
lianglihui
9a43fe76dc 2.12.0 hdmap mapParams 增加地图显示数据类型 2022-11-09 16:26:53 +08:00
xinfengkun
60306d66ba [change] 修改自动自动驾驶默认超时时间 2022-11-08 11:11:23 +08:00
xinfengkun
67a2c13b21 Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' into dev_robotaxi-d-app-module_2120_221017_2.12.0_launch_autopilot_fail 2022-11-07 15:01:07 +08:00
xinfengkun
773e8e57a6 [change] 添加启动自动驾驶失败回调,以及启动自动驾驶统计回调,启动自动驾驶统计回调注册形式分发 2022-11-07 14:56:52 +08:00
renwj
4cb74d799f [Code]优化代码逻辑 2022-11-04 14:06:09 +08:00
renwj
46106aab9e [CrashFix]修正地图清标记是引发的空指针 2022-11-03 19:05:04 +08:00
xinfengkun
e10e5fbc37 [change] 添加注释 2022-11-03 17:22:19 +08:00
xinfengkun
6423d2cbb4 [change] 添加注释 2022-11-03 17:21:47 +08:00
xinfengkun
c6d4685d15 [change] 更新PB注释 2022-11-03 17:12:03 +08:00
xinfengkun
1a007143e4 [change] 更新PB 2022-11-03 17:10:52 +08:00
xinfengkun
76acbbeba2 [change] 修改平行驾驶值状态,以及PB备注 2022-11-03 15:55:08 +08:00
pangfan
a68463a813 Merge branch 'master' into 'release_robotaxi-d-app-module_2110_220915_2.11.0.1'
# Conflicts:
#   app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java
#   core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java
2022-10-31 03:08:24 +00:00
xinfengkun
b80700e8fd [change] 修改adas日志默认关闭 2022-10-28 11:42:34 +08:00
xinfengkun
9300baf426 [change] 更新行程信息接口 2022-10-26 11:34:02 +08:00
xinfengkun
2534ec726d Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_2120_221017_2.12.0 2022-10-25 17:57:06 +08:00
xinfengkun
a5768276de [change] 更新MAP290监控事件 2022-10-25 17:56:55 +08:00
lixiaopeng
453c08d34b 删除魔戒的实现,添加操作魔方的约束 2022-10-25 17:23:02 +08:00
wangmingjun
a718188b99 Merge branch 'test_robotaxi-d-app-module_2110_220915_2.11.0.1' into dev_robotaxi-d-app-module_2120_221017_2.12.0
# Conflicts:
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
2022-10-25 14:51:01 +08:00
renwj
de5eabd2c1 [V2X][Road]添加所有marker清空监听回调;解决相关bug 2022-10-21 19:46:49 +08:00
xinfengkun
61d94b8043 添加协议注释 2022-10-21 16:02:44 +08:00
lixiaopeng
dffef06340 添加行程信息接口 2022-10-20 18:29:04 +08:00
lixiaopeng
27bf4fe7be 添加外屏相关的pb 2022-10-20 11:43:22 +08:00
xinfengkun
4ba9d30d6c [change] 修改type名称 2022-10-19 10:46:40 +08:00
xinfengkun
2ead50a928 [change] 更新设置参数命令 接口 添加绕障类功能开关 变道绕障的目标障碍物速度阈值 2022-10-19 10:42:13 +08:00
xinfengkun
ded5a700e1 [change] 更新数据采集配置 添加参数 2022-10-18 21:42:53 +08:00
xinfengkun
9aa751bfda [change] 更新主动录制bag包重载方法 2022-10-18 20:30:48 +08:00
lixiaopeng
0c956bd16e 对特定topic进行录制 2022-10-18 19:27:21 +08:00
lixiaopeng
e4310caab8 修改最新的pb 2022-10-18 18:20:37 +08:00
lixiaopeng
42104bc48d 添加绕桩开关和绕桩速度设置 2022-10-17 16:50:48 +08:00
zhongchao
36e1ce01db remove unuse log 2022-10-10 18:05:37 +08:00
zhongchao
7212e2de56 add log to test 2022-10-10 18:05:37 +08:00
zhongchao
ac32d101cb remove lig 2022-10-09 12:21:59 +08:00
xinfengkun
9515cb7db2 [change] 临时加入日志 用于卡顿问题查找 2022-10-06 23:36:07 +08:00
xinfengkun
af6d528682 [change] 临时开启工控机命令发送LOG 2022-09-29 17:03:50 +08:00
xinfengkun
163612b45d [change] 分发线程业务优化,新增可配置分发线程 2022-09-29 16:38:53 +08:00
renwj
1d0f1422d5 [V2X][Road]优化道路标记颜色逻辑
[V2X][Road]优化道路标记颜色逻辑2
2022-09-28 17:23:42 +08:00
zhongchao
6f5a63655b test 2022-09-28 16:12:02 +08:00
yangyakun
625f246bc9 [2110] 地图版本回归等待高精地图发布 2022-09-28 15:38:27 +08:00
renwj
06b66354f8 [地图SDK]升级至2.6.0.3-增加获取道路名称接口 2022-09-28 11:00:38 +08:00
aibingbing
fa090ed8ba [清扫车][merge]: 合并清扫车司机端V1.0.0代码时,对比master分支代码,reset 无关的代码修改; 2022-09-26 20:44:00 +08:00
aibingbing
6a21e175b4 Merge branch 'master' into release_robosweeper-d_100-sweeper_220830_1.0.0.1_merge
# Conflicts:
#	app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java
#	core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt
#	core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.kt
#	core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java
#	core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapPointCloudSubscriber.kt
#	core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotProvider.kt
#	gradle.properties
#	libraries/mogo-adas-data/src/main/proto/message_pad.proto
#	libraries/mogo-adas-data/src/main/proto/special_vehicle_task_cmd.proto
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/common/MessageType.java
2022-09-26 19:16:37 +08:00
zhongchao
a690584760 fix bug of car color and biz config upper case 2022-09-26 15:00:46 +08:00
renwj
850fa814bc [V2X][Road]施工占道事件触发后,标记道路颜色 2022-09-23 19:57:58 +08:00
lixiaopeng
1760e03065 merge 2022-09-22 18:39:20 +08:00
donghongyu
43ea5777e1 [Change]
A、还原改动

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-09-21 19:23:27 +08:00
donghongyu
c3dff0f748 [Change]
A、将位置信息回调由高精地图回调,调整为直接将工控机数据回调给各个模块

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-09-21 19:10:21 +08:00