Merge remote-tracking branch 'origin/feature/v1.0.0' into feature/v1.0.0

# Conflicts: # modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
2020-01-09 16:39:00 +08:00
parent db7dee0ae6 fad82745a3
commit 542a94d5b2
4 changed files with 71 additions and 20 deletions
--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/SearchFragmentProvider.java
+++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/SearchFragmentProvider.java
@@ -57,7 +57,7 @@ public class SearchFragmentProvider implements IMogoModuleProvider {

    @Override
    public int getType() {
-        return ModuleType.TYPE_CARD_FRAGMENT;
+        return ModuleType.TYPE_NAVI;
    }

    @Override