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

3550 Commits

Author SHA1 Message Date
zhongchao
66db271f6c [2.13.0-arch-opt] merg 2023-01-30 22:29:40 +08:00
zhongchao
d46c11767d [2.13.0-arch-opt] merg 2023-01-30 22:28:02 +08:00
wangmingjun
f0a02e4d01 [opt] OCH模块去除引用v2x 2023-01-30 15:40:23 +08:00
yangyakun
4e9d237d3b Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 
# Conflicts:
#	app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt
 2023-01-30 15:12:39 +08:00
donghongyu
ecef595d2f [dev_arch_opt_3.0] 
[Change]
[
1、合并3.0最新
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-30 12:09:14 +08:00
yangyakun
b9213fee35 [1.0.0] 
[m1]
[适配+部分页面]
 2023-01-30 12:08:59 +08:00
donghongyu
ac5fa85186 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/model/SweeperOrderModel.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperLimitingVelocityView.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.java
#	OCH/mogo-och-sweeper/src/main/res/drawable/sweeper_list_left_top_line.xml
#	app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt
#	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-hmi/src/main/res/layout/fragment_hmi.xml
 2023-01-30 11:58:56 +08:00
bxb
ff750e7d00 [清扫车]清扫车当前任务选择菜单布局处理 2023-01-30 11:39:57 +08:00
zhongchao
6d3eeaca50 [2.13.0-arch-opt] merge 2023-01-30 10:47:39 +08:00
yangyakun
a9291ac5bc [1.0.0] 
[m1]
[背景透明]
 2023-01-29 18:48:45 +08:00
lixiaopeng
2a9111c996 fixed conflict 2023-01-29 17:33:43 +08:00
lixiaopeng
b60fbb2613 合并2.13.2的obu验收相关功能 2023-01-29 17:23:41 +08:00
yangyakun
947517f98b Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-01-29 16:28:47 +08:00
yangyakun
9aafa6d9a0 [1.0.0] 
[m1]
[m1初始提交]
 2023-01-29 16:26:14 +08:00
zhongchao
8433d0c8de [2.13.0-arch-opt] hmi proxy replace to view 2023-01-29 16:25:06 +08:00
donghongyu
741fe10d40 [dev_arch_opt_3.0] 
[Change]
[
1、临时修改清扫车异常，如果合并到dev_robosweeper-d_app-module_221230_1.1.0分支，这里修改可以不提交
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-29 15:44:35 +08:00
bxb
21a7e59b82 [清扫车]删除无用代码及其修改部分逻辑 2023-01-29 11:28:08 +08:00
donghongyu
981b876a76 [dev_arch_opt_3.0] 
[Change]
[
1、删除旧版本定位注册
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-28 18:40:32 +08:00
bxb
ab27f9ee44 [清扫车]删除无用的代码和资源文件 2023-01-28 14:20:31 +08:00
zhongchao
c011549e44 [2.13.0-arch-opt] merge 2023-01-25 23:14:44 +08:00
zhongchao
2265a5ffb8 [2.13.0-arch-opt] merge 2023-01-25 23:13:23 +08:00
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