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

11812 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
zhongchao
8433d0c8de [2.13.0-arch-opt] hmi proxy replace to view 2023-01-29 16:25:06 +08:00
xinfengkun
43748bb9f2 [工控机监控]优化显示ID 2023-01-29 16:16:15 +08:00
donghongyu
79ac7817be Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0 2023-01-29 15:44:40 +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
xinfengkun
a5a8157f6d [pb9][v2i透传] 工控机透传OBU V2I数据接口 2023-01-29 11:12:31 +08:00
donghongyu
9a5def9afa [dev_arch_opt_3.0] 
[Change]
[
1、删除旧版地图本定位注册
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-28 19:44:46 +08:00
lixiaopeng
68a00f1239 Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-01-28 19:03:02 +08:00
lixiaopeng
c223edae68 [dev_arch_opt_3.0] 合并老的obu 2023-01-28 19:02:54 +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
0e7664615f [2.13.0-arch-opt] clean 2023-01-25 23:24:52 +08:00
zhongchao
27044ebeee [2.13.0-arch-opt] remove relative of code 2023-01-25 23:15:54 +08:00
zhongchao
40d2977027 [2.13.0-arch-opt] fix bug of view long click 2023-01-25 23:14:49 +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
zhongchao
7000b84f68 [2.13.0-arch-opt] merge 2023-01-25 23:11:25 +08:00
xuxinchao
b7f2e55185 [dev_arch_opt_3.0] 
[Change]
[
1、补交更改接口地址将需要进行DNS转换的接口和部分通用接口统一由服务端进行中转解析
]
 2023-01-24 11:39:56 +08:00
xuxinchao
429e232c99 [dev_arch_opt_3.0] 
[Change]
[
1、更改接口地址将需要进行DNS转换的接口和部分通用接口统一由服务端进行中转解析
]
 2023-01-19 16:24:02 +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
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