董宏宇
ff017d4adf
Merge branch 'feature/feature_show_dispatch' into feature/feature_mogo_obu
# Conflicts:
# .idea/gradle.xml
# .idea/misc.xml
# OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java
# OCH/mogo-och-taxi/src/main/res/values/strings.xml
# app/src/main/java/com/mogo/launcher/MogoApplication.java
# config.gradle
# foudations/httpdns-mogo/src/main/java/com/mogo/httpdns/mogo/MogoHttpDns.java
# foudations/mogo-aicloud-services-apk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java
# foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java
# foudations/mogo-commons/src/main/java/com/mogo/commons/constants/SharedPrefsConstants.java
# gradle.properties
# libraries/map-custom/build.gradle
# libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
# libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java
# modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java
# modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java
# modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java
# modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
# modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java
# modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
# modules/mogo-module-service/src/main/java/com/mogo/module/service/spi/SPIRealTimeUpload.java
# modules/mogo-module-service/src/main/java/com/mogo/module/service/status/EnvStatusManager.java
# modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
# modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java
# modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/warning/V2XWarningMarker.java
# services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java
# services/mogo-service-api/src/main/java/com/mogo/service/connection/IMogoSocketManager.java
# services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java
# services/mogo-service/src/main/java/com/mogo/service/impl/connection/MogoSocketManager.java
2021-08-30 11:59:44 +08:00
..
2021-08-30 11:59:44 +08:00
2021-08-30 11:59:44 +08:00