diff --git a/.idea/misc.xml b/.idea/misc.xml index 707ee6e613..2dc54c489f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index a0d2d6dfd6..5cd9635be6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,33 +27,34 @@ PASSWORD=xintai2018 RELEASE=false # 模块版本 ## 工程内模块 -MOGO_COMMONS_VERSION=1.2.0 -MOGO_UTILS_VERSION=1.2.0 -MAP_AMAP_VERSION=1.2.0 -MAP_AUTONAVI_VERSION=1.2.0 -MOGO_MAP_VERSION=1.2.0 -MOGO_MAP_API_VERSION=1.2.0 -MOGO_SERVICE_VERSION=1.2.0 -MOGO_SERVICE_API_VERSION=1.2.0 -MOGO_CONNECTION_VERSION=1.2.0 -MOGO_MODULE_APPS_VERSION=1.2.0 -MOGO_MODULE_NAVI_VERSION=1.2.0 -MOGO_MODULE_SHARE_VERSION=1.2.0 -MOGO_MODULE_COMMON_VERSION=1.2.0 -MOGO_MODULE_MAIN_VERSION=1.2.0 -MOGO_MODULE_MAP_VERSION=1.2.0 -MOGO_MODULE_SERVICE_VERSION=1.2.0 -MOGO_MODULE_EXTENSIONS_VERSION=1.2.0 -MOGO_MODULE_SEARCH_VERSION=1.2.0 -MOGO_MODULE_BACK_VERSION=1.2.0 -MOGO_MODULE_GPS_SIMULATOR_VERSION=1.2.0 -MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.2.0 -MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.2.0 -MOGO_MODULE_AUTHORIZE_VERSION=1.2.0 -MOGO_MODULE_GUIDE_VERSION=1.2.0 +MOGO_COMMONS_VERSION=1.2.1 +MOGO_UTILS_VERSION=1.2.1 +MAP_AMAP_VERSION=1.2.1 +MAP_AUTONAVI_VERSION=1.2.1 +MOGO_MAP_VERSION=1.2.1 +MOGO_MAP_API_VERSION=1.2.1 +MOGO_SERVICE_VERSION=1.2.1 +MOGO_SERVICE_API_VERSION=1.2.1 +MOGO_CONNECTION_VERSION=1.2.1 +MOGO_MODULE_APPS_VERSION=1.2.1 +MOGO_MODULE_NAVI_VERSION=1.2.1 +MOGO_MODULE_SHARE_VERSION=1.2.1 +MOGO_MODULE_COMMON_VERSION=1.2.1 +MOGO_MODULE_MAIN_VERSION=1.2.1 +MOGO_MODULE_MAP_VERSION=1.2.1 +MOGO_MODULE_SERVICE_VERSION=1.2.1 +MOGO_MODULE_EXTENSIONS_VERSION=1.2.1 +MOGO_MODULE_SEARCH_VERSION=1.2.1 +MOGO_MODULE_BACK_VERSION=1.2.1 +MOGO_MODULE_GPS_SIMULATOR_VERSION=1.2.1 +MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.2.1 +MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.2.1 +MOGO_MODULE_AUTHORIZE_VERSION=1.2.1 +MOGO_MODULE_GUIDE_VERSION=1.2.1 +MOGO_MODULE_MEDIA_VERSION=1.2.1 -MOGO_MODULE_MAIN_LAUNCHER_VERSION = 1.0.0.1 -MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 1.0.0.1 +MOGO_MODULE_MAIN_LAUNCHER_VERSION = 1.0.0.2 +MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 1.0.0.2 ## 工程外部模块 @@ -71,8 +72,6 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x MOGO_MODULE_V2X_VERSION=1.1.10-SNAPSHOT -# 媒体卡片 -MOGO_MODULE_MEDIA_VERSION=1.0.4.11 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 diff --git a/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/WebSocketManager.java b/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/WebSocketManager.java index 85f0cffb2b..cafbf5b56d 100644 --- a/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/WebSocketManager.java +++ b/modules/mogo-module-gps-simulator-debug/src/main/java/com/mogo/module/gps/simulator/WebSocketManager.java @@ -2,10 +2,8 @@ package com.mogo.module.gps.simulator; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.AbsMogoApplication; -import com.mogo.map.MogoLatLng; import com.mogo.map.location.IMogoLocationListener; import com.mogo.map.location.MogoLocation; -import com.mogo.map.navi.IMogoCarLocationChangedListener; import com.mogo.map.navi.IMogoNavi; import com.mogo.service.IMogoServiceApis; import com.mogo.service.MogoServicePaths; diff --git a/modules/mogo-module-gps-simulator/build.gradle b/modules/mogo-module-gps-simulator/build.gradle index df36963bb0..73ea023119 100644 --- a/modules/mogo-module-gps-simulator/build.gradle +++ b/modules/mogo-module-gps-simulator/build.gradle @@ -31,11 +31,6 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation rootProject.ext.dependencies.arouter - if (Boolean.valueOf(RELEASE)) { - implementation rootProject.ext.dependencies.mogomoduleauth - } else { - implementation project(':modules:mogo-module-authorize') - } } apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index 3ef61ea88e..da11006d9e 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -116,6 +116,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mServiceApis = ( IMogoServiceApis ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICE_APIS ).navigation(); } mMogoStatusManager = mServiceApis.getStatusManagerApi(); + mMogoStatusManager.setMainPageLaunchedStatus( TAG, true ); AutopilotServiceManage.getInstance().init( getContext() ); } @@ -260,6 +261,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme @Override protected void onDestroy() { super.onDestroy(); + mMogoStatusManager.setMainPageLaunchedStatus( TAG, false ); mMogoMapService = null; mMogoMapUIController = null; mMogoFragmentManager = null; diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java index 6827bafe78..b22f33d0a7 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java @@ -577,6 +577,11 @@ public class MogoServices implements IMogoMapListener, @Override public void onLocationChanged( MogoLocation location ) { + + if ( !mStatusManager.isMainPageLaunched() ) { + return; + } + if ( mStatusManager.isV2XShow() ) { return; } @@ -621,6 +626,10 @@ public class MogoServices implements IMogoMapListener, * 刷新数据 */ private void notifyRefreshData( MogoLatLng latLng, int radius, RefreshCallback callback ) { + if ( !mStatusManager.isMainPageLaunched() ) { + return; + } + if ( mStatusManager.isSearchUIShow() ) { return; } diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusManager.java b/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusManager.java index 07930bc5fb..5b3257652f 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusManager.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/IMogoStatusManager.java @@ -103,6 +103,13 @@ public interface IMogoStatusManager extends IProvider { */ boolean isUploading(); + /** + * 主页是否已启动 + * + * @return + */ + boolean isMainPageLaunched(); + /** * 设置小智语音UI状态 * @@ -207,6 +214,14 @@ public interface IMogoStatusManager extends IProvider { */ void setUploadingStatus( String tag, boolean uploading ); + /** + * 设置主页是否启动 + * + * @param tag + * @param launched + */ + void setMainPageLaunchedStatus( String tag, boolean launched ); + /** * 注册监听 * diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/StatusDescriptor.java b/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/StatusDescriptor.java index 16856adb4f..2acf766c45 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/StatusDescriptor.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/statusmanager/StatusDescriptor.java @@ -73,5 +73,10 @@ public enum StatusDescriptor { /** * 上报状态 */ - UPLOADING; + UPLOADING, + + /** + * 是否已经进入过主页 + */ + MAIN_PAGE_CREATED; } diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java index ca20247a71..06a9ce1779 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java @@ -116,6 +116,11 @@ public class MogoStatusManager implements IMogoStatusManager { return get_bool_val( StatusDescriptor.UPLOADING ); } + @Override + public boolean isMainPageLaunched() { + return get_bool_val( StatusDescriptor.MAIN_PAGE_CREATED ); + } + private boolean get_bool_val( StatusDescriptor descriptor ) { Boolean val = mStatus.get( descriptor ); return val == null ? false : val; @@ -193,6 +198,11 @@ public class MogoStatusManager implements IMogoStatusManager { doSetStatus( tag, StatusDescriptor.UPLOADING, uploading ); } + @Override + public void setMainPageLaunchedStatus( String tag, boolean launched ) { + doSetStatus( tag, StatusDescriptor.MAIN_PAGE_CREATED, launched ); + } + private void doSetStatus( String tag, StatusDescriptor target, boolean value ) { mStatus.put( target, value ); invokeStatusChangedListener( target, value ); diff --git a/upload.sh b/upload.sh index f2d05856f2..7db7627dd9 100755 --- a/upload.sh +++ b/upload.sh @@ -8,22 +8,22 @@ ./gradlew :libraries:map-amap:clean :libraries:map-amap:uploadArchives ./gradlew :libraries:map-autonavi:clean :libraries:map-autonavi:uploadArchives ./gradlew :libraries:mogo-map:clean :libraries:mogo-map:uploadArchives -./gradlew :services:mogo-service:clean :services:mogo-service:uploadArchives ./gradlew :modules:mogo-module-common:clean :modules:mogo-module-common:uploadArchives +./gradlew :services:mogo-service:clean :services:mogo-service:uploadArchives ./gradlew :modules:mogo-module-map:clean :modules:mogo-module-map:uploadArchives ./gradlew :modules:mogo-module-apps:clean :modules:mogo-module-apps:uploadArchives -./gradlew :modules:mogo-module-service:clean :modules:mogo-module-service:uploadArchives -./gradlew :modules:mogo-module-share:clean :modules:mogo-module-share:uploadArchives -./gradlew :modules:mogo-module-authorize:clean :modules:mogo-module-authorize:uploadArchives -./gradlew :modules:mogo-module-extensions:clean :modules:mogo-module-extensions:uploadArchives ./gradlew :modules:mogo-module-gps-simulator:clean :modules:mogo-module-gps-simulator:uploadArchives +./gradlew :modules:mogo-module-gps-simulator-debug:clean :modules:mogo-module-gps-simulator-debug:uploadArchives +./gradlew :modules:mogo-module-gps-simulator-noop:clean :modules:mogo-module-gps-simulator-noop:uploadArchives +./gradlew :modules:mogo-module-service:clean :modules:mogo-module-service:uploadArchives +./gradlew :modules:mogo-module-authorize:clean :modules:mogo-module-authorize:uploadArchives +./gradlew :modules:mogo-module-share:clean :modules:mogo-module-share:uploadArchives +./gradlew :modules:mogo-module-extensions:clean :modules:mogo-module-extensions:uploadArchives ./gradlew :modules:mogo-module-search:clean :modules:mogo-module-search:uploadArchives ./gradlew :modules:mogo-module-media:clean :modules:mogo-module-media:uploadArchives ./gradlew :modules:mogo-module-back:clean :modules:mogo-module-back:uploadArchives ./gradlew :modules:mogo-module-main:clean :modules:mogo-module-main:uploadArchives ./gradlew :modules:mogo-module-guide:clean :modules:mogo-module-guide:uploadArchives -./gradlew :modules:mogo-module-gps-simulator-debug:clean :modules:mogo-module-gps-simulator-debug:uploadArchives -./gradlew :modules:mogo-module-gps-simulator-noop:clean :modules:mogo-module-gps-simulator-noop:uploadArchives ./gradlew :main-extensions:mogo-module-main-independent:clean :main-extensions:mogo-module-main-independent:uploadArchives ./gradlew :main-extensions:mogo-module-main-launcher:clean :main-extensions:mogo-module-main-launcher:uploadArchives