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

Dev robotaxi d app module 2100 220816 2.10.0

See merge request zhjt/AndroidApp/MoGoEagleEye!208
This commit is contained in:
pangfan
2022-09-20 06:27:35 +00:00

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.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) {