Commit Graph

20 Commits

Author SHA1 Message Date
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
yangyakun
fcdd2deacd [6.2.0]
[noop]
[删除]
2023-11-17 18:10:20 +08:00
aibingbing
6aa424c34e [sweeper运营&云控合并]feat: 增加运营面板的控制开关以及业务模式切换逻辑;feat:修改版本号V6.1.0;feat:增加业务模式切换的埋点; 2023-10-30 20:38:35 +08:00
aibingbing
65a9d7cdb5 [sweeper运营&云控合并]feat: 添加 云控/运营 业务模式默认配置,SP配置的工具类和gradle设置; 2023-10-23 19:54:59 +08:00
aibingbing
de55548d2f [sweeper运营&云控合并]refactor: module name Sweeper->Driver, 删除gradle中与SweeperCloud有关的部分; 2023-10-18 11:09:33 +08:00
yangyakun
6995d00fbc [6.0.0]
[bus]
[bus结构变更]
2023-08-28 11:21:47 +08:00
yangyakun
0b17fd5ca3 [6.0.0]
[shuttle]
[变更文件夹]
2023-08-23 15:37:11 +08:00
yangyakun
bc0da716b6 [6.0.0]
[taxi moudle rename]
2023-08-22 15:55:10 +08:00
yangyakun
a3b595703e [5.0.0]
[包车moudle修改]
2023-08-10 20:42:30 +08:00
yangyakun
5b01cc4750 [5.0.0]
[taxi乘客无人化]
2023-08-03 20:16:37 +08:00
yangyakun
2fb852e836 [3.5.0]
[taxi 统合]
2023-08-03 14:59:43 +08:00
wangmingjun
489e2ef869 [6.0.0] taxi司机端重构初始化 2023-07-31 18:14:41 +08:00
yangyakun
566f493203 Merge branch 'dev_minibus-d_230425_3.2.0' into merge320tomaster 2023-06-12 16:45:02 +08:00
yangyakun
55ce1b812b [gradle]
[3.2.0]
[gradle rebuild bugfix]
2023-05-19 19:09:55 +08:00
yangyakun
8b66dfee89 [charter]
[3.2.0]
[引用修改]
2023-05-18 18:09:27 +08:00
yangyakun
2df00c16ad [gradle]
[多屏修改]
2023-04-18 14:14:21 +08:00
yangyakun
750be7b99d [gradle]
[sweeper、bus、shuttle 分离]
2023-03-29 12:00:00 +08:00
yangyakun
d35ba98076 [gradle]
[taxi、charter 删除多配置文件]
2023-03-27 11:39:03 +08:00
yangyakun
23f8125cb5 [gradle]
[合并离线的信息]
2023-03-23 20:21:39 +08:00
yangyakun
856120c3b2 [gradle]
[文件收集]
2023-03-21 14:50:26 +08:00