Commit Graph

160 Commits

Author SHA1 Message Date
wangmingjun
f5c5f1536c Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0
# Conflicts:
#	OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt
#	app/build.gradle
#	app/functions/och.gradle
#	app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
2023-03-03 17:29:34 +08:00
wangmingjun
8d0d82459f [M2] 处理偶现结束订单乘客屏不更新问题 2023-03-03 14:41:28 +08:00
yangyakun
58acd2994b [m1]
[1.1.2]
[业务BUSINESS_STRING包裹类修改]
2023-03-03 08:42:22 +08:00
wangmingjun
0b862f6363 [M2] 1、视频渲染方式 2、走马灯效果 2023-03-02 14:48:04 +08:00
yangyakun
b822934ba7 [m1]
[1.1.2]
[到达站点、启动自驾、结束订单、tts、车模修改]
2023-03-01 15:54:36 +08:00
yangyakun
6c1de0de21 Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-02-28 21:22:57 +08:00
yangyakun
3c332847f7 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
# Conflicts:
#	app/productFlavors/fOchBusPassengerM1.gradle
2023-02-28 21:22:06 +08:00
zhongchao
85a6305319 [2.13.0-arch-opt] obu warning v2v and socket toast 2023-02-28 20:14:07 +08:00
wangmingjun
8f5de916a2 [M2]增加自动驾驶参数 2023-02-28 19:40:22 +08:00
wangmingjun
03d5e173ee [M1] 司机端增加运营消息盒子 2023-02-27 20:23:04 +08:00
yangyakun
33f39fef2b [m1]
[1.1.2]
[通讯]
2023-02-27 11:16:37 +08:00
yangyakun
377271fe25 Merge remote-tracking branch 'origin/dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-02-27 09:45:57 +08:00
yangyakun
09a8303426 Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-02-26 19:18:18 +08:00
wangmingjun
9f576a66bb [jinlv bus] 增加中英韩播报 2023-02-25 20:24:08 +08:00
wangmingjun
667a0d4544 [charter] M1司机端 2023-02-25 19:37:52 +08:00
yangyakun
ebf9cd4220 [m1]
[1.1.2]
[登录状态查询轮训]
2023-02-25 14:47:07 +08:00
yangyakun
f6e749a2ac Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into dev_robobus-m1-p-app-module_1.1.0_230112_1.1.0 2023-02-25 10:33:06 +08:00
yangyakun
645ebe1665 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
# Conflicts:
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	core/mogo-core-function-call/build.gradle
2023-02-24 18:51:07 +08:00
wangmingjun
6106228186 [charter] m1司乘通信结构体 2023-02-24 16:01:18 +08:00
wangmingjun
ee1d9a04a7 [charter] m1司/乘结构体 2023-02-24 15:19:46 +08:00
zhongchao
7dee39dac6 [2.13.0-arch-opt] impl remove from data-center 2023-02-23 20:34:17 +08:00
yangyakun
e7613d6ebb 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-21 21:29:39 +08:00
yangyakun
409faba1e9 [m1]
[1.0.2]
[状态修改]
2023-02-21 21:29:31 +08:00
wangmingjun
9454d547b6 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!581
2023-02-21 12:41:05 +00:00
xinfengkun
961e1eb102 [opt3.0][adas lib] 自动驾驶启动统计对象下沉到adas-data中 2023-02-21 16:58:06 +08:00
yangyakun
e5b295d95d Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-21 09:44:24 +08:00
zhongchao
06df5b98dd [2.13.0-arch-opt] update aiCloudsdk version 2023-02-20 22:16:09 +08:00
yangyakun
ee0c1cbdd3 [m2]
[1.0.1]
[添加吐司提示]
2023-02-17 12:08:05 +08:00
wangmingjun
3e2866f508 [M2] M2 UI 2023-02-15 15:13:58 +08:00
wangmingjun
4381a006b0 [M2] shuttle适配私有化和3.0架构 2023-02-15 10:56:00 +08:00
wangmingjun
528bd96049 [M2] M2 司机端乘客屏通信 2023-02-14 20:18:56 +08:00
yangyakun
87a2c2201a [m1]
[1.0.2]
[url 全部由urlConfg.json 来进行配置]
2023-02-14 19:29:38 +08:00
yangyakun
9f047648b7 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-13 17:24:30 +08:00
wangmingjun
8fa6417514 [M2] 1、M2 UI初步调整 2、Date格式命名调整 2023-02-13 16:09:02 +08:00
yangyakun
39d6a38194 [m1]
[1.0.0]
[开门关门超时处理、靠边停车吐司处理、电量处理]
2023-02-13 15:19:09 +08:00
yangyakun
dee933fe9d 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-10 15:13:16 +08:00
yangyakun
5edd005b30 [m1]
[1.0.0]
[瞬间点击触发]
2023-02-09 15:06:30 +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
zhongchao
8490801138 [2.13.0-arch-opt] move impl of modules from hmi to app 2023-02-07 22:12:04 +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
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
zhongchao
1548c607da [2.13.0-arch-opt] merge 2023-02-07 15:06:28 +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
xinfengkun
a613dcd259 [adas lib]能否启动自驾以及启动命令下发后成功或失败统计优化 2023-02-06 16:20:27 +08:00
yangyakun
1bf5ac91cf [1.0.0]
[m1]
[监听回调添加频率现在1s5次]
2023-02-06 15:08:56 +08:00
yangyakun
e4f0492a2a [1.0.0]
[m1]
[回写提示]
2023-02-04 16:57:12 +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
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
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
zhongchao
d46c11767d [2.13.0-arch-opt] merg 2023-01-30 22:28:02 +08:00