yangyakun
|
b24e2443f3
|
Merge branch 'dev_robotaxi-d_231205_6.2.6' into dev_robotaxi-d_231218_6.2.6
# Conflicts:
# OCH/bus/passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java
|
2023-12-18 11:28:25 +08:00 |
|
zhongchao
|
360e3ac169
|
[6.2.4]merge
|
2023-12-14 15:28:45 +08:00 |
|
xuxinchao
|
50613f6502
|
Merge branch 'dev_robotaxi-d_231201_6.2.4_dev' into dev_robotaxi-d_231206_6.2.4
|
2023-12-06 16:43:12 +08:00 |
|
yangyakun
|
ae0c0cf7e6
|
[6.2.6]
[common]
[合并]
|
2023-12-05 11:37:14 +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
|
a6cc6e7027
|
[sweeper运营&云控合并]refactor: 优化日志；
|
2023-11-09 16:33:56 +08:00 |
|
aibingbing
|
26dc901f8d
|
[sweeper运营&云控合并]feat:修改版本V6.2.0；refactor: 为了避免在同一pad上反复安装可切换模式和不可切换模式的app, 这里加上判断；
|
2023-11-03 11:19:54 +08:00 |
|
aibingbing
|
2644a4b641
|
[sweeper运营&云控合并]refactor: 优化文案；
|
2023-11-01 11:36:32 +08:00 |
|
aibingbing
|
2ac50f7040
|
[sweeper运营&云控合并]feat:增加清扫云控&运营 关键节点日志，并补充日志内容；
|
2023-10-31 20:56:02 +08:00 |
|
aibingbing
|
6aa424c34e
|
[sweeper运营&云控合并]feat: 增加运营面板的控制开关以及业务模式切换逻辑；feat：修改版本号V6.1.0；feat：增加业务模式切换的埋点；
|
2023-10-30 20:38:35 +08:00 |
|
aibingbing
|
a215ccc112
|
[sweeper运营&云控合并]refactor: SweeperOperate & SweeperCloud 相同的代码提取common, 类名、layout、包名等加上operate/cloud前缀区分；
|
2023-10-18 19:35:49 +08:00 |
|
aibingbing
|
de55548d2f
|
[sweeper运营&云控合并]refactor: module name Sweeper->Driver, 删除gradle中与SweeperCloud有关的部分；
|
2023-10-18 11:09:33 +08:00 |
|