Commit Graph

3059 Commits

Author SHA1 Message Date
aibingbing
05ed63a358 Merge branch 'dev_robotaxi-d_231129_6.2.2_routing_verify' into dev_robotaxi-d_231201_6.2.2
# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml
2023-12-04 20:58:15 +08:00
aibingbing
9b4b7e99b6 [自主算路验证] refactor: 算路验证模式 高德导航距离,时间不准问题; 2023-12-04 20:15:35 +08:00
aibingbing
f53b6ed553 [自主算路验证] feat: 增加 验证时起点和终点 高精地图Marker ; 2023-12-04 17:00:29 +08:00
yangyakun
cce998c410 Merge branch 'release_robotaxi-d_231031_6.2.0.2' into 6.2.0_merge_master
# Conflicts:
#	OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/fragment/BaseSweeperCloudTabFragment.java
#	OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java
#	OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/model/SweeperOperateTaskModel.java
#	OCH/sweeper/sweeper/build.gradle
#	OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
#	OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/BusArcView.java
#	app/script/functions/och.gradle
#	app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
#	core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml
#	core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml
#	core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
2023-12-04 11:01:17 +08:00
aibingbing
04e7e20c37 [自主算路验证] fix: 进行模式切换后 无人化页面 不能刷新问题,原因为Model,ViewModel,Fragment的绑定问题,当Fragment重建后绑定了新ViewModel, 同时Model是单例,但是Model绑定的ViewModel还是上一个,就会导致数据传递到ViewModel后不能正确传递给新Fragment;
refactor: TaskWithOrder equals 时字段问题;
refactor: 模式切换 和 登出 类似,有些变量需要同等重置;
2023-12-01 21:45:52 +08:00
aibingbing
9a6af41952 [自主算路验证] fix: debug包不展示mock按钮; 2023-12-01 17:24:13 +08:00
aibingbing
45c4ac8652 Merge branch 'dev_robotaxi-d_231031_6.2.0' into dev_robotaxi-d_231129_6.2.2_routing_verify 2023-12-01 13:31:43 +08:00
zhongchao
39cb22cc59 [6.2.0] union the sp call 2023-12-01 11:48:25 +08:00
aibingbing
5ae0afeb2c Merge branch 'dev_robotaxi-d_231031_6.2.0' into dev_robotaxi-d_231129_6.2.2_routing_verify 2023-11-30 19:30:20 +08:00
aibingbing
997c5769cf [自主算路验证] fix: 结束任务时 taskId值不对的问题; 2023-11-30 19:26:27 +08:00
yangyakun
ce7e723368 [6.2.6]
[zhi]
[小智动画变更]
2023-11-30 18:44:45 +08:00
aibingbing
60148ee301 [自主算路验证] refactor: 调整灰度列表item UI样式; 2023-11-30 18:23:04 +08:00
aibingbing
508b7c9059 [自主算路验证] feat: 增加关闭SOPSettingView的入口方法,在登出时 关闭; 2023-11-30 18:22:36 +08:00
zhongchao
6feac30e25 [6.2.0] saas bug fix 2023-11-30 17:17:02 +08:00
zhongchao
64a2f4d722 [6.2.0] fix bug of ui roma passenger view 2023-11-30 16:05:05 +08:00
aibingbing
4cd995569a [自主算路验证] feat: 到终点后 主动弹出 结束任务弹框;
refactor: 算路模式下 接单按钮 修改成置灰UI,但是依然可点击,点击时提示toast;
fix: 到达终点后 需要主动取消自动驾驶,否则会一直在自动驾驶状态和D挡;
2023-11-30 15:14:32 +08:00
yangyakun
929bfabc10 [6.2.0]
[轨迹]
[添加日志]
2023-11-30 11:26:35 +08:00
yangyakun
ccf7f5036b [6.2.0]
[zhi]
[动画修改]
2023-11-29 20:46:53 +08:00
yangyakun
a395384f8d [6.2.0]
[zhi]
[动画修改]
2023-11-29 20:45:14 +08:00
yangyakun
c39db0f0e5 [6.2.0]
[taxi-u]
[今日服务时长-添加日志]
2023-11-29 20:44:28 +08:00
yangyakun
97bec70636 [6.2.0]
[taxi-u]
[今日服务时长-添加日志]
2023-11-29 20:14:11 +08:00
aibingbing
37e6028086 [自主算路验证] fix: 完成任务后 隐藏导航小地图; 2023-11-29 16:50:20 +08:00
aibingbing
d22302dbab Merge branch 'dev_robotaxi-d_231031_6.2.0_routing_verify' into dev_robotaxi-d_231129_6.2.2_routing_verify
# Conflicts:
#	OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt
#	gradle.properties
2023-11-29 16:02:49 +08:00
aibingbing
4a7d84accd [自主算路验证] fix: 修复多次切换模式时 接单按钮 icon未置灰问题; 2023-11-29 15:24:16 +08:00
aibingbing
18345765fe [自主算路验证] fix: 修复多次切换模式时 fragment绑定的viewmodel不起作用问题; 2023-11-29 15:13:34 +08:00
yangyakun
31feb6799e [6.2.0]
[charter]
[add log]
2023-11-29 10:38:48 +08:00
aibingbing
b4c1fed7d4 [自主算路验证] opt: 优化 接单 按钮置灰 样式,优化任务标题展示; 2023-11-28 21:18:19 +08:00
yangyakun
f5d4136b87 [6.2.0]
[统计]
[去除重复项]
2023-11-28 20:58:59 +08:00
yangyakun
9962010feb [6.2.0]
[zhi]
[小智动画]
2023-11-28 20:58:31 +08:00
yangyakun
3c5e20a8ca [6.2.0]
[nav]
[高德导航声音放入single线程]
2023-11-28 20:57:43 +08:00
aibingbing
de59d9f166 [自主算路验证] opt: 优化模式切换互斥逻辑,优化启自驾逻辑,优化选择路线item UI; 2023-11-28 16:16:48 +08:00
yangyakun
d5dfdd2209 [6.2.0]
[charter]
[revert]
2023-11-28 13:25:47 +08:00
yangyakun
73d3884549 [6.2.0]
[shuttle-p]
[接驳删除漫游]
2023-11-28 10:26:39 +08:00
aibingbing
eec68fe3bc [自主算路验证] feat: 增加自主算路验证模式流程关键节点日志,优化相关布局UI,增加模式互斥相关逻辑; 2023-11-27 21:50:18 +08:00
yangyakun
70bb0ce91b [6.2.0]
[taxi taxi-u]
[高德导航使用single 线程]
2023-11-27 19:12:32 +08:00
yangyakun
6bd6dfc881 [6.2.0]
[charter]
[靠边停车重新起步后修改美化模式]
2023-11-27 18:27:55 +08:00
yangyakun
3b9dc99ed4 [6.2.0]
[shuttle]
[视角切换]
2023-11-27 18:17:37 +08:00
yangyakun
03866881a8 [6.2.0]
[bugfix]
2023-11-27 16:01:39 +08:00
yangyakun
0f75f30a6f [6.2.0]
[bugfix]
[小智动画]
2023-11-27 11:59:30 +08:00
yangyakun
b7b7626351 [6.2.0]
[bugfix]
[taxi 预加载缓存 导致高德地图停止计算]
2023-11-27 11:33:32 +08:00
aibingbing
2c33619e03 [自主算路验证] feat: 联调后端接口,增加自动自驾,高德导航相关逻辑; 2023-11-24 21:22:16 +08:00
yangyakun
76973c5bd8 [6.2.0]
[taxi]
[计算距离线的距离 需要加上航向角]
2023-11-24 16:35:26 +08:00
yangyakun
11b43efd27 [6.2.0]
[taxiu]
[默认图片不修改]
2023-11-24 14:29:28 +08:00
yangyakun
071ba28ae1 [6.2.0]
[taxi-p taxiu-p]
[文案修改]
2023-11-24 14:27:36 +08:00
aibingbing
2eec825543 [自主算路验证] feat: 增加接口定义及管理类,Model, ViewModel 各层次之间依赖等; 2023-11-23 21:36:16 +08:00
yangyakun
806915e9aa [6.2.0]
[och-common]
[模拟靠边停车]
2023-11-23 19:32:05 +08:00
yangyakun
e63a39bcae [6.2.0]
[charter-p]
[新人引导]
2023-11-23 19:23:53 +08:00
yangyakun
30756fe16a [6.2.0]
[shuttle-p]
[开始站点和结束站点单独图片]
2023-11-23 19:21:52 +08:00
yangyakun
ffc746fecd [6.2.0]
[shuttle-p]
[开始站点和结束站点单独图片]
2023-11-23 12:21:49 +08:00
yangyakun
a6d624e381 [6.2.0]
[taxi]
[bugfix]
2023-11-22 19:37:40 +08:00