Commit Graph

11384 Commits

Author SHA1 Message Date
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
donghongyu
dc2dbf4ebd Rename .java to .kt
Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-10 17:30:22 +08:00
xinfengkun
b4c9396fb7 [pb9][更改PB版本]只有清扫车分支使用的PB 12的版本,主分支使用pb9 2023-01-10 14:52:49 +08:00
xinfengkun
c4876e612f [pb12][清扫车指标数据]添加清扫车指标数据,以及移除老底盘回调,添加int字段用于判断新老底盘来源 2023-01-10 14:51:45 +08:00
donghongyu
084efad76a Merge branch 'dev_robosweeper-d_app-module_221230_1.1.0' into dev_arch_opt_3.0
# Conflicts:
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java
2023-01-09 19:47:47 +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
bxb
bd31ae6f35 Merge branch 'dev_robosweeper-d_app-module_221230_1.1.0' of http://gitlab.zhidaoauto.com/zhjt/AndroidApp/MoGoEagleEye into dev_robosweeper-d_app-module_221230_1.1.0 2023-01-09 18:50:02 +08:00
bxb
639a528246 清扫车左上状态UI布局修改 2023-01-09 18:49:47 +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
bfd1668139 [dev_arch_opt_3.0]
[Change]
[1、删除废弃地图接口]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-09 18:04:42 +08:00
xinfengkun
c2c4d3c6d2 Merge branch 'dev_robosweeper-d_app-module_221230_1.1.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robosweeper-d_app-module_221230_1.1.0 2023-01-09 17:59:37 +08:00
xinfengkun
019f50705d [pb12][重构后的功能状态] 清扫车分支 添加重构后的功能状态接口 2023-01-09 17:47:59 +08:00
xinfengkun
23b96286ee [pb12][清扫车新老底盘兼容] 清扫车分支 老地盘数据转新地盘数据 2023-01-09 16:58:46 +08:00
bxb
240a4bb09f 清扫车日志tag相关添加 2023-01-09 16:36:24 +08:00
donghongyu
855ae3a02f [dev_arch_opt_3.0]
[Change]
[1、升级高精地图修复白天模式崩溃问题]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-09 12:12:26 +08:00
bxb
b26a0bb376 Merge branch 'master' into dev_robosweeper-d_app-module_221230_1.1.0
# Conflicts:
#	gradle.properties
2023-01-09 11:22:18 +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
bxb
d48c59f1bf 清扫车灯态UI修改 2023-01-06 10:58:32 +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
9a6102a4c6 Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0 2023-01-05 18:17:33 +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
pangfan
6dcb72532e Merge branch 'release_robotaxi-d-app-module_2130_221116_2.13.0.1' into 'master'
Release robotaxi d app module 2130 221116 2.13.0.1

See merge request zhjt/AndroidApp/MoGoEagleEye!502
2023-01-05 09:28:56 +00:00
pangfan
beb67528f4 Merge branch 'master' into 'release_robotaxi-d-app-module_2130_221116_2.13.0.1'
# Conflicts:
#   gradle.properties
2023-01-05 09:28:34 +00:00
wangmingjun
5c93b9604f [opt ] 判断乘客屏使用AppIdentityModeUtils.isPassenger方法 2023-01-05 16:41:03 +08:00
lianglihui
0de061b63c 2.13.0 修复小地图轨迹消失异常 2023-01-05 15:10:30 +08:00
zhongchao
6740a518b4 [2.13.0-arch-opt] remove unuse gradle dependence 2023-01-04 21:27:15 +08:00
zhongchao
19d02aa429 [2.13.0-arhc-opt] move monitoring to biz 2023-01-04 21:03:37 +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
donghongyu
9559cfc131 Rename .java to .kt
Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-04 20:00:31 +08:00
xuxinchao
5905bf9f02 [2.13.0]fix红路灯VIP同行图标显示错误和BadCase弹窗位置错误Bug 2023-01-04 15:28:32 +08:00
lianglihui
05c2710f06 2.13.0 修复小地图轨迹消失异常 2023-01-04 15:14:00 +08:00
zhongchao
5e7241af08 [2.13.0-arch-opt] fix bug of dispatch 2023-01-03 22:47:35 +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
86149bf22d [dev_arch_opt_3.0]
[Change]
[1、增加环卫车判断,在打包时候替换模型]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-03 20:03:43 +08:00
donghongyu
f0fc8233f6 [1.1.0]
[Change]
[1、增加清扫车判断方法]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-03 20:02:21 +08:00
donghongyu
0e1041db59 [1.1.0]
[Change]
[1、增加清扫车判断方法]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-03 20:01:00 +08:00
donghongyu
29acd03197 [1.1.0]
[Change]
[1、增加清扫车模型]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-03 19:55:30 +08:00
donghongyu
b15f4f6944 [1.1.0]
[Change]
[1、增加清扫车模型]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-03 19:54:01 +08:00
donghongyu
a97ca2eec3 [opt 3.0]
[Change]
[1、增加注释]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-03 19:50:17 +08:00
donghongyu
12ed7f2436 Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0 2023-01-03 19:21:33 +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
866620b934 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into dev_arch_opt_3.0 2023-01-03 19:20:59 +08:00
wangmingjun
34a1574a3f [opt ] 判断乘客屏使用AppIdentityModeUtils.isPassenger方法 2023-01-03 19:15:00 +08:00