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

Merge branch 'qa' into dev

Browse Source
This commit is contained in:
wangcongtao
2020-07-06 09:56:49 +08:00
parent 816956b2d7 22cadbc1b5
commit e6b7fdf79d
4 changed files with 61 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
View File

@@ -2,6 +2,7 @@ package com.mogo.module.main;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.FrameLayout;
@@ -26,6 +27,7 @@ import com.mogo.module.main.windowview.FloatingViewHandler;
import com.mogo.service.IMogoServiceApis;
import com.mogo.service.MogoServicePaths;
import com.mogo.service.fragmentmanager.IMogoFragmentManager;
import com.mogo.service.intent.IMogoIntentListener;
import com.mogo.service.map.IMogoMapService;
import com.mogo.service.module.IMogoModuleProvider;
import com.mogo.service.obu.IMogoObuManager;
@@ -43,7 +45,8 @@ import java.util.List;
*/
public class MainActivity extends MvpActivity< MainView, MainPresenter > implements MainView,
IMogoLocationListener,
IMogoMarkerClickListener {
IMogoMarkerClickListener,
IMogoIntentListener {
protected static final String TAG = MainActivity.class.getSimpleName();
@@ -59,6 +62,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
protected FrameLayout mFloatingLayout;
protected FrameLayout mCoverUpLayout;
protected View mLeftShadowFrame;
private boolean mIsHomeKeyDown = false;
@Override
protected int getLayoutId() {
@@ -222,6 +226,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
if ( mCoverUpLayout.getVisibility() != View.VISIBLE ) {
mServiceApis.getAdasControllerApi().showADAS();
}
getApis().getIntentManagerApi().registerIntentListener( Intent.ACTION_CLOSE_SYSTEM_DIALOGS, this );
}
@Override
@@ -229,7 +234,16 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
super.onPause();
mMogoStatusManager.setMainPageResumeStatus( TAG, false );
mMogoStatusManager.setMainPageLaunchedStatus( TAG, false );
mServiceApis.getAdasControllerApi().closeADAS();
if ( !mIsHomeKeyDown ) {
mServiceApis.getAdasControllerApi().closeADAS();
}
mIsHomeKeyDown = false;
}
@Override
protected void onStop() {
super.onStop();
getApis().getIntentManagerApi().unregisterIntentListener( Intent.ACTION_CLOSE_SYSTEM_DIALOGS, this );
}
@Override
@@ -261,6 +275,13 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
return mServiceApis;
}
@Override
public void onIntentReceived( String intentStr, Intent intent ) {
if ( TextUtils.equals( Intent.ACTION_CLOSE_SYSTEM_DIALOGS, intentStr ) ) {
mIsHomeKeyDown = true;
}
}
@Override
protected void onDestroy() {
super.onDestroy();