Merge branch 'dev' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev

This commit is contained in:
wangcongtao
2020-06-09 20:12:26 +08:00
10 changed files with 23 additions and 13 deletions

View File

@@ -11,6 +11,7 @@ import androidx.annotation.Nullable;
import androidx.viewpager.widget.ViewPager;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.mvp.MvpActivity;
import com.mogo.commons.voice.AIAssist;
import com.mogo.map.location.IMogoLocationClient;
@@ -235,7 +236,11 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
@Override
public void onBackPressed() {
if ( mMogoFragmentManager.getStackSize() == 0 ) {
return;
if(DebugConfig.isLauncher()) {
return;
}else{
super.onBackPressed();
}
}
if ( mMogoFragmentManager != null ) {
mMogoFragmentManager.pop();