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

Merge branch 'release_robotaxi-d-app-module_2100_220816_2.10.0.1' into 'master'

Browse Source 
Release robotaxi d app module 2100 220816 2.10.0.1

See merge request zhjt/AndroidApp/MoGoEagleEye!207
This commit is contained in:
pangfan
2022-09-20 06:24:29 +00:00
parent 7492714c48 c9139e7215
commit d4a7c3ece4
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,6 +21,7 @@ import com.mogo.commons.debug.DebugConfig;
import com.mogo.eagle.core.data.temp.EventLogout; import com.mogo.eagle.core.data.temp.EventLogout;
import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; 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.module.common.MogoApisHandler;
import com.mogo.och.taxi.R; import com.mogo.och.taxi.R;
import com.mogo.och.taxi.constant.TaxiOrderStatusEnum; 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()){ if(dialogFragment.getDialog()!=null&&dialogFragment.getDialog().isShowing()){
return; 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) { if(taxiLoginDialogFragment==null||taxiLoginDialogFragment.get()==null) {

2
gradle.properties
View File

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