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

dev

Browse Source
This commit is contained in:
wangcongtao
2020-04-09 20:58:46 +08:00
parent 4c373d92fd
commit a88291edf9
16 changed files with 319 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,9 +1,7 @@
package com.mogo.module.main;
import android.content.Intent;
import android.content.res.Resources;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.FrameLayout;
@@ -15,7 +13,6 @@ import androidx.viewpager.widget.ViewPager;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.commons.mvp.MvpActivity;
import com.mogo.commons.voice.AIAssist;
import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
import com.mogo.map.location.IMogoLocationClient;
import com.mogo.map.location.IMogoLocationListener;
import com.mogo.map.location.MogoLocation;
@@ -24,8 +21,6 @@ import com.mogo.map.marker.IMogoMarkerClickListener;
import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.module.common.MogoModule;
import com.mogo.module.common.MogoModulePaths;
import com.mogo.module.main.assist.MapBroadCastHelper;
import com.mogo.module.main.cards.CardIntroduceConfig;
import com.mogo.module.main.cards.CardIntroduceConfigs;
import com.mogo.module.main.cards.CardModulesAdapter;
import com.mogo.module.main.cards.HorizentalStackTransformer;
@@ -33,26 +28,17 @@ import com.mogo.module.main.cards.MogoModulesHandler;
import com.mogo.module.main.cards.MogoModulesManager;
import com.mogo.module.main.cards.OnPageChangeListenerAdapter;
import com.mogo.module.main.cards.OrientedViewPager;
import com.mogo.module.main.cards.VerticalStackTransformer;
import com.mogo.module.main.constants.VoiceConstants;
import com.mogo.module.main.windowview.WindowViewHandler;
import com.mogo.module.service.ServiceConst;
import com.mogo.service.IMogoServiceApis;
import com.mogo.service.MogoServicePaths;
import com.mogo.service.cardmanager.IMogoCardChangedListener;
import com.mogo.service.cardmanager.IMogoCardManager;
import com.mogo.service.fragmentmanager.IMogoFragmentManager;
import com.mogo.service.intent.IMogoIntentListener;
import com.mogo.service.intent.IMogoIntentManager;
import com.mogo.service.map.IMogoMapService;
import com.mogo.service.module.IMogoModuleProvider;
import com.mogo.service.statusmanager.IMogoStatusManager;
import com.mogo.utils.UiThreadHandler;
import com.mogo.utils.logger.Logger;
import org.json.JSONException;
import org.json.JSONObject;
import java.util.List;
/**
@@ -373,14 +359,12 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
@Override
protected void onResume() {
MapBroadCastHelper.getInstance( this ).mapFrount();
super.onResume();
mMogoStatusManager.setMainPageResumeStatus( TAG, true );
}
@Override
protected void onPause() {
MapBroadCastHelper.getInstance( this ).mapBackground();
super.onPause();
mMogoStatusManager.setMainPageResumeStatus( TAG, false );
CardIntroduceConfigs.flush( getApplicationContext() );

85
modules/mogo-module-main/src/main/java/com/mogo/module/main/assist/MapBroadCastHelper.java
View File

@@ -1,85 +0,0 @@
package com.mogo.module.main.assist;
import android.content.Context;
import android.content.Intent;
import android.text.TextUtils;
import android.util.Log;
import com.mogo.map.navi.MogoNaviInfo;
import com.mogo.module.service.receiver.MogoReceiver;
import com.mogo.service.impl.intent.IntentManager;
import com.mogo.service.intent.IMogoIntentListener;
/**
* @author zyz
* 2020-01-17.
*/
public class MapBroadCastHelper implements IMogoIntentListener {
private static volatile MapBroadCastHelper sInstance;
private static final String ACTION_NAV_SEND = "AUTONAVI_STANDARD_BROADCAST_SEND";
private static final int STATUS_NAV_FRONT = 3;
private static final int STATUS_NAV_BACKGROUND = 4;
private static final int STATUS_NAV_START = 8;
private static final int STATUS_NAV_STOP = 9;
private Context context;
private MapBroadCastHelper(Context context) {
this.context = context;
IntentManager.getInstance().registerIntentListener(MogoReceiver.ACTION_VOICE_READY,this);
}
public static MapBroadCastHelper getInstance( Context context ) {
if ( sInstance == null ) {
synchronized ( MapBroadCastHelper.class ) {
if ( sInstance == null ) {
sInstance = new MapBroadCastHelper( context );
}
}
}
return sInstance;
}
public void notifyXiaozhi(MogoNaviInfo naviinfo) {
Intent intent = new Intent(ACTION_NAV_SEND);
intent.putExtra("KEY_TYPE", 10001);
intent.putExtra("NEXT_ROAD_NAME", naviinfo.getNextRoadName());
intent.putExtra("ROUTE_REMAIN_TIME_AUTO", naviinfo.getVoiceRetainTime());
intent.putExtra("ROUTE_REMAIN_DIS_AUTO", naviinfo.getVoiceRetainDistance());
intent.putExtra("ICON", naviinfo.getIconResId());
context.sendBroadcast(intent);
Log.v("MapBroadCastHelper","action="+ACTION_NAV_SEND+"NaviInfo");
}
public void notifyXizhiNavStatus(int status) {
Intent intent =new Intent(ACTION_NAV_SEND);
intent.putExtra("KEY_TYPE", 10019);
intent.putExtra("EXTRA_STATE", status);
intent.putExtra("SOURCE_APP", context.getPackageName());
context.sendBroadcast(intent);
Log.v("MapBroadCastHelper","NavStatus="+status);
}
public void mapFrount(){
notifyXizhiNavStatus(STATUS_NAV_FRONT);
}
public void mapBackground(){
notifyXizhiNavStatus(STATUS_NAV_BACKGROUND);
}
public void startNavi(){
notifyXizhiNavStatus(STATUS_NAV_START);
}
public void stopNavi(){
notifyXizhiNavStatus(STATUS_NAV_STOP);
}
@Override public void onIntentReceived(String intentStr, Intent intent) {
if (TextUtils.equals(intentStr, MogoReceiver.ACTION_VOICE_READY)) {
mapFrount();
}
}
}

5
modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java
View File

@@ -3,7 +3,6 @@ package com.mogo.module.main.cards;
import android.content.Context;
import android.content.Intent;
import android.text.TextUtils;
import android.util.Log;
import android.view.MotionEvent;
import androidx.fragment.app.Fragment;
@@ -28,7 +27,6 @@ import com.mogo.module.common.MogoModule;
import com.mogo.module.common.MogoModulePaths;
import com.mogo.module.extensions.ExtensionsModuleConst;
import com.mogo.module.main.MainActivity;
import com.mogo.module.main.assist.MapBroadCastHelper;
import com.mogo.module.main.registercenter.MogoRegisterCenterHandler;
import com.mogo.module.service.receiver.MogoReceiver;
import com.mogo.service.IMogoServiceApis;
@@ -442,7 +440,6 @@ public class MogoModulesManager implements MogoModulesHandler,
@Override
public void onNaviInfoUpdate( MogoNaviInfo naviinfo ) {
MapBroadCastHelper.getInstance( getApplicationContext() ).notifyXiaozhi( naviinfo );
Iterator< IMogoNaviListener > iterator = MogoRegisterCenterHandler.getInstance().getNaviListeners();
if ( iterator == null ) {
@@ -465,7 +462,6 @@ public class MogoModulesManager implements MogoModulesHandler,
Iterator< IMogoNaviListener > iterator = MogoRegisterCenterHandler.getInstance().getNaviListeners();
mTrackManager.track( "Navigation_begin", new HashMap<>() );
MapBroadCastHelper.getInstance( getApplicationContext() ).startNavi();
if ( iterator == null ) {
return;
}
@@ -484,7 +480,6 @@ public class MogoModulesManager implements MogoModulesHandler,
@Override
public void onStopNavi() {
mTrackManager.track( "Navigation_end", new HashMap<>() );
MapBroadCastHelper.getInstance( getApplicationContext() ).stopNavi();
Iterator< IMogoNaviListener > iterator = MogoRegisterCenterHandler.getInstance().getNaviListeners();
if ( iterator == null ) {
return;