yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoModulePaths.java
This commit is contained in:
zhangyuanzhen
2020-01-06 14:18:44 +08:00
parent 32c3b24b84 f93d15f80a
commit 4f3cfb99d1
329 changed files with 8519 additions and 7810 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragmentProvider.java
View File

@@ -14,6 +14,7 @@ import com.mogo.map.navi.IMogoNaviListener;
import com.mogo.module.common.MogoModulePaths;
import com.mogo.service.module.IMogoModuleLifecycle;
import com.mogo.service.module.IMogoModuleProvider;
import com.mogo.service.module.ModuleType;
/**
* @author congtaowang
@@ -57,7 +58,7 @@ public class AppsFragmentProvider implements IMogoModuleProvider {
@Override
public int getType() {
return IMogoModuleProvider.TYPE_FRAGMENT;
return ModuleType.TYPE_APP_LIST;
}
@Override