yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,844 Commits 1 Branch 0 Tags
81cbbafc00aeb3d9df6332efb95637d32015deff
Commit Graph

2579 Commits

Author SHA1 Message Date
bxb
363a7da7c6 [清扫车]右下角人工驾驶小地图布局搭建 2023-01-19 15:11:34 +08:00
bxb
655a92f8e0 [清扫车]删除无用的资源文件 2023-01-19 11:56:05 +08:00
bxb
f399210880 [清扫车][ 1、修复合并3.0出现的页面逻辑冲突] 2023-01-18 15:45:49 +08:00
bxb
a38ecbb5c3 Merge branch 'dev_robosweeper-d_app-module_221230_1.1.0' of http://gitlab.zhidaoauto.com/zhjt/AndroidApp/MoGoEagleEye 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
 2023-01-18 15:08:51 +08:00
bxb
57a02e188b [清扫车]清扫车菜单栏布局搭建和相关Java类转成kotlin 2023-01-18 14:52:12 +08:00
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
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
bxb
87cad48883 [清扫车]无灯态时，view不展示问题修改 2023-01-17 15:26:51 +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
wangmingjun
f36d467a92 [M2] 增加乘客屏M2 2023-01-16 19:18:27 +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
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
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
wangmingjun
143baeaab0 [2.13.2 ] Taxi乘客屏修改CallerSmpManager.startQueryV2XEvents();时机 2023-01-16 11:14:41 +08:00
zhongchao
98ca64ef59 [2.13.2] add trajectory of map 2023-01-15 17:50:30 +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
zhongchao
f6c6803a1b [2.13.2] merge 2023-01-13 18:57:12 +08:00
renwj
026cd5e62e [2.13.2]V2X新增事件代码提交 2023-01-13 18:57:12 +08:00
bxb
e73cbd18b0 [清扫车]删除清扫车中原有的bus逻辑无用代码 2023-01-13 17:44:33 +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
wangmingjun
c0274167f4 [1.0.0] opt 2023-01-13 17:36:18 +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
683e1ae73b [2.13.2]change the long sight to roma mode and fit the visual color in cloud data 2023-01-13 10:25:10 +08:00
lixiaopeng
3e3cbb4459 [2.13.2] 修改限速展示来源和优先级，暂时废弃开关 2023-01-13 00:06:57 +08:00
bxb
b10ceb9bc3 [清扫车作业模式和清扫车模式选择面板UI修改] 2023-01-12 17:55:32 +08:00
wangmingjun
385bc7d8b0 [2.13.2 ] bus司机端修改CallerSmpManager.startQueryV2XEvents();时机 2023-01-12 15:58:39 +08:00
wangmingjun
12fe649ee9 [2.13.2 ] taxi/bus司机端增加CallerSmpManager.startQueryV2XEvents(); 2023-01-12 11:01:55 +08:00
zhongchao
2811116325 [2.13.2]fix bug of ai cloud data clear and change the color of ai cloud 2023-01-11 21:26:15 +08:00
wangmingjun
aaf9ec52fd [1.0.0] 接驳车登陆页面背景 2023-01-11 19:33:22 +08:00
bxb
792cbf89a5 [清扫车] 左上角车辆基本信息布局处理 2023-01-11 17:07:37 +08:00
xinfengkun
c656ceea58 [清扫车]贴边数据回调和电量回调 2023-01-11 11:50:19 +08:00
wangmingjun
2e8db449f7 [1.0.0] 接驳车乘客屏接口完成 2023-01-11 10:26:42 +08:00
donghongyu
084efad76a Merge branch 'dev_robosweeper-d_app-module_221230_1.1.0' into dev_arch_opt_3.0 
# Conflicts:
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java
 2023-01-09 19:47:47 +08:00
bxb
bd31ae6f35 Merge branch 'dev_robosweeper-d_app-module_221230_1.1.0' of http://gitlab.zhidaoauto.com/zhjt/AndroidApp/MoGoEagleEye into dev_robosweeper-d_app-module_221230_1.1.0 2023-01-09 18:50:02 +08:00
bxb
639a528246 清扫车左上状态UI布局修改 2023-01-09 18:49:47 +08:00