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

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

Browse Source
This commit is contained in:
tongchenfei
2020-05-29 20:29:46 +08:00
parent 13e407524d b302f4387a
commit 42d2ce266a
4 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
</project>

48
gradle.properties
View File

@@ -27,34 +27,34 @@ PASSWORD=xintai2018
RELEASE=false
# 模块版本
## 工程内模块
MOGO_COMMONS_VERSION=1.1.0.14
MOGO_UTILS_VERSION=1.1.0.14
MAP_AMAP_VERSION=1.1.0.14
MOGO_MAP_VERSION=1.1.0.14
MOGO_MAP_API_VERSION=1.1.0.14
MOGO_SERVICE_VERSION=1.1.0.14
MOGO_SERVICE_API_VERSION=1.1.0.14
MOGO_CONNECTION_VERSION=1.1.0.14
MOGO_MODULE_APPS_VERSION=1.1.0.14
MOGO_MODULE_NAVI_VERSION=1.1.0.14
MOGO_MODULE_SHARE_VERSION=1.1.0.14
MOGO_MODULE_COMMON_VERSION=1.1.0.14
MOGO_MODULE_MAIN_VERSION=1.1.0.14
MOGO_MODULE_MAP_VERSION=1.1.0.14
MOGO_MODULE_SERVICE_VERSION=1.1.0.14
MOGO_MODULE_EXTENSIONS_VERSION=1.1.0.14
MOGO_MODULE_SEARCH_VERSION=1.1.0.14
MOGO_MODULE_BACK_VERSION=1.1.0.14
MOGO_MODULE_GPS_SIMULATOR_VERSION=1.1.0.14
MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.1.0.14
MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.1.0.14
MOGO_MODULE_AUTHORIZE_VERSION=1.1.0.14
MOGO_MODULE_GUIDE_VERSION=1.1.0.14
MOGO_COMMONS_VERSION=1.1.0.15
MOGO_UTILS_VERSION=1.1.0.15
MAP_AMAP_VERSION=1.1.0.15
MOGO_MAP_VERSION=1.1.0.15
MOGO_MAP_API_VERSION=1.1.0.15
MOGO_SERVICE_VERSION=1.1.0.15
MOGO_SERVICE_API_VERSION=1.1.0.15
MOGO_CONNECTION_VERSION=1.1.0.15
MOGO_MODULE_APPS_VERSION=1.1.0.15
MOGO_MODULE_NAVI_VERSION=1.1.0.15
MOGO_MODULE_SHARE_VERSION=1.1.0.15
MOGO_MODULE_COMMON_VERSION=1.1.0.15
MOGO_MODULE_MAIN_VERSION=1.1.0.15
MOGO_MODULE_MAP_VERSION=1.1.0.15
MOGO_MODULE_SERVICE_VERSION=1.1.0.15
MOGO_MODULE_EXTENSIONS_VERSION=1.1.0.15
MOGO_MODULE_SEARCH_VERSION=1.1.0.15
MOGO_MODULE_BACK_VERSION=1.1.0.15
MOGO_MODULE_GPS_SIMULATOR_VERSION=1.1.0.15
MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.1.0.15
MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.1.0.15
MOGO_MODULE_AUTHORIZE_VERSION=1.1.0.15
MOGO_MODULE_GUIDE_VERSION=1.1.0.15
## 工程外部模块
# 探路
MOGO_MODULE_TANLU_VERSION=1.0.6-SNAPSHOT
MOGO_MODULE_TANLU_VERSION=1.0.6.3
# 车聊聊
CARCHATTING_VERSION=1.0.4-SNAPSHOT
# 车聊聊接口

3
modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerExploreWay.java
View File

@@ -137,6 +137,9 @@ public class MarkerExploreWay implements Serializable {
}
public String getPoiType() {
if ( TextUtils.isEmpty( poiType ) ) {
return MarkerPoiTypeEnum.FOURS_BLOCK_UP;
}
return poiType;
}

3
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
View File

@@ -286,7 +286,6 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent
if(rootView!=null) {
TopViewAnimHelper.getInstance().init(rootView);
}
TopViewAnimHelper.getInstance().setIMogoMapUIController( mMApUIController );
mExitNavi = findViewById( R.id.module_entrance_id_exit_navi );
mExitNavi.setOnClickListener( view -> {
@@ -379,6 +378,8 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent
mMogoStatusManager.registerStatusChangedListener( TAG, StatusDescriptor.UPLOADING, this );
mMogoStatusManager.registerStatusChangedListener( TAG, StatusDescriptor.DISPLAY_OVERVIEW, this );
TopViewAnimHelper.getInstance().setIMogoMapUIController( mMApUIController );
}
@Override