Commit Graph

11569 Commits

Author SHA1 Message Date
wangmingjun
95e41e4e94 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-06 19:37:36 +08:00
yangyakun
fcffab4db0 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-06 18:50:17 +08:00
chenfufeng
2c6684b617 [Opt]全览模式View和业务分离 2023-02-06 18:45:38 +08:00
xinfengkun
2ce02f2a5b [ADAS LIB][opt3.0]更新监控字段 2023-02-06 18:40:47 +08:00
yangyakun
0b8faa797e [1.0.0]
[m1]
[dialogFragment 弹出底部bar的问题]
2023-02-06 18:29:25 +08:00
xinfengkun
9fc9062230 [工控机监控]提示错误修改 2023-02-06 16:26:19 +08:00
xinfengkun
a613dcd259 [adas lib]能否启动自驾以及启动命令下发后成功或失败统计优化 2023-02-06 16:20:27 +08:00
wangmingjun
f8cb2e4389 [M2] M2 定位接口修改 2023-02-06 16:14:57 +08:00
yangyakun
1bf5ac91cf [1.0.0]
[m1]
[监听回调添加频率现在1s5次]
2023-02-06 15:08:56 +08:00
yangyakun
211c702fb0 [1.0.0]
[m1]
[温度调整]
2023-02-06 15:08:33 +08:00
renwj
3b07d19df5 [dev_arch_opt_3.0]移除无用代码 2023-02-06 14:44:07 +08:00
renwj
390aa3ef9e [dev_arch_opt_3.0][leakfix]生命周期对象销毁时,直接将匿名内部类引用的字段置null 2023-02-06 14:30:24 +08:00
yangyakun
8be7ac4f0e [1.0.0]
[m1]
[空白点击关闭]
2023-02-06 11:47:42 +08:00
yangyakun
272b1c16e8 [1.0.0]
[m1]
[声音的部分调整]
2023-02-06 10:47:56 +08:00
yangyakun
382fd6b95d [1.0.0]
[m1]
[温度页面调整、灯光默认关闭]
2023-02-06 10:18:56 +08:00
yangyakun
aefe51fa86 [1.0.0]
[m1]
[温度页面]
2023-02-04 18:04:32 +08:00
yangyakun
a9b6f886de 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-04 16:58:03 +08:00
yangyakun
e4f0492a2a [1.0.0]
[m1]
[回写提示]
2023-02-04 16:57:12 +08:00
chenfufeng
efe80d9ea8 [Opt]高德的小地图封装到View中 2023-02-03 17:37:56 +08:00
renwj
21d6c665f3 [dev_arch_opt_3.0][leakfix]修正由于匿名Runnable对象引用外部类引用造成的内存泄漏 2023-02-03 17:31:45 +08:00
wangmingjun
c4ee394cc0 [M2] M2 添加pnc,转向,红绿灯组件 2023-02-03 16:49:24 +08:00
yangyakun
ae2a06d050 文件夹修改导致'kotlin-android-extensions'出现的问题 2023-02-03 09:53:39 +08:00
lixiaopeng
7992613d72 opt trafic light 2023-02-02 23:28:47 +08:00
yangyakun
8fb9a1d6cc Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-02 21:18:02 +08:00
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
zhongchao
8bde80c0c6 [2.13.0-arch-opt] fix bug of merge problem 2023-02-02 20:59:42 +08:00
zhongchao
40e9fdb708 [2.13.0-arch-opt] merge 2023-02-02 20:59:42 +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