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

11543 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yangyakun
49397cdc8b Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/presenter/BaseBusPassengerPresenter.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/model/SweeperOrderModel.java
#	app/src/main/AndroidManifest.xml
 2023-02-02 21:01:24 +08:00
yangyakun
15df79ff01 Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-02 20:58:35 +08:00
yangyakun
d032e77f6e dev_arch_opt_3.0]全局预览放入业务类中 2023-02-02 20:56:17 +08:00
renwj
116c7a61bb [dev_arch_opt_3.0]移除无用代码 2023-02-02 20:02:40 +08:00
wangmingjun
94c45440e2 [M2] M2 opt 2023-02-02 19:57:28 +08:00
donghongyu
33c51b7ace [dev_arch_opt_3.0] 
[Change]
[
1、解决合并冲突
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-02 19:32:28 +08:00
donghongyu
da0e7004c0 Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0 
# Conflicts:
#	core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.kt
 2023-02-02 19:25:40 +08:00
donghongyu
111940123f [dev_arch_opt_3.0] 
[Change]
[
1、完成工控机数据和高德GPS地图数据的数据中心，以及工控机数据超时后的自动切换为高德地图GPS数据
定位监听已重构，CallerChassisLocationGCJ20ListenerManager---高的坐标系，CallerChassisLocationWGS84ListenerManager--高精坐标系，之前代码已修改，大家后续项目中根据需要进行订阅，如需控制频率可在订阅时
// 设置数据回调频率，单位HZ，1HZ的周期是1秒；50HZ的周期是1/50=0.02秒；10HZ的周期是1/10=0.1秒。
CallerChassisLocationWGS84ListenerManager.setListenerHz(Companion.functionName, 20)
CallerChassisLocationGCJ20ListenerManagersetListenerHz(Companion.functionName, 20)
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-02 19:24:38 +08:00
yangyakun
404f72ea3f [m1 1.0.0] 
[空调设置除了温度调整其他搞定]
 2023-02-02 17:33:44 +08:00
chenfufeng
8851a1ef00 [Opt]直接从相关的Caller类中获取缓存的全局路径规划轨迹点 2023-02-02 16:53:14 +08:00
yangyakun
8814f5947d Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.java
#	OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt
 2023-02-02 12:05:53 +08:00
yangyakun
2c5bbe1c17 Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-02 12:02:37 +08:00
yangyakun
474b2d0d1d [m1 1.0.0] 
[剩余设置、图片替换]
 2023-02-02 11:53:39 +08:00
renwj
0a4b0be72a [dev_arch_opt_3.0]移除无用代码 2023-02-02 10:34:06 +08:00
donghongyu
8be6c14004 Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0 
# Conflicts:
#	core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt
 2023-02-01 19:31:36 +08:00
donghongyu
6c2d19f9c2 [dev_arch_opt_3.0] 
[Change]
[
1、修改OBU数据PB回调
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-01 19:30:47 +08:00
xinfengkun
dfc3560001 Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-02-01 19:24:46 +08:00
xinfengkun
3f028b9530 [obu]鹰眼自用OBU 地图回调错误修改 2023-02-01 19:24:35 +08:00
donghongyu
3c8f69d83a [dev_arch_opt_3.0] 
[Change]
[
1、修复刹车等异常@钟超
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-01 19:07:04 +08:00
donghongyu
57ee81a459 Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0 2023-02-01 18:35:45 +08:00
donghongyu
4e9ca58409 [dev_arch_opt_3.0] 
[Change]
[
1、增加控制定位HZ的回调用
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-01 18:35:39 +08:00
xinfengkun
76b9abf4b2 Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-02-01 18:34:39 +08:00
xinfengkun
903c90801f [obu]鹰眼自用OBU PB编写 以及参照原始PB差异化文档编写 2023-02-01 18:34:32 +08:00
zhongchao
d7c5bf4e46 [2.13.0-arch-opt] fix bug of och-taxi xml 2023-02-01 18:19:31 +08:00
zhongchao
25663f087b [2.13.0-arch-opt] merge 2023-02-01 17:57:36 +08:00
lixiaopeng
2df96d3dac Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-02-01 16:52:31 +08:00
lixiaopeng
52bc276157 同步魔方的最新改动 2023-02-01 16:52:24 +08:00
xuxinchao
f9eeef8cb9 [Opt3.0]消息盒子 2023-02-01 16:26:53 +08:00
donghongyu
ab2a89a623 [dev_arch_opt_3.0] 
[Change]
[
1、MoGoObuListenerImpl实现数据回调
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-01 14:31:40 +08:00
donghongyu
3211ef5956 [dev_arch_opt_3.0] 
[Change]
[
1、拆分Obu数据回调接口，等待凤坤pb提交后在统一数据调用
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-02-01 14:06:58 +08:00
wangmingjun
a159035e10 Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' of http://gitlab.zhidaoauto.com/zhjt/AndroidApp/MoGoEagleEye into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-01 14:04:34 +08:00
wangmingjun
faf01c7373 [opt] m2 2023-02-01 14:03:46 +08:00
yangyakun
bc24620f7c Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 
# Conflicts:
#	app/productFlavors/fPadLenovo.gradle
 2023-02-01 12:54:53 +08:00
chenfufeng
f0d9f701ed [Feat]新增全览地图View 2023-02-01 11:20:39 +08:00
yangyakun
c201f3f0cf [m1 1.0.0] 
[控制车辆设置]
 2023-01-31 20:57:58 +08:00
yangyakun
9d599bfe1b [m1 1.0.0] 
[车辆控制灯光控制]
 2023-01-31 19:43:25 +08:00
lixiaopeng
1e7bd1c749 Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_arch_opt_3.0 2023-01-31 18:31:27 +08:00
lixiaopeng
fb84e5aaff 添加转向灯相关注释 2023-01-31 18:31:20 +08:00
xuxinchao
6e94255d15 [opt3.0]消息盒子 2023-01-31 18:09:49 +08:00
donghongyu
c591a30752 [dev_arch_opt_3.0] 
[Change]
[
1、修复清扫车红绿灯View初始化异常
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-31 17:11:33 +08:00
xuxinchao
0a10c1876c [Opt3.0]消息盒子 2023-01-31 16:56:57 +08:00
yangyakun
94c6f2696c [gradle 渠道名修改] 
[接驳车乘客端和bus乘客端代码合并通过AppIdentityModeUtils 来判断]
 2023-01-31 16:53:38 +08:00
xinfengkun
748e4163f2 [工控机监控]优化错误数据提醒 2023-01-31 16:40:22 +08:00
chenfufeng
5d8548e7ef [Opt]去掉冗余的导入 2023-01-31 15:32:17 +08:00
chenfufeng
dcc98b078b [Opt3.0]新增StartUp模块并调整启动顺序 2023-01-31 15:32:17 +08:00
chenfufeng
fa04cc6f0b [Opt3.0]新增StartUp模块 2023-01-31 15:32:17 +08:00
zhongchao
d3f0ac654b [2.13.0-arch-opt] fix bug of limit speed and move view 2023-01-31 15:28:42 +08:00
yangyakun
0714df0081 [gradle 渠道修改] 2023-01-31 14:52:21 +08:00
renwj
e01716f30a [dev_arch_opt_3.0][v2x]v2x代码重构 2023-01-31 12:21:51 +08:00
donghongyu
6bc41b01fa [dev_arch_opt_3.0] 
[Change]
[
1、TODO 清扫车限速有问题
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
 2023-01-31 11:45:10 +08:00