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

11431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
donghongyu
eaa2260016 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/fragment/SweeperFragment.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/presenter/SweeperPresenter.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java
#	app_ipc_monitoring/src/main/java/com/zhidao/adas/client/DataDistribution.java
#	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
#	core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java
#	core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java
#	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-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/can/CanImpl.kt
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.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/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
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/OnAdasListener.java
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/MyMessageFactory.java
#	libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/VehicleStateMessage.java
 2023-01-17 18:09:06 +08:00
bxb
87cad48883 [清扫车]无灯态时，view不展示问题修改 2023-01-17 15:26:51 +08:00
donghongyu
d4de7d42e3 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-17 15:15:16 +08:00
donghongyu
0f1c73c427 [dev_arch_opt_3.0] 
[Change]
[
1、增加清扫车更新渠道
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-17 15:15:12 +08:00
bxb
2b861eee84 [清扫车]清扫车列表和列表无数据时布局修改 2023-01-17 15:10:23 +08:00
bxb
bea96a1604 [清扫车]删除SweeperTrafficDataView.java 2023-01-17 15:08:33 +08:00
bxb
e2fd1f5493 [清扫车]车辆信息资源文件添加id 2023-01-17 15:00:17 +08:00
donghongyu
db4d6a1771 [dev_arch_opt_3.0] 
[Change]
[
1、替换了V2X中的位置订阅回调
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-16 20:22:25 +08:00
xinfengkun
55492abea1 [工控机监控] 修改工控机监控ID显示 2023-01-16 17:58:24 +08:00
bxb
551ca0de0c [清扫车]车辆基本信息view修改 2023-01-16 17:54:38 +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
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
bxb
e73cbd18b0 [清扫车]删除清扫车中原有的bus逻辑无用代码 2023-01-13 17:44:33 +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
bxb
c60f5cacb5 [清扫车]清扫车当前任务View封装处理 2023-01-13 17:42:57 +08:00
bxb
739fe8cfe7 [清扫车]清扫车子任务view封装处理 2023-01-13 17:41:45 +08:00
bxb
5bed4f5cc2 [清扫车]清扫车清扫模式面板view封装处理 2023-01-13 17:39:51 +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
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
bxb
b10ceb9bc3 [清扫车作业模式和清扫车模式选择面板UI修改] 2023-01-12 17:55:32 +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
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
bxb
792cbf89a5 [清扫车] 左上角车辆基本信息布局处理 2023-01-11 17:07:37 +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
xinfengkun
c656ceea58 [清扫车]贴边数据回调和电量回调 2023-01-11 11:50:19 +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