yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,186 Commits 1 Branch 0 Tags
04be64e9b9fda9b9fcfe8fa856effca0beeb6282
Commit Graph

125 Commits

Author SHA1 Message Date
yangyakun
b0359c5627 [merge2master] 2023-03-28 17:32:58 +08:00
yangyakun
0a5221353f merge special relase to m1-p 2023-03-27 20:46:10 +08:00
xinfengkun
cf45177f66 [opt3.0]添加OBU系统状态接口 2023-03-15 15:27:21 +08:00
bxb
e75fc7567a Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0 
# Conflicts:
#	core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/report/IPCReportManager.kt
 2023-03-08 19:25:46 +08:00
xinfengkun
e7ea7ae9f4 [opt3.0_back_camera] 福田清扫车后摄像头数据接收 2023-03-06 16:26:23 +08:00
bxb
e4f0e4be87 Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0 2023-03-03 10:46:39 +08:00
xinfengkun
0e1c6e1aba [工控机监控] 修改清扫车不限制档位启动自动驾驶 2023-03-02 14:26:51 +08:00
bxb
314e8b9c77 Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0 
# Conflicts:
#	core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt
 2023-03-01 19:59:48 +08:00
xinfengkun
0cbfc9616e [工控机监控] OBU SDK Java对象转PB对象自测 2023-03-01 19:14:23 +08:00
xinfengkun
b57c490a6f [工控机监控]增加打包信息 2023-03-01 14:24:55 +08:00
bxb
0e75ce4cc8 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
#	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
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficDataView.java
 2023-03-01 09:35:07 +08:00
xinfengkun
1fc73dc097 [工控机监控]验证各车型档位对自动驾驶的影响 2023-02-28 18:15:21 +08:00
xinfengkun
9216aa99f4 [opt3.0][mogo-adas]修改m1不能启动自动驾驶的档位 2023-02-28 18:15:12 +08:00
xinfengkun
601b95772f [工控机监控] 注释掉司机端服务和乘客端连接 2023-02-28 18:04:48 +08:00
xinfengkun
aaf1cb9211 [工控机监控] 注释掉司机端服务和乘客端连接 2023-02-28 18:04:44 +08:00
donghongyu
1e9d2d0006 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/model/SweeperOrderModel.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/util/SweeperAnalyticsManager.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.java
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java
 2023-02-22 17:03:24 +08:00
xinfengkun
961e1eb102 [opt3.0][adas lib] 自动驾驶启动统计对象下沉到adas-data中 2023-02-21 16:58:06 +08:00
donghongyu
cba1b8c1aa 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/model/SweeperOrderModel.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.java
 2023-02-17 14:23:49 +08:00
xinfengkun
2845517249 [工控机监控] 添加显示有效数据长度 2023-02-16 16:00:11 +08:00
donghongyu
190eca3493 Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0 2023-02-13 18:47:04 +08:00
xinfengkun
62f1e11681 [3.0][OBU数据融合] 新增OBU数据接口，将OBU SDK数据转换成与域控相同的PB数据 2023-02-13 16:02:17 +08:00
xinfengkun
53f2c79d4b [adas lib]工控机透传OBU V2I数据精度转换 2023-02-09 15:42:09 +08:00
donghongyu
f4507a7d0f Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0 
# Conflicts:
#	OCH/mogo-och-sweeper/build.gradle
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
#	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/model/SweeperOrderModel.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
#	OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml
 2023-02-08 14:40:42 +08:00
xinfengkun
7fdd6dae57 [adas lib]能否启动自驾以及启动命令下发后成功或失败统计优化 2023-02-07 14:51:42 +08:00
xinfengkun
9fc9062230 [工控机监控]提示错误修改 2023-02-06 16:26:19 +08:00
xinfengkun
a613dcd259 [adas lib]能否启动自驾以及启动命令下发后成功或失败统计优化 2023-02-06 16:20:27 +08:00
xinfengkun
5f48fd6c5a [pb10][Bag包管理2.1]添加录包管理2.1 2023-02-02 15:23:33 +08:00
donghongyu
fdecd41783 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/view/SweeperTrafficLightView.kt
 2023-02-01 19:41:41 +08:00
xinfengkun
3f028b9530 [obu]鹰眼自用OBU 地图回调错误修改 2023-02-01 19:24:35 +08:00
xinfengkun
903c90801f [obu]鹰眼自用OBU PB编写 以及参照原始PB差异化文档编写 2023-02-01 18:34:32 +08:00
xinfengkun
748e4163f2 [工控机监控]优化错误数据提醒 2023-01-31 16:40:22 +08:00
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
xinfengkun
43748bb9f2 [工控机监控]优化显示ID 2023-01-29 16:16:15 +08:00
xinfengkun
a5a8157f6d [pb9][v2i透传] 工控机透传OBU V2I数据接口 2023-01-29 11:12:31 +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
xinfengkun
55492abea1 [工控机监控] 修改工控机监控ID显示 2023-01-16 17:58:24 +08:00
xinfengkun
f68c5cbe20 [pb10][金旅M1][靠边停车] 更新planning决策状态接口 新增了靠边停车状态，添加给planning发送命令接口， 目前用于发送靠边停车指令以及起步命令 2023-01-12 14:54:16 +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
710be52585 [pb9][Bag包管理2.1]添加录包管理2.1 2023-01-10 17:30:45 +08:00
xinfengkun
c4876e612f [pb12][清扫车指标数据]添加清扫车指标数据,以及移除老底盘回调，添加int字段用于判断新老底盘来源 2023-01-10 14:51:45 +08:00
xinfengkun
c9450f6367 [pb12][清扫车指标数据]添加清扫车指标数据,以及移除老底盘回调，添加int字段用于判断新老底盘来源 2023-01-10 14:44:35 +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
019f50705d [pb12][重构后的功能状态] 清扫车分支 添加重构后的功能状态接口 2023-01-09 17:47:59 +08:00
xinfengkun
23b96286ee [pb12][清扫车新老底盘兼容] 清扫车分支 老地盘数据转新地盘数据 2023-01-09 16:58:46 +08:00
xinfengkun
155caf523e [pb9][v2i透传] 工控机透传OBU V2I数据接口 2023-01-05 15:33:45 +08:00
xinfengkun
586849dac9 [opt3.0][adas-other] 移除lib-adas-other 2022-12-19 18:55:06 +08:00
xinfengkun
4b46a48293 [2.13.0][change] 调试程序移除无用引用 2022-11-29 16:27:05 +08:00
yangyakun
4be507613b StatusBar 高度计算 设置background后需要重新设置padding 2022-11-18 12:49:34 +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