Commit Graph

1366 Commits

Author SHA1 Message Date
wangmingjun
44d93b6f4e Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0'
[2.13.0-arhc-opt] fix bug of traffic light

See merge request zhjt/AndroidApp/MoGoEagleEye!519
2023-02-14 06:25:27 +00:00
zhongchao
5f363baab6 [2.13.0-arhc-opt] fix bug of traffic light 2023-02-14 14:23:46 +08:00
yangyakun
9c8e35bfb2 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-13 18:54:18 +08:00
xinfengkun
62f1e11681 [3.0][OBU数据融合] 新增OBU数据接口,将OBU SDK数据转换成与域控相同的PB数据 2023-02-13 16:02:17 +08:00
yangyakun
cff6cd71ce Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-13 15:23:43 +08:00
xinfengkun
3a1f96396f Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0
 Conflicts:
	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
	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/ObuWarningDataMessage.java
2023-02-13 15:13:08 +08:00
xinfengkun
5e2ee3f76c [pb10][障碍物接口] 更新障碍物接口,新增僵尸车字段 2023-02-13 15:08:55 +08:00
yangyakun
c5c5699b47 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-12 12:33:45 +08:00
zhongchao
78849ef5d7 [2.13.0-arch-opt] mofang view and status bar opt , pnvView add catch in enum 2023-02-09 19:53:10 +08:00
zhongchao
fd2a92f8eb [2.13.0-arch-opt] cherry pick evey single file from 2.13.2,plus it's exhausted 2023-02-09 19:53:10 +08:00
zhongchao
83c57a0642 [2.13.2] add pb and track obj remove unuse 2023-02-09 19:53:10 +08:00
xinfengkun
53f2c79d4b [adas lib]工控机透传OBU V2I数据精度转换 2023-02-09 15:42:09 +08:00
lixiaopeng
3775693a5d Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-02-09 15:00:09 +08:00
lixiaopeng
7e25e5b43d [dev_arch_opt_3.0] 去掉之前obu的v2i总的回调数据 2023-02-09 15:00:02 +08:00
wangmingjun
d850462bff Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0'
Dev arch opt 3.0

See merge request zhjt/AndroidApp/MoGoEagleEye!512
2023-02-09 03:27:24 +00:00
donghongyu
b032c79777 Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0 2023-02-08 20:47:22 +08:00
donghongyu
89b038054d [dev_arch_opt_3.0]
[Change]
[
1、关闭一些狂刷的日志
2、增加EB5获取SN的方法,但系统有限制,需要先adb root ;setenforce 0 ,需要等系统厂商修改下
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-08 20:47:16 +08:00
xinfengkun
8109320ecf [adas lib]金旅M1 顶灯1 顶灯2控制方法拆解 2023-02-08 17:21:22 +08:00
zhongchao
79ee956859 [2.13.0-arch-opt] gradle fix 2023-02-08 17:17:37 +08:00
donghongyu
a1506c731c [dev_arch_opt_3.0]
[Change]
[
1、解决地图加载异常
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-08 11:34:54 +08:00
zhongchao
2ea96f15a2 [2.13.0-arch-opt] fix bug of day light mode in map and battery charge 2023-02-07 22:40:14 +08:00
donghongyu
d8e2029fa5 [dev_arch_opt_3.0]
[Change]
[
1、彻底解决地图跳变问题,原因是因为位置转变GCJ02时候将经纬度设置回去了,从而引起位置异常
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-07 20:57:49 +08:00
donghongyu
daf51c78ce [dev_arch_opt_3.0]
[Change]
[
1、删除地图中废弃的定位回掉方法
2、修改小地图监听位置更改的方式,设置为10HZ,更新地图解决跳变问题
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-07 18:45:58 +08:00
donghongyu
68f40db975 Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
#	OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiProvider.java
2023-02-07 15:47:18 +08:00
donghongyu
d0ce252b4d [dev_arch_opt_3.0]
[Change]
[
1、删除废弃地图中的方法
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-07 15:44:58 +08:00
zhongchao
1548c607da [2.13.0-arch-opt] merge 2023-02-07 15:06:28 +08:00
xinfengkun
2ce02f2a5b [ADAS LIB][opt3.0]更新监控字段 2023-02-06 18:40:47 +08:00
xinfengkun
a613dcd259 [adas lib]能否启动自驾以及启动命令下发后成功或失败统计优化 2023-02-06 16:20:27 +08:00
donghongyu
111940123f [dev_arch_opt_3.0]
[Change]
[
1、完成工控机数据和高德GPS地图数据的数据中心,以及工控机数据超时后的自动切换为高德地图GPS数据
定位监听已重构,CallerChassisLocationGCJ20ListenerManager---高的坐标系,CallerChassisLocationWGS84ListenerManager--高精坐标系,之前代码已修改,大家后续项目中根据需要进行订阅,如需控制频率可在订阅时
// 设置数据回调频率,单位HZ,1HZ的周期是1秒;50HZ的周期是1/50=0.02秒;10HZ的周期是1/10=0.1秒。
CallerChassisLocationWGS84ListenerManager.setListenerHz(Companion.functionName, 20)
CallerChassisLocationGCJ20ListenerManagersetListenerHz(Companion.functionName, 20)
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-02 19:24:38 +08:00
xinfengkun
3f028b9530 [obu]鹰眼自用OBU 地图回调错误修改 2023-02-01 19:24:35 +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
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
renwj
2baf4aa785 [dev_arch_opt_3.0][fix]修正因位置回调重构造成的v2x事件不显示问题 2023-01-30 19:11:16 +08:00
renwj
7ae3e13fab [dev_arch_opt_3.0][merge]合并2.13.2分支代码 2023-01-29 18:01:44 +08:00
xinfengkun
a5a8157f6d [pb9][v2i透传] 工控机透传OBU V2I数据接口 2023-01-29 11:12:31 +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
7000b84f68 [2.13.0-arch-opt] merge 2023-01-25 23:11:25 +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
xinfengkun
ed13a7bc88 [ADAS LIB] 向工控机发送红绿灯数据接口添加废弃标识,MAP290开始此接口弃用 2023-01-12 15:12:50 +08:00
xinfengkun
f68c5cbe20 [pb10][金旅M1][靠边停车] 更新planning决策状态接口 新增了靠边停车状态,添加给planning发送命令接口, 目前用于发送靠边停车指令以及起步命令 2023-01-12 14:54:16 +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
60349f8d33 [pb10]更新PB老底盘移除清扫车错误问题 2023-01-11 15:10:37 +08:00
xinfengkun
ae20e898bb [pb10]更新planning决策状态接口字段,更新特种车辆M1底盘以及车内控制命令 2023-01-11 14:50:53 +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