Commit Graph

11436 Commits

Author SHA1 Message Date
yangyakun
4eae9acbe9 [2.13.2]
[feature]
[接驳车和base添加重用代码basecommon文件夹]
2023-01-17 17:33:02 +08:00
wangmingjun
f36d467a92 [M2] 增加乘客屏M2 2023-01-16 19:18:27 +08:00
wangmingjun
fca1b294b7 [merge] merge origin branch 2023-01-16 17:45:21 +08:00
wangmingjun
9b503829c3 [merge] 合并接驳车代码 2023-01-16 17:27:27 +08:00
yangyakun
e471ad0f61 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-01-16 16:32:36 +08:00
donghongyu
4c30b63dfc [dev_arch_opt_3.0]
[Change]
[
1、更替项目中用到的高德地图的地方,使用IMoGoChassisLocationGCJ02Listener
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-16 16:01:19 +08:00
yangyakun
6787c122c2 [1.0.0]
[feature]
[判断是否是M1]
2023-01-16 15:44:31 +08:00
donghongyu
3ae9cda2f7 [dev_arch_opt_3.0]
[Change]
[
1、修复合并Master冲突
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-16 14:23:25 +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
zhongchao
245bde74d2 [2.13.0-arch-opt] add note 2023-01-14 14:24:23 +08:00
zhongchao
63d9459352 [2.13.0-arch-opt]rm v2x unuse 2023-01-14 12:16:59 +08:00
yangyakun
d5b5cc2c66 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-01-13 19:35:59 +08:00
yangyakun
e565f0a403 [1.0.0]
[m1]
[乘客屏单独抽到base 下]
2023-01-13 19:34:09 +08:00
donghongyu
34c1dcab09 Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0 2023-01-13 17:44:13 +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
wangmingjun
c0274167f4 [1.0.0] opt 2023-01-13 17:36:18 +08:00
wangmingjun
527253ffba Merge branch 'master' into dev_mul_bus_shuttle 2023-01-13 17:28:40 +08:00
yangyakun
0bfdebdee9 [2.13.2]
[fix]
[页面适配测试数据删除]
2023-01-13 17:07:40 +08:00
yangyakun
878014b113 [2.13.2][fix] scaleType删除掉centerInside 2023-01-13 17:07:29 +08:00
yangyakun
73f1ead782 [2.13.2][fix] dialog适配 2023-01-13 17:07:16 +08:00
yangyakun
bfbcbdc8be [2.13.2]
[gradle]
[添加业务线模式、业务线可以配置url]
2023-01-13 16:39:47 +08:00
donghongyu
1f3a71e782 [dev_arch_opt_3.0]
[Change]
[
1、增加忽略
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-13 15:52:22 +08:00
wangmingjun
0b8a0dcdf9 [1.0.0] "无人驾驶"改为"自动驾驶" 2023-01-13 15:19:27 +08:00
zhongchao
183c5b806f [2.13.2-arch-opt] remove unuse res of v2x 2023-01-13 15:18:34 +08:00
zhongchao
d616dbb937 [2.13.0-arch-opt] remove res 2023-01-13 15:18:34 +08:00
zhongchao
48f2acb590 [2.13.0-arch-opt] wait to pull 2023-01-13 15:18:34 +08:00
pangfan
aaa99e2219 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!504
2023-01-13 06:54:15 +00:00
yangyakun
6862225384 [2.13.2][gradle] 命名修改 2023-01-13 11:16:34 +08:00
chenfufeng
8b80f5fbde [2.13.2][fix]解决多条V2X事件只一条入库 2023-01-12 20:54:39 +08:00
chenfufeng
6dde7380b8 [2.13.2][Opt]查询性能监控的时机后置 2023-01-12 17:10:47 +08:00
chenfufeng
3ecbad5472 [2.13.2][fix]解决数据库崩溃的问题 2023-01-12 17:10:43 +08:00
chenfufeng
5180d3b6f9 [v2.13.2][Fix]解决Room崩溃问题 2023-01-12 17:10:38 +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
zhongchao
d8728fe8c9 [2.13.0-arch-opt] move binding car to deva tools 2023-01-12 10:11:23 +08:00
wangmingjun
aaf9ec52fd [1.0.0] 接驳车登陆页面背景 2023-01-11 19:33:22 +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
490e233645 Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-01-11 14:51:04 +08:00
xinfengkun
ae20e898bb [pb10]更新planning决策状态接口字段,更新特种车辆M1底盘以及车内控制命令 2023-01-11 14:50:53 +08:00
yangyakun
4674124add [dev_arch_opt_3.0]
[Change]
[修改业务线身份判断规则具体查看app\productFlavors\README.md]
2023-01-11 13:10:03 +08:00
wangmingjun
2e8db449f7 [1.0.0] 接驳车乘客屏接口完成 2023-01-11 10:26:42 +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
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