From 3269cda48013d73751c07040710f8d179ab0523c Mon Sep 17 00:00:00 2001
From: lianglihui <lianglihui@zhidaoauto.com>
Date: Fri, 16 Sep 2022 11:35:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?2.10.0=20hdmap=E6=95=B0=E6=8D=AE=E9=87=87?=
 =?UTF-8?q?=E9=9B=86=20,hdmap=20tool=20versioncode=20update=20to=201.1.2.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index a0f811cf43..349da26c0a 100644
--- a/gradle.properties
+++ b/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版本进行升级

From a09a1b5915c277d6ed5575ff2e9a30b5bf40bb0f Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Fri, 16 Sep 2022 12:26:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[fix]=20=E7=AC=AC=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85=E6=9D=83=E9=99=90=E9=A1=B5=E9=9D=A2=E3=80=81?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=AE=8C=E5=85=A8=E5=90=AF=E5=8A=A8=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E5=BA=94=E7=94=A8=E5=BC=B9=E5=87=BA=E4=B8=A4=E4=B8=AA?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
index 27c23d222a..955e7d221b 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
+++ b/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) {