diff --git a/gradle.properties b/gradle.properties index 105d223f6c..b7ecc22157 100644 --- a/gradle.properties +++ b/gradle.properties @@ -73,7 +73,7 @@ MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x MOGO_MODULE_V2X_VERSION=1.1.534 # 推送 -MOGO_MODULE_PUSH_VERSION=1.1.6 +MOGO_MODULE_PUSH_VERSION=1.1.6.1 MOGO_MODULE_PUSH_BASE_VERSION=1.1.5.5 MOGO_MODULE_PUSH_NOOP_VERSION=1.1.5.6 # 广告资源位 diff --git a/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToMainHomeManager.java b/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToMainHomeManager.java index 4ded331a36..1194734bb3 100644 --- a/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToMainHomeManager.java +++ b/modules/mogo-module-back/src/main/java/com/mogo/module/back/BackToMainHomeManager.java @@ -34,8 +34,8 @@ public class BackToMainHomeManager { } public static void backToLauncher() { - if (mStatusManager == null) { - Logger.e(TAG,"未初始化完成"); + if ( mStatusManager == null ) { + Logger.e( TAG, "未初始化完成" ); return; } if ( mStatusManager.isMainPageOnResume() ) { @@ -45,6 +45,10 @@ public class BackToMainHomeManager { return; } + if ( mStatusManager.isAppListUIShow() ) { + mApis.getIntentManagerApi().invoke( Intent.ACTION_CLOSE_SYSTEM_DIALOGS, new Intent() ); + } + Logger.d( TAG, "返回桌面" ); Intent intent = new Intent(); @@ -75,7 +79,7 @@ public class BackToMainHomeManager { params.x = AbsMogoApplication.getApp().getResources().getDimensionPixelOffset( R.dimen.module_back_main_home_icon_left ); params.y = AbsMogoApplication.getApp().getResources().getDimensionPixelOffset( R.dimen.module_back_main_home_icon_top ); params.gravity = Gravity.LEFT | Gravity.CENTER; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ) { params.type = WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY; } else { params.type = WindowManager.LayoutParams.TYPE_SYSTEM_ALERT; diff --git a/modules/mogo-module-extensions/src/main/res/values/strings.xml b/modules/mogo-module-extensions/src/main/res/values/strings.xml index bcfcbae52f..def8fbcd0e 100644 --- a/modules/mogo-module-extensions/src/main/res/values/strings.xml +++ b/modules/mogo-module-extensions/src/main/res/values/strings.xml @@ -13,7 +13,7 @@ 周五 周六 - 99+ + ··· 搜索目的地 分享 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 e606546990..815e360563 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 @@ -717,11 +717,11 @@ public class MogoServices implements IMogoMapListener, if ( isTrue ) { mADASController.showADAS(); refreshStrategy(); - MarkerServiceHandler.getApis().getMapServiceApi().getSingletonLocationClient( mContext ).stop(); + MarkerServiceHandler.getApis().getMapServiceApi().getSingletonLocationClient( mContext ).start(); } else { try { MarkerServiceHandler.getApis().getMapServiceApi().getMarkerManager( mContext ).removeMarkers(); - MarkerServiceHandler.getApis().getMapServiceApi().getSingletonLocationClient( mContext ).start(); + MarkerServiceHandler.getApis().getMapServiceApi().getSingletonLocationClient( mContext ).stop(); } catch ( Exception e ) { Logger.e( TAG, e, "error." ); }