Commit Graph

486 Commits

Author SHA1 Message Date
wangmingjun
8fa6417514 [M2] 1、M2 UI初步调整 2、Date格式命名调整 2023-02-13 16:09:02 +08:00
yangyakun
c5c5699b47 Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-02-12 12:33:45 +08:00
zhongchao
fd2a92f8eb [2.13.0-arch-opt] cherry pick evey single file from 2.13.2,plus it's exhausted 2023-02-09 19:53:10 +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
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
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
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
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
40e9fdb708 [2.13.0-arch-opt] merge 2023-02-02 20:59:42 +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
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
zhongchao
25663f087b [2.13.0-arch-opt] merge 2023-02-01 17:57:36 +08:00
xuxinchao
f9eeef8cb9 [Opt3.0]消息盒子 2023-02-01 16:26:53 +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
yangyakun
94c6f2696c [gradle 渠道名修改]
[接驳车乘客端和bus乘客端代码合并通过AppIdentityModeUtils 来判断]
2023-01-31 16:53:38 +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
zhongchao
66db271f6c [2.13.0-arch-opt] merg 2023-01-30 22:29:40 +08:00
zhongchao
d46c11767d [2.13.0-arch-opt] merg 2023-01-30 22:28:02 +08:00
yangyakun
4e9d237d3b Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0
# Conflicts:
#	app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt
2023-01-30 15:12:39 +08:00
zhongchao
6d3eeaca50 [2.13.0-arch-opt] merge 2023-01-30 10:47:39 +08:00
yangyakun
947517f98b Merge branch 'dev_arch_opt_3.0' into dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0 2023-01-29 16:28:47 +08:00
zhongchao
8433d0c8de [2.13.0-arch-opt] hmi proxy replace to view 2023-01-29 16:25:06 +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
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
yangyakun
4eae9acbe9 [2.13.2]
[feature]
[接驳车和base添加重用代码basecommon文件夹]
2023-01-17 17:33:02 +08:00
wangmingjun
fca1b294b7 [merge] merge origin branch 2023-01-16 17:45:21 +08:00
wangmingjun
9b503829c3 [merge] 合并接驳车代码 2023-01-16 17:27:27 +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
wangmingjun
6fe28c8dab [1.0.0] 接驳车接口接入 2023-01-06 20:21:01 +08:00
yangyakun
2f5bc5784b [feature] 登录接口分散到bus和taxi乘客端 2023-01-05 18:39:45 +08:00
donghongyu
5fcc0f42ea [dev_arch_opt_3.0]
[Change]
[1、分离工控机引导线、全路径规划]

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2023-01-05 18:17:27 +08:00
wangmingjun
f7dd5731eb [1.0.0] 接驳车opt 2023-01-05 16:25:28 +08:00
wangmingjun
4f29f4b358 [1.0.0] 增加接驳车 2023-01-05 16:04:04 +08:00
yangyakun
dbf2f2e50b bus 司机乘客添加接驳flavor 2023-01-04 16:46:22 +08:00
zhongchao
d9077e8847 [2.13.0-arch-opt] merge 2022-12-28 11:37:33 +08:00
donghongyu
908b307d90 Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into dev_arch_opt_3.0 2022-12-26 14:29:43 +08:00
zhongchao
40caefa91f [2.13.0-opt]remove service module and module-common 2022-12-23 14:09:47 +08:00
wangmingjun
6da7093e5e [2.13.0] 长链接消息通道类型改为const 2022-12-22 11:35:40 +08:00
wangmingjun
40e15f2365 [2.13.0] bus司机端修改接口注释 2022-12-19 17:27:35 +08:00
wangmingjun
2ecc6b7f37 [2.13.0] 解决bus司机端未登陆请求路线接口的问题 2022-12-19 15:31:33 +08:00
wangmingjun
e7cc18eeb4 [2.13.0] 司机端/乘客屏启动自驾埋点处理 2022-12-16 16:14:14 +08:00
donghongyu
60ffd2077b Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into dev_arch_opt_3.0 2022-12-15 13:32:46 +08:00
wangmingjun
23981ae0ff [2.13.0] bus/taxi司机端埋点优化 2022-12-14 17:38:41 +08:00