Commit Graph

2177 Commits

Author SHA1 Message Date
wangmingjun
e39a0cba18 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
# Conflicts:
#	app/productFlavors/fMultiDisplayOchBus.gradle
#	app/productFlavors/fMultiDisplayOchTaxi.gradle
#	app/productFlavors/fOchBus.gradle
#	app/productFlavors/fOchBusPassengerM1.gradle
#	app/productFlavors/fOchSweeper.gradle
#	app/productFlavors/fOchTaxi.gradle
#	app/productFlavors/fOchTaxiPassenger.gradle
2023-02-09 16:04:05 +08:00
donghongyu
67b0980cd8 [dev_arch_opt_3.0]
[Change]
[
1、增加副屏幕启动页面的工具及说明书
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-09 15:36:05 +08:00
donghongyu
9f92fdecd9 [dev_arch_opt_3.0]
[Change]
[
1、productFlavors渠道中增加动态控制屏幕方向的参数,SCREEN_ORIENTATION:landscape--强制横屏,portrait--强制竖屏
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-09 15:20:30 +08:00
donghongyu
8cb4374cd0 [dev_arch_opt_3.0]
[Change]
[
1、增加读取getprop,获取设备sn、型号
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-09 13:56:11 +08:00
wangmingjun
d850462bff Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0'
Dev arch opt 3.0

See merge request zhjt/AndroidApp/MoGoEagleEye!512
2023-02-09 03:27:24 +00:00
donghongyu
b032c79777 Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0 2023-02-08 20:47:22 +08:00
donghongyu
89b038054d [dev_arch_opt_3.0]
[Change]
[
1、关闭一些狂刷的日志
2、增加EB5获取SN的方法,但系统有限制,需要先adb root ;setenforce 0 ,需要等系统厂商修改下
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-08 20:47:16 +08:00
zhongchao
b9a966bd41 [2.13.0-arch-opt] track obj open loc 2023-02-08 18:01:04 +08:00
zhongchao
79ee956859 [2.13.0-arch-opt] gradle fix 2023-02-08 17:17:37 +08:00
lixiaopeng
bc83dd608e [dev_arch_opt_3.0] 去掉obu 不在bus乘客显示的功能 2023-02-08 16:00:10 +08:00
lixiaopeng
14c3d97296 [dev_arch_opt_3.0] 优化魔方长按 2023-02-08 15:10:15 +08:00
donghongyu
a1506c731c [dev_arch_opt_3.0]
[Change]
[
1、解决地图加载异常
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-08 11:34:54 +08:00
zhongchao
2ea96f15a2 [2.13.0-arch-opt] fix bug of day light mode in map and battery charge 2023-02-07 22:40:14 +08:00
zhongchao
8490801138 [2.13.0-arch-opt] move impl of modules from hmi to app 2023-02-07 22:12:04 +08:00
donghongyu
1dcfe9c551 [dev_arch_opt_3.0]
[Change]
[
1、修改小地图缩放比例
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-07 21:04:11 +08:00
donghongyu
d8e2029fa5 [dev_arch_opt_3.0]
[Change]
[
1、彻底解决地图跳变问题,原因是因为位置转变GCJ02时候将经纬度设置回去了,从而引起位置异常
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-07 20:57:49 +08:00
donghongyu
daf51c78ce [dev_arch_opt_3.0]
[Change]
[
1、删除地图中废弃的定位回掉方法
2、修改小地图监听位置更改的方式,设置为10HZ,更新地图解决跳变问题
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-07 18:45:58 +08:00
yangyakun
96f33bc3df Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-07 16:57:41 +08:00
chenfufeng
7ae724c3f0 [Opt]小地图Fragment改为View 2023-02-07 16:29:55 +08:00
donghongyu
68f40db975 Merge remote-tracking branch 'origin/dev_arch_opt_3.0' into dev_arch_opt_3.0
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
#	OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiProvider.java
2023-02-07 15:47:18 +08:00
donghongyu
d0ce252b4d [dev_arch_opt_3.0]
[Change]
[
1、删除废弃地图中的方法
]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-02-07 15:44:58 +08:00
zhongchao
01c0cd54ac [2.13.0-arch-opt] merge 2023-02-07 15:19:44 +08:00
zhongchao
1548c607da [2.13.0-arch-opt] merge 2023-02-07 15:06:28 +08:00
zhongchao
a382fc36c1 [2.13.0-arhc-opt] merge 2023-02-07 15:00:25 +08:00
lixiaopeng
ed71827687 [dev_arch_opt_3.0] 拆分通过工控机的v2i事件的回调方法 2023-02-07 14:21:47 +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
a613dcd259 [adas lib]能否启动自驾以及启动命令下发后成功或失败统计优化 2023-02-06 16:20:27 +08:00
renwj
3b07d19df5 [dev_arch_opt_3.0]移除无用代码 2023-02-06 14:44:07 +08:00
chenfufeng
efe80d9ea8 [Opt]高德的小地图封装到View中 2023-02-03 17:37:56 +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
renwj
116c7a61bb [dev_arch_opt_3.0]移除无用代码 2023-02-02 20:02:40 +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
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
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