Commit Graph

322 Commits

Author SHA1 Message Date
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
79780c804b [change] 统计回调添加注册取消注册 2022-11-09 14:51:20 +08:00
xinfengkun
773e8e57a6 [change] 添加启动自动驾驶失败回调,以及启动自动驾驶统计回调,启动自动驾驶统计回调注册形式分发 2022-11-07 14:56:52 +08:00
pangfan
a676ea93c9 opt:merge conflict resolved(清扫车司机端app修改引入) 2022-10-31 14:23:20 +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
9300baf426 [change] 更新行程信息接口 2022-10-26 11:34: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
zhongchao
f98195788b merge 2022-10-24 11:15:57 +08:00
chenfufeng
6a206ba7fe [Fix]解决docker2.3.0乘客屏不渲染感知定位等数据 2022-10-21 14:58:01 +08:00
xuxinchao
6cdfc4b1f0 BadCase录包 2022-10-21 09:58:16 +08:00
xuxinchao
8837bde8a5 BadCase录包 2022-10-20 19:37:20 +08:00
lixiaopeng
553b26da7d Merge branch 'dev_robotaxi-d-app-module_2120_221017_2.12.0' into dev_robotaxi-d-app-module_2110_220915_2.11.0_gkjpb 2022-10-20 19:13:45 +08:00
lixiaopeng
dffef06340 添加行程信息接口 2022-10-20 18:29:04 +08:00
xuxinchao
db18f69471 SOP面板 2022-10-20 18:00:28 +08:00
lixiaopeng
ada7044520 opt log 2022-10-20 14:52:33 +08:00
xinfengkun
ded5a700e1 [change] 更新数据采集配置 添加参数 2022-10-18 21:42:53 +08:00
chenfufeng
0169a68d1e [Fix]解决司机屏连接工控机失败的问题 2022-10-12 20:07:42 +08:00
chenfufeng
a7ca4752b1 [Fix]docker2.3.0司机屏比乘客屏先拿到车辆配置信息时不转发数据给乘客屏 2022-10-12 16:48:34 +08:00
renwj
d470cf38de [Route][Log]添加日志追踪引导线绘制问题 2022-10-11 19:02:30 +08:00
chenfufeng
820a3517e3 [Fix]须先连接工控机再设置数据监听器 2022-10-10 17:27:07 +08:00
chenfufeng
9667ff224b [Fix]兼容2.3.0的docker版本 2022-10-09 19:29:03 +08:00
lixiaopeng
be020d6cb4 优化升级 2022-09-28 19:27:12 +08:00
lixiaopeng
748a648249 优化升级 2022-09-28 18:07:53 +08:00
chenfufeng
26b6eaa51d [Fix]乘客屏先不传sn给工控机 2022-09-28 10:27:35 +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
chenfufeng
1c2b42c5c8 [Feat]每10s司机屏同步一次数据到所有乘客屏 2022-09-23 14:41:59 +08:00
chenfufeng
f815c71c4d [Fix]解决美化模式时序问题 2022-09-23 14:41:59 +08:00
chenfufeng
d4937769f9 [Feat]乘客屏直连工控机 2022-09-23 14:41:59 +08:00
zhongchao
1a50a2911b remove note log and chainlog 2022-09-23 12:15:35 +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
zhongchao
e17a31a0a2 fic bug of appconfiginfo 2022-09-20 15:56:26 +08:00
xinfengkun
804ff55403 [change] 添加是否可以启动自动驾驶回调接口 2022-09-20 15:13:01 +08:00
chenfufeng
09580410ad [Fix]同步美化模式状态 2022-09-15 15:28:30 +08:00
chenfufeng
885b1e8e79 [Fix]同步美化模式状态 2022-09-14 20:20:37 +08:00
renwj
53172adfae Revert "[状态栏]添加日志追踪循迹状态延时更新"
This reverts commit 39593df458.
2022-09-14 17:52:46 +08:00
renwj
39593df458 [状态栏]添加日志追踪循迹状态延时更新 2022-09-14 11:07:45 +08:00
donghongyu
b4bf35a192 [Change]
A、修复点云乘客端docker版本获取失败的情况

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-09-13 20:37:09 +08:00
renwj
6276c57784 [CodeFix]优化工控机状态上传逻辑 2022-09-09 17:09:41 +08:00
xinfengkun
2b327b0c17 [change] 修改分发数据线程死亡时无法转发数据bug 2022-09-08 18:28:02 +08:00
donghongyu
056a7274a6 [Change]
A、修复默认没有订阅点云的问题

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-09-06 18:22:16 +08:00
lixiaopeng
b18cae9677 opt 2022-09-01 17:46:55 +08:00
lixiaopeng
a4e48a5b5a opt 2022-08-30 11:02:14 +08:00
lixiaopeng
a1d9fed999 fixed conflict 2022-08-30 10:41:49 +08:00
lixiaopeng
fd99007dd1 fixed conflict 2022-08-30 10:11:29 +08:00
xinfengkun
89ce3c59fc Merge branch 'robosweeper-d-app-module_290_0816' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into robosweeper-d-app-module_290_0816 2022-08-29 14:03:05 +08:00
“donghongyu-mackbook”
15004d1622 [Change]
A、增加点云动态订阅功能

Signed-off-by: “donghongyu-mackbook” <donghongyu@zhidaoauto.com>
2022-08-29 12:01:11 +08:00
“donghongyu-mackbook”
cb054276b5 [Change]
A、增加点云动态订阅功能

Signed-off-by: “donghongyu-mackbook” <donghongyu@zhidaoauto.com>
2022-08-25 15:29:48 +08:00