Merge branch 'dev_robotaxi-d-app-module_2100_220816_2.10.0' into dev_robotaxi-d-app-module_2110_yangyakun_2.11.0

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java

@@ -21,6 +21,7 @@ import com.mogo.commons.debug.DebugConfig;
 import com.mogo.eagle.core.data.temp.EventLogout;
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
+import com.mogo.eagle.core.utilcode.util.AppStateManager;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.och.taxi.R;
 import com.mogo.och.taxi.constant.TaxiOrderStatusEnum;
@@ -386,6 +387,12 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
             if(dialogFragment.getDialog()!=null&&dialogFragment.getDialog().isShowing()){
                 return;
             }
+            if(dialogFragment.getDialog()!=null&&dialogFragment.isAdded()){
+                if (AppStateManager.INSTANCE.currentActivity()==null) {// 没有在当前应用内  在启动页面关闭应用
+                    CallerLogger.INSTANCE.d(M_TAXI + TAG,"showLoginDialogFragment 权限验证");
+                    return;
+                }
+            }
         }
 
         if(taxiLoginDialogFragment==null||taxiLoginDialogFragment.get()==null) {

gradle.properties

@@ -83,7 +83,7 @@ MOGO_TELEMATIC_VERSION=1.4.3.26
 ######## MogoAiCloudSDK Version ########
 # 自研地图
 MAP_SDK_VERSION=2.4.2.3
-MAP_SDK_OPERATION_VERSION=1.1.2
+MAP_SDK_OPERATION_VERSION=1.1.2.4
 # websocket
 WEBSOCKET_VERSION=1.1.7
 ## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级