Commit Graph

574 Commits

Author SHA1 Message Date
donghongyu
eaa2260016 Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0
# Conflicts:
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java
#	app_ipc_monitoring/src/main/java/com/zhidao/adas/client/DataDistribution.java
#	app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java
#	app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/ui/MainActivity.java
#	core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java
#	core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java
#	core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt
#	core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/can/CanImpl.kt
#	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/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java
#	core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotVehicleStateListener.kt
#	core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotVehicleStateListenerManager.kt
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/OnAdasListener.java
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/MyMessageFactory.java
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/VehicleStateMessage.java
2023-01-17 18:09:06 +08:00
donghongyu
f10b9e94d4 Merge branch 'master' into dev_arch_opt_3.0
# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
2023-01-16 11:43:46 +08:00
donghongyu
dd8428fb97 [dev_arch_opt_3.0]
[Change]
[
1、修改了高精地图的设置外部坐标的方法
2、修改了基础、出租车、Bus小地图中的位置回调,使用IMoGoChassisLocationGCJ02Listener。
3、TODO 有些需要高德地图的地方需要改为使用IMoGoChassisLocationGCJ02Listener,WGS84的坐标使用IMoGoChassisLocationWGS84Listener
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-13 17:44:04 +08:00
zhongchao
d8728fe8c9 [2.13.0-arch-opt] move binding car to deva tools 2023-01-12 10:11:23 +08:00
donghongyu
8ceced4bcf Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0 2023-01-11 19:28:41 +08:00
donghongyu
193454cc6c [dev_arch_opt_3.0]
[Change]
[
1、修改底盘数据Gnss回调为定位回调
2、增加WGS84转GCJ02高德坐标系方法
3、增加底盘数据转换为GCJ02坐标系后的回调
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-11 19:28:34 +08:00
xinfengkun
bceea30a52 [pb10][金旅M1][电池状态回调]新增金旅M1控制命令和m1状态回调接口,以及电池状态接口 2023-01-11 19:27:02 +08:00
xinfengkun
a7d179d713 [pb9][底盘接口] 目前由于M1车型不会在新底盘PB添加新的字段 所以临时保留老底盘接口回调,M1新添加的相关字段会在老底盘回调接收,同时老底盘的清扫车对象转成新底盘PB中的清扫车对象,暂时注释掉ADAS LIB中的新老底盘兼容 2023-01-10 18:12:25 +08:00
xinfengkun
65838501c1 Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-01-10 17:31:00 +08:00
xinfengkun
710be52585 [pb9][Bag包管理2.1]添加录包管理2.1 2023-01-10 17:30:45 +08:00
donghongyu
5a56e1ba50 [dev_arch_opt_3.0]
[Change]
[1、将与高精地图相关的车辆转向移动到地图层管理]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-10 17:30:22 +08:00
xinfengkun
c4876e612f [pb12][清扫车指标数据]添加清扫车指标数据,以及移除老底盘回调,添加int字段用于判断新老底盘来源 2023-01-10 14:51:45 +08:00
donghongyu
3a0d94e9a7 Merge branch 'dev_robosweeper-d_app-module_221230_1.1.0' into dev_arch_opt_3.0
# Conflicts:
#	OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CallerLoggerUtils.kt
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java
#	app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt
#	core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt
#	core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoHandAdasMsgManager.java
#	core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt
#	core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java
#	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/smp/SmallMapFragment.java
#	core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/autopilot/IMoGoAutopilotVehicleStateListener.kt
#	core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutopilotVehicleStateListenerManager.kt
#	gradle.properties
#	libraries/mogo-map/src/main/java/com/mogo/map/CustomMapApiBuilder.java
2023-01-09 18:42:03 +08:00
donghongyu
b96577811f [dev_arch_opt_3.0]
[Change]
[1、重命名pnc相关]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-06 12:08:31 +08:00
donghongyu
723540b9a4 [dev_arch_opt_3.0]
[Change]
[1、拆分汽车底盘数据透出,都采用单个类型数据回调]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-05 21:21:02 +08:00
donghongyu
cf94486dfd [dev_arch_opt_3.0]
[Change]
[1、分离清扫车(福田)清扫控制系统状态监听,单独回调]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-05 18:57:20 +08:00
donghongyu
5fcc0f42ea [dev_arch_opt_3.0]
[Change]
[1、分离工控机引导线、全路径规划]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-05 18:17:27 +08:00
donghongyu
2b679720bc [dev_arch_opt_3.0]
[Change]
[1、修复车辆灯数据没有监听bug]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-04 20:43:45 +08:00
donghongyu
06810f339c [dev_arch_opt_3.0]
[Change]
[1、将Call中注册,反注册操作下沉CallerBase]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-04 20:00:32 +08:00
zhongchao
5e7241af08 [2.13.0-arch-opt] fix bug of dispatch 2023-01-03 22:47:35 +08:00
donghongyu
14730f9266 [opt 3.0]
[Change]
[1、增加注释]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-03 19:21:28 +08:00
donghongyu
ed22379ba3 [opt 3.0]
[Change]
[1、迁移autopilot到datacenter]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-03 12:02:49 +08:00
zhongchao
d9077e8847 [2.13.0-arch-opt] merge 2022-12-28 11:37:33 +08:00
donghongyu
704200d03f [opt 3.0]
[Change]
[1、修改msgbox--》datacenter]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-12-22 10:44:53 +08:00