Commit Graph

11533 Commits

Author SHA1 Message Date
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
donghongyu
8be6c14004 Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0
# Conflicts:
#	core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt
2023-02-01 19:31:36 +08:00
donghongyu
6c2d19f9c2 [dev_arch_opt_3.0]
[Change]
[
1、修改OBU数据PB回调
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-01 19:30:47 +08:00
xinfengkun
dfc3560001 Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-02-01 19:24:46 +08:00
xinfengkun
3f028b9530 [obu]鹰眼自用OBU 地图回调错误修改 2023-02-01 19:24:35 +08:00
donghongyu
3c8f69d83a [dev_arch_opt_3.0]
[Change]
[
1、修复刹车等异常@钟超
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-01 19:07:04 +08:00
donghongyu
57ee81a459 Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0 2023-02-01 18:35:45 +08:00
donghongyu
4e9ca58409 [dev_arch_opt_3.0]
[Change]
[
1、增加控制定位HZ的回调用
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-01 18:35:39 +08:00
xinfengkun
76b9abf4b2 Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-02-01 18:34:39 +08:00
xinfengkun
903c90801f [obu]鹰眼自用OBU PB编写 以及参照原始PB差异化文档编写 2023-02-01 18:34:32 +08:00
zhongchao
d7c5bf4e46 [2.13.0-arch-opt] fix bug of och-taxi xml 2023-02-01 18:19:31 +08:00
zhongchao
25663f087b [2.13.0-arch-opt] merge 2023-02-01 17:57:36 +08:00
lixiaopeng
2df96d3dac Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-02-01 16:52:31 +08:00
lixiaopeng
52bc276157 同步魔方的最新改动 2023-02-01 16:52:24 +08:00
xuxinchao
f9eeef8cb9 [Opt3.0]消息盒子 2023-02-01 16:26:53 +08:00
donghongyu
ab2a89a623 [dev_arch_opt_3.0]
[Change]
[
1、MoGoObuListenerImpl实现数据回调
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-01 14:31:40 +08:00
donghongyu
3211ef5956 [dev_arch_opt_3.0]
[Change]
[
1、拆分Obu数据回调接口,等待凤坤pb提交后在统一数据调用
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-01 14:06:58 +08:00
chenfufeng
f0d9f701ed [Feat]新增全览地图View 2023-02-01 11:20:39 +08:00
donghongyu
acd1b3b584 [dev_arch_opt_3.0]
[Change]
[
1、修复依赖关系重复
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-31 18:53:35 +08:00
lixiaopeng
1e7bd1c749 Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-01-31 18:31:27 +08:00
lixiaopeng
fb84e5aaff 添加转向灯相关注释 2023-01-31 18:31:20 +08:00
xuxinchao
6e94255d15 [opt3.0]消息盒子 2023-01-31 18:09:49 +08:00
donghongyu
67e3fb6f6d Merge remote-tracking branch 'origin/dev_robosweeper-d_app-module_221230_1.1.0' into dev_robosweeper-d_app-module_221230_1.1.0 2023-01-31 17:55:15 +08:00
donghongyu
7ea53b06cc [dev_arch_opt_3.0]
[Change]
[
1、修复限速合并冲突
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-31 17:55:08 +08:00
bxb
1bf71b4c38 [清扫车]任务列表切换到当前任务简单逻辑处理 2023-01-31 17:38:23 +08:00
donghongyu
417db47d77 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/SweeperLimitingVelocityView.kt
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.java
#	OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml
2023-01-31 17:25:18 +08:00
donghongyu
c591a30752 [dev_arch_opt_3.0]
[Change]
[
1、修复清扫车红绿灯View初始化异常
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-31 17:11:33 +08:00
xuxinchao
0a10c1876c [Opt3.0]消息盒子 2023-01-31 16:56:57 +08:00
xinfengkun
748e4163f2 [工控机监控]优化错误数据提醒 2023-01-31 16:40:22 +08:00
chenfufeng
5d8548e7ef [Opt]去掉冗余的导入 2023-01-31 15:32:17 +08:00
chenfufeng
dcc98b078b [Opt3.0]新增StartUp模块并调整启动顺序 2023-01-31 15:32:17 +08:00
chenfufeng
fa04cc6f0b [Opt3.0]新增StartUp模块 2023-01-31 15:32:17 +08:00
zhongchao
d3f0ac654b [2.13.0-arch-opt] fix bug of limit speed and move view 2023-01-31 15:28:42 +08:00
renwj
e01716f30a [dev_arch_opt_3.0][v2x]v2x代码重构 2023-01-31 12:21:51 +08:00
donghongyu
6bc41b01fa [dev_arch_opt_3.0]
[Change]
[
1、TODO 清扫车限速有问题
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-31 11:45:10 +08:00
donghongyu
a8cfaa8fff [dev_arch_opt_3.0]
[Change]
[
1、修复合并异常
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-31 10:43:13 +08:00
zhongchao
66db271f6c [2.13.0-arch-opt] merg 2023-01-30 22:29:40 +08:00
zhongchao
d46c11767d [2.13.0-arch-opt] merg 2023-01-30 22:28:02 +08:00
renwj
2baf4aa785 [dev_arch_opt_3.0][fix]修正因位置回调重构造成的v2x事件不显示问题 2023-01-30 19:11:16 +08:00
lixiaopeng
0b84b3855e 添加新的obu sdk日志的开关功能 2023-01-30 18:13:25 +08:00
lixiaopeng
4625895e42 fixed obu conflict 2023-01-30 18:02:03 +08:00
lixiaopeng
fa04ed406e 去掉老obu的功能,合并EventTypeEnumNew 2023-01-30 17:49:17 +08:00
donghongyu
dac6741055 [dev_arch_opt_3.0]
[Change]
[
1、迁移mogo-core-function-obu-mogo工程到MoGoEagleEye.core.function-impl.mogo-core-function-datacenter,后续进行数据及视图拆离
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-30 16:52:39 +08:00
wangmingjun
f0a02e4d01 [opt] OCH模块去除引用v2x 2023-01-30 15:40:23 +08:00
yangyakun
995189fcec [dev_arch_opt_3.0]
[添加noop维度及过滤]
2023-01-30 15:10:53 +08:00
lixiaopeng
73ce6b667c 修改枚举类 2023-01-30 14:20:28 +08:00
donghongyu
9abdb2f123 Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0 2023-01-30 14:11:56 +08:00
donghongyu
ecef595d2f [dev_arch_opt_3.0]
[Change]
[
1、合并3.0最新
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-30 12:09:14 +08:00
lixiaopeng
339d38b5f1 去掉提示频繁的限制,数据存储修改 2023-01-30 12:06:31 +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