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

1051 Commits

Author SHA1 Message Date
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
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
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
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
zhongchao
183c5b806f [2.13.2-arch-opt] remove unuse res of v2x 2023-01-13 15:18:34 +08:00
bxb
b10ceb9bc3 [清扫车作业模式和清扫车模式选择面板UI修改] 2023-01-12 17:55:32 +08:00
bxb
792cbf89a5 [清扫车] 左上角车辆基本信息布局处理 2023-01-11 17:07:37 +08:00
xinfengkun
c656ceea58 [清扫车]贴边数据回调和电量回调 2023-01-11 11:50:19 +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
donghongyu
3a0d94e9a7 Merge branch 'dev_robosweeper-d_app-module_221230_1.1.0' into dev_arch_opt_3.0 
# Conflicts:
#	OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/CallerLoggerUtils.kt
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/ui/SweeperOperatePanelView.java
#	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-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoHandAdasMsgManager.java
#	core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt
#	core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.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/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.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
#	gradle.properties
#	libraries/mogo-map/src/main/java/com/mogo/map/CustomMapApiBuilder.java
 2023-01-09 18:42:03 +08:00
xinfengkun
c2c4d3c6d2 Merge branch 'dev_robosweeper-d_app-module_221230_1.1.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robosweeper-d_app-module_221230_1.1.0 2023-01-09 17:59:37 +08:00
xinfengkun
23b96286ee [pb12][清扫车新老底盘兼容] 清扫车分支 老地盘数据转新地盘数据 2023-01-09 16:58:46 +08:00
bxb
240a4bb09f 清扫车日志tag相关添加 2023-01-09 16:36:24 +08:00
bxb
d48c59f1bf 清扫车灯态UI修改 2023-01-06 10:58:32 +08:00
donghongyu
22198c92ec [dev_arch_opt_3.0] 
[Change]
[1、解决清扫车状态同步注册未修改bug]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-05 19:32:11 +08:00
donghongyu
cf94486dfd [dev_arch_opt_3.0] 
[Change]
[1、分离清扫车（福田）清扫控制系统状态监听，单独回调]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-05 18:57:20 +08:00
donghongyu
9a6102a4c6 Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0 2023-01-05 18:17:33 +08:00
donghongyu
5fcc0f42ea [dev_arch_opt_3.0] 
[Change]
[1、分离工控机引导线、全路径规划]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-05 18:17:27 +08:00
wangmingjun
5c93b9604f [opt ] 判断乘客屏使用AppIdentityModeUtils.isPassenger方法 2023-01-05 16:41:03 +08:00
donghongyu
06810f339c [dev_arch_opt_3.0] 
[Change]
[1、将Call中注册，反注册操作下沉CallerBase]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-04 20:00:32 +08:00
donghongyu
12ed7f2436 Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0 2023-01-03 19:21:33 +08:00
donghongyu
866620b934 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into dev_arch_opt_3.0 2023-01-03 19:20:59 +08:00
wangmingjun
34a1574a3f [opt ] 判断乘客屏使用AppIdentityModeUtils.isPassenger方法 2023-01-03 19:15:00 +08:00
yangyakun
757b143c16 [fix] 拖动view 过程中window丢失 2022-12-30 16:05:02 +08:00
donghongyu
c50b507c80 Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0 2022-12-29 17:44:37 +08:00
zhongchao
681629c032 [2.13.0-arch-opt] locationUtil move 2022-12-29 17:43:25 +08:00
wangmingjun
49a0daa819 [2.13.0] taxi司机端取消订单view优化 2022-12-29 17:02:18 +08:00
donghongyu
0d58181fce Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into dev_arch_opt_3.0 2022-12-29 16:25:20 +08:00
wangmingjun
44b8ff0faa [2.13.0] taxi乘客屏保存订单信息 2022-12-29 14:39:31 +08:00
donghongyu
45fd343d1d [opt 3.0] 
[Change]
[1、修复Taxi缺少依赖问题]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2022-12-29 14:37:35 +08:00
zhongchao
c411ee4389 [2.13.0-arch-opt] change the gradle files and map gradle config 2022-12-28 17:42:58 +08:00