Merge branch 'dev/dev_eagle_architecture_upgrade' into dev/dev_eagle_check

Browse Source

# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	gradle.properties
#	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/status/EnvStatusManager.java
#	services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
#	services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java

...

This commit is contained in:

liujing

2021-09-15 18:09:27 +08:00

parent a246aa956b 1d00537cbd

commit a4631f7880

1270 changed files with 23741 additions and 379701 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

BIN

foudations/httpdns-base/build/intermediates/library_java_res/debug/res.jar Normal file

Binary file not shown.