yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,556 Commits 1 Branch 0 Tags
3a1f96396f5e082fbc6a1369efaa21fd055883e7
Commit Graph

66 Commits

Author SHA1 Message Date
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
lixiaopeng
494e10b4c5 [dev_arch_opt_3.0] 修改默认obu的ip 2023-02-10 18:28:01 +08:00
donghongyu
0a7d89af5b [dev_arch_opt_3.0] 
[Change]
[
1、兼容socket上传时候的locType，要不rtk的坐标会被后台过滤
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-09 19:47:19 +08:00
donghongyu
c5166f3f8f [dev_arch_opt_3.0] 
[Change]
[
1、兼容socket上传时候的locType，要不rtk的坐标会被后台过滤
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-09 19:47:00 +08:00
lixiaopeng
d602e55287 [dev_arch_opt_3.0] 统一obu的ip 2023-02-09 17:54:56 +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
donghongyu
8cb4374cd0 [dev_arch_opt_3.0] 
[Change]
[
1、增加读取getprop，获取设备sn、型号
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-09 13:56:11 +08:00
zhongchao
79ee956859 [2.13.0-arch-opt] gradle fix 2023-02-08 17:17:37 +08:00
lixiaopeng
bc83dd608e [dev_arch_opt_3.0] 去掉obu 不在bus乘客显示的功能 2023-02-08 16:00:10 +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
zhongchao
a382fc36c1 [2.13.0-arhc-opt] merge 2023-02-07 15:00:25 +08:00
lixiaopeng
ed71827687 [dev_arch_opt_3.0] 拆分通过工控机的v2i事件的回调方法 2023-02-07 14:21:47 +08:00
xinfengkun
a613dcd259 [adas lib]能否启动自驾以及启动命令下发后成功或失败统计优化 2023-02-06 16:20:27 +08:00
lixiaopeng
7992613d72 opt trafic light 2023-02-02 23:28:47 +08:00
zhongchao
40e9fdb708 [2.13.0-arch-opt] merge 2023-02-02 20:59:42 +08:00
donghongyu
33c51b7ace [dev_arch_opt_3.0] 
[Change]
[
1、解决合并冲突
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-02 19:32:28 +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
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
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
25663f087b [2.13.0-arch-opt] merge 2023-02-01 17:57:36 +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
dcc98b078b [Opt3.0]新增StartUp模块并调整启动顺序 2023-01-31 15:32:17 +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
d46c11767d [2.13.0-arch-opt] merg 2023-01-30 22:28:02 +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
chenfufeng
13cebf3b06 [2.13.2][feat]新增全览V2X事件的日志 2023-01-30 11:10:04 +08:00
lixiaopeng
b60fbb2613 合并2.13.2的obu验收相关功能 2023-01-29 17:23:41 +08:00
xinfengkun
a5a8157f6d [pb9][v2i透传] 工控机透传OBU V2I数据接口 2023-01-29 11:12:31 +08:00
donghongyu
f10b9e94d4 Merge branch 'master' into dev_arch_opt_3.0 
# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
 2023-01-16 11:43:46 +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
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
a7d179d713 [pb9][底盘接口] 目前由于M1车型不会在新底盘PB添加新的字段 所以临时保留老底盘接口回调，M1新添加的相关字段会在老底盘回调接收，同时老底盘的清扫车对象转成新底盘PB中的清扫车对象，暂时注释掉ADAS LIB中的新老底盘兼容 2023-01-10 18:12:25 +08:00