Commit Graph

5 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
aibingbing
65a9d7cdb5 [sweeper运营&云控合并]feat: 添加 云控/运营 业务模式默认配置,SP配置的工具类和gradle设置; 2023-10-23 19:54:59 +08:00
zhongchao
f044cf9a2f [sonar] add impl 2023-10-18 14:11:55 +08:00
yangyakun
566f493203 Merge branch 'dev_minibus-d_230425_3.2.0' into merge320tomaster 2023-06-12 16:45:02 +08:00
yangyakun
8b0f19f5de [sweeper]
[3.1.0]
[分出两个module]
2023-04-24 15:50:38 +08:00