yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,867 Commits 1 Branch 0 Tags
94de2bf3222c627008277f40e93d51543e8a9eff
Commit Graph

16867 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bxb
a2c1971630 Rename .java to .kt 2023-01-18 14:52:12 +08:00
donghongyu
ebfd541567 [dev_arch_opt_3.0] 
[Change]
[
1、修复合并3.0出现的页面逻辑冲突
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-18 11:58:47 +08:00
renwj
2c90f5ca6f [2.13.2]移除无用代码 2023-01-18 11:00:20 +08:00
donghongyu
7b0fab135c Merge remote-tracking branch 'origin/dev_robosweeper-d_app-module_221230_1.1.0' into dev_robosweeper-d_app-module_221230_1.1.0 
# Conflicts:
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java
 2023-01-18 10:36:57 +08:00
donghongyu
6d37f3ed28 [dev_arch_opt_3.0] 
[Change]
[
1、合并3.0分支
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-17 19:44:44 +08:00
bxb
39a9a66f54 [清扫车]任务操作菜单栏布局搭建 2023-01-17 18:10:41 +08:00
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
yangyakun
4eae9acbe9 [2.13.2] 
[feature]
[接驳车和base添加重用代码basecommon文件夹]
 2023-01-17 17:33:02 +08:00
renwj
701cf58d07 Merge remote-tracking branch 'origin/dev_robotaxi-d-app-module_2132_221223_2.13.2' into test_robotaxi-d-app-module_2132_221223_2.13.2.1 2023-01-17 15:33:19 +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
renwj
7f9ee5b430 [2.13.2]修正DebugSettingView相关崩溃 2023-01-17 12:49:59 +08:00
renwj
661ad54a52 [2.13.2]回退获取车道中心线接口 2023-01-17 12:49:26 +08:00
zhongchao
7080d21d37 Merge branch 'dev_robotaxi-d-app-module_2132_221223_2.13.2' into test_robotaxi-d-app-module_2132_221223_2.13.2.1 2023-01-17 12:44:24 +08:00
zhongchao
e0437dbe76 [2.13.2] update ai cloud sdk version to fix socket status problem 2023-01-17 12:43:34 +08:00
lixiaopeng
4785fa2235 Merge branch 'dev_robotaxi-d-app-module_2132_221223_2.13.2' into test_robotaxi-d-app-module_2132_221223_2.13.2.1 2023-01-16 21:33:12 +08:00
lixiaopeng
4fadeb98f6 [2.13.2] 注释红绿灯跳变容错机制 2023-01-16 21:32:28 +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
wangmingjun
f36d467a92 [M2] 增加乘客屏M2 2023-01-16 19:18:27 +08:00
lixiaopeng
1bc335dcf3 [2.13.2] opt 2023-01-16 18:52:49 +08:00
lixiaopeng
6459f1a4f4 Merge branch 'dev_robotaxi-d-app-module_2132_221223_2.13.2' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_2132_221223_2.13.2 2023-01-16 18:31:01 +08:00
lixiaopeng
00cdf059fa [2.13.2] 添加rsi30s间隔，红绿灯跳变处理 2023-01-16 18:30:49 +08:00
zhongchao
e5ed82f8f2 [2.13.2] update map version 2023-01-16 18:29:51 +08:00
zhongchao
8f4c942273 [2.13.2] update map version to fix anim 2023-01-16 18:28:52 +08:00
renwj
1cdad1f165 Merge remote-tracking branch 'origin/dev_robotaxi-d-app-module_2132_221223_2.13.2' into test_robotaxi-d-app-module_2132_221223_2.13.2.1 2023-01-16 18:13:29 +08:00
renwj
4af1ea1633 [2.13.2][MAP]更改地图获取车道中心线接口 2023-01-16 18:10:56 +08:00
zhongchao
7324764e31 [2.13.2] fix bug of draw fusion control 2023-01-16 18:10:18 +08:00
zhongchao
89626b2d0c [2.13.2] fix bug of draw fusion control 2023-01-16 18:09:31 +08:00
xinfengkun
55492abea1 [工控机监控] 修改工控机监控ID显示 2023-01-16 17:58:24 +08:00
bxb
551ca0de0c [清扫车]车辆基本信息view修改 2023-01-16 17:54:38 +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
zhongchao
278054eb56 [2.13.2] add func of roma to close self track obj 2023-01-16 16:57:45 +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
lixiaopeng
7a34f94d96 Merge branch 'dev_robotaxi-d-app-module_2132_221223_2.13.2' into test_robotaxi-d-app-module_2132_221223_2.13.2.1 2023-01-16 16:29:21 +08:00
lixiaopeng
baa4bdd01c Merge branch 'dev_robotaxi-d-app-module_2132_221223_2.13.2' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_2132_221223_2.13.2 2023-01-16 16:28:22 +08:00
lixiaopeng
80da625ade [2.13.2] 弱势交通只留行人，红绿灯倒计时到1卡顿问题 2023-01-16 16:28:02 +08:00
yangyakun
3ab521310a Merge remote-tracking branch 'origin/dev_robotaxi-d-app-module_2132_221223_2.13.2' into dev_robotaxi-d-app-module_2132_221223_2.13.2 2023-01-16 16:20:57 +08:00
yangyakun
3c3c59cedf [2.13.2] 
[feature]
[根据是否有订单来判断是否展示全程概览]
 2023-01-16 16:20:48 +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
zhongchao
b88aba17c2 [2.13.2] fix ui bug because of event type enum 2023-01-16 15:55:37 +08:00
xuxinchao
22ea0241af [2.13.2]fix新消息刷新错误问题，并添加及时刷新 2023-01-16 15:55:37 +08:00
zhongchao
7b84d2a705 [2.13.2] fix ui bug because of event type enum 2023-01-16 15:53:22 +08:00
yangyakun
6787c122c2 [1.0.0] 
[feature]
[判断是否是M1]
 2023-01-16 15:44:31 +08:00
xuxinchao
6654df6cf5 [2.13.2]fix新消息刷新错误问题，并添加及时刷新 2023-01-16 15:35:50 +08:00
renwj
57762fba8b Merge remote-tracking branch 'origin/dev_robotaxi-d-app-module_2132_221223_2.13.2' into test_robotaxi-d-app-module_2132_221223_2.13.2.1 2023-01-16 15:01:14 +08:00