Merge branch 'feature/feature_show_dispatch' into feature/feature_mogo_obu

Browse Source

# 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

...

This commit is contained in:

董宏宇

2021-08-30 11:59:44 +08:00

parent d8916d12a8 c9bd2644ab

commit ff017d4adf

77 changed files with 2068 additions and 151534 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

15365

modules/mogo-module-service/src/main/assets/adas0.txt

File diff suppressed because it is too large Load Diff

15315

modules/mogo-module-service/src/main/assets/adas1.txt

File diff suppressed because it is too large Load Diff

15265

modules/mogo-module-service/src/main/assets/adas2.txt

File diff suppressed because it is too large Load Diff

15215

modules/mogo-module-service/src/main/assets/adas3.txt

File diff suppressed because it is too large Load Diff

15165

modules/mogo-module-service/src/main/assets/adas4.txt

File diff suppressed because it is too large Load Diff

15115

modules/mogo-module-service/src/main/assets/adas5.txt

File diff suppressed because it is too large Load Diff

15065

modules/mogo-module-service/src/main/assets/adas6.txt

File diff suppressed because it is too large Load Diff

15015

modules/mogo-module-service/src/main/assets/adas7.txt

File diff suppressed because it is too large Load Diff

14965

modules/mogo-module-service/src/main/assets/adas8.txt

File diff suppressed because it is too large Load Diff

14915

modules/mogo-module-service/src/main/assets/adas9.txt

File diff suppressed because it is too large Load Diff