Commit Graph

323 Commits

Author SHA1 Message Date
donghongyu
ac5fa85186 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/model/SweeperOrderModel.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperLimitingVelocityView.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.java
#	OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_list_left_top_line.xml
#	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-hmi/src/main/res/layout/fragment_hmi.xml
2023-01-30 11:58:56 +08:00
lixiaopeng
aa3455a5ab 添加更新速度来源的注释 2023-01-30 11:31:13 +08:00
chenfufeng
5a73a9baf2 [2.13.2][feat]V2X事件汇总的消息加入消息盒子 2023-01-30 11:10:04 +08:00
zhongchao
6d3eeaca50 [2.13.0-arch-opt] merge 2023-01-30 10:47:39 +08:00
lixiaopeng
2a9111c996 fixed conflict 2023-01-29 17:33:43 +08:00
lixiaopeng
b60fbb2613 合并2.13.2的obu验收相关功能 2023-01-29 17:23:41 +08:00
zhongchao
8433d0c8de [2.13.0-arch-opt] hmi proxy replace to view 2023-01-29 16:25:06 +08:00
donghongyu
9a5def9afa [dev_arch_opt_3.0]
[Change]
[
1、删除旧版地图本定位注册
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-28 19:44:46 +08:00
zhongchao
c011549e44 [2.13.0-arch-opt] merge 2023-01-25 23:14:44 +08:00
zhongchao
2265a5ffb8 [2.13.0-arch-opt] merge 2023-01-25 23:13:23 +08:00
zhongchao
7000b84f68 [2.13.0-arch-opt] merge 2023-01-25 23:11:25 +08:00
donghongyu
6d37f3ed28 [dev_arch_opt_3.0]
[Change]
[
1、合并3.0分支
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-17 19:44:44 +08:00
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
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
c656ceea58 [清扫车]贴边数据回调和电量回调 2023-01-11 11:50:19 +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
donghongyu
cc7774c872 [dev_arch_opt_3.0]
[Change]
[1、合并清扫车分支过来,更新了底盘数据pb]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-09 18:50:14 +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
xinfengkun
23b96286ee [pb12][清扫车新老底盘兼容] 清扫车分支 老地盘数据转新地盘数据 2023-01-09 16:58:46 +08:00
donghongyu
40e272cb0b [dev_arch_opt_3.0]
[Change]
[1、移除废弃geo search]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-06 14:22:31 +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
22198c92ec [dev_arch_opt_3.0]
[Change]
[1、解决清扫车状态同步注册未修改bug]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-05 19:32:11 +08:00
donghongyu
69b8e53e14 [dev_arch_opt_3.0]
[Change]
[1、恢复一些在注册监听时候的调用]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-05 19:15:07 +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
zhongchao
19d02aa429 [2.13.0-arhc-opt] move monitoring to biz 2023-01-04 21:03:37 +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
22df250f6f [2.13.0-arch-opt] move dispatch to biz and remove gradle settings 2023-01-03 22:11:57 +08:00
donghongyu
a97ca2eec3 [opt 3.0]
[Change]
[1、增加注释]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-03 19:50:17 +08:00
zhongchao
e82dc525a3 [2.13.0-arch-opt] remove the check module and carcoder module 2022-12-29 20:11:04 +08:00
zhongchao
c411ee4389 [2.13.0-arch-opt] change the gradle files and map gradle config 2022-12-28 17:42:58 +08:00
zhongchao
d9077e8847 [2.13.0-arch-opt] merge 2022-12-28 11:37:33 +08:00
zhongchao
e7648bd9b1 [2.13.0] add func of binding car change model 2022-12-09 12:01:58 +08:00
lixiaopeng
f58df1636d [2.13.0 优化美化模式显示,添加魔方显示状态,重构蓝牙连接功能] 2022-12-07 20:18:18 +08:00
lixiaopeng
23fca9e51b [2.13.0 优化蓝牙连接 ] 2022-12-07 11:16:09 +08:00
lixiaopeng
8a01b1f71d 2.13.0 fixed conflict 2022-12-04 20:04:07 +08:00
xuxinchao
3fc46fbcfc [2.13.0]消息盒子调整UI 2022-12-03 11:37:40 +08:00
zhongchao
e646d4367b add config upload server 2022-12-01 17:38:16 +08:00
xuxinchao
8cb6dba885 [2.13.0]消息盒子 2022-12-01 15:08:00 +08:00
chenfufeng
79e4767cc0 [2.13.0][fix]添加查询消息盒子历史数据 2022-12-01 11:53:23 +08:00
xuxinchao
576a0c6add [2.13.0]消息盒子 2022-11-30 23:32:00 +08:00
chenfufeng
b186d67541 [2.13.0][fix]订单开始的时候全览地图轮询V2X事件 2022-11-30 16:48:32 +08:00
zhongchao
621c8f36d2 [2.13.0] fix bug of sn token invoke 2022-11-30 12:59:28 +08:00
xuxinchao
2f9034a1ac [2.13.0]消息盒子司机端 2022-11-30 09:04:42 +08:00
chenfufeng
69c32f0ade [2.13.0_feat]全览地图V2X事件 2022-11-29 16:49:32 +08:00
chenfufeng
5a9708581c [2.13.0_update]已处理的录包消息需清除 2022-11-29 10:54:41 +08:00