From 5d714a459f750e5421bf5af6a85bfa66c9ad4606 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Tue, 18 Aug 2020 09:57:05 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=96=B0=E5=A2=9E=E5=B9=BF=E6=92=AD?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E6=8E=A7=E5=88=B6=E6=97=A5=E5=BF=97=E8=BE=93?= =?UTF-8?q?=E5=87=BA=EF=BC=8C=E4=BE=BF=E4=BA=8Erelease=E6=89=93=E5=8C=85?= =?UTF-8?q?=E6=97=B6=E8=B0=83=E8=AF=95=202.=20=E4=BC=98=E5=8C=96accOff?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=91=A8=E8=BE=B9=E8=BD=A6=E5=8F=8B/?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=92=AD=E6=8A=A5=EF=BC=9A=E5=AE=8C=E5=85=A8?= =?UTF-8?q?accOff=E4=B9=8B=E5=90=8E=E6=89=8D=E5=81=9C=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/service/MogoServices.java | 2 + .../intent/AccStatusIntentHandler.java | 4 +- .../service/intent/IntentHandlerFactory.java | 1 + .../intent/MogoControllerIntentHandler.java | 37 +++++++++++++++++++ .../module/service/receiver/MogoReceiver.java | 2 + 5 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MogoControllerIntentHandler.java diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java index 1aa9a224eb..05fbe60ff6 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java @@ -386,6 +386,7 @@ public class MogoServices implements IMogoMapListener, mIntentManager.registerIntentListener( ServiceConst.COMMAND_BACK, this ); mIntentManager.registerIntentListener( MogoReceiver.ACTION_AUTO_NAVI_RECEIVER, this ); mIntentManager.registerIntentListener( MogoReceiver.ACTION_AUTO_NAVI_SEND, this ); + mIntentManager.registerIntentListener( MogoReceiver.ACTION_MOGO, this ); mADASController = MarkerServiceHandler.getADASController(); mLauncher = MarkerServiceHandler.getLauncher(); @@ -479,6 +480,7 @@ public class MogoServices implements IMogoMapListener, filter.addAction( Intent.ACTION_CLOSE_SYSTEM_DIALOGS ); filter.addAction( MogoReceiver.ACTION_AUTO_NAVI_RECEIVER ); filter.addAction( MogoReceiver.ACTION_AUTO_NAVI_SEND ); + filter.addAction( MogoReceiver.ACTION_MOGO ); try { context.getApplicationContext().registerReceiver( mAIAssistReceiver, filter ); Logger.i( TAG, "register voice receiver." ); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java index 6bdcfa4e2e..088cb16919 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java @@ -70,9 +70,9 @@ class AccStatusIntentHandler implements IntentHandler { } Logger.d( TAG, "acc status: %s", state ); MarkerServiceHandler.getMogoStatusManager().setAccStatus( ServiceConst.TYPE, accOn ); - if ( accOn ) { + if ( state == ACC_ON ) { LauncherCardRefresher.getInstance( context ).start(); - } else { + } else if ( state == ACC_OFF ) { LauncherCardRefresher.getInstance( context ).stop(); } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/IntentHandlerFactory.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/IntentHandlerFactory.java index ea84b182e2..1f9939807f 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/IntentHandlerFactory.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/IntentHandlerFactory.java @@ -37,6 +37,7 @@ public class IntentHandlerFactory { mHandlers.put( MogoReceiver.ACTIION_ADAS, ADASStatusIntentHandler.getInstance() ); mHandlers.put( MogoReceiver.ACTION_VOICE_READY, new AIAssistIntentHandler() ); mHandlers.put( ServiceConst.COMMAND_BACK, WholeVoiceCommandIntentHandler.getInstance() ); + mHandlers.put( MogoReceiver.ACTION_MOGO, new MogoControllerIntentHandler() ); } private static final class InstanceHolder { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MogoControllerIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MogoControllerIntentHandler.java new file mode 100644 index 0000000000..237c93580e --- /dev/null +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MogoControllerIntentHandler.java @@ -0,0 +1,37 @@ +package com.mogo.module.service.intent; + +import android.content.Context; +import android.content.Intent; + +import com.mogo.utils.logger.LogLevel; +import com.mogo.utils.logger.Logger; +import com.mogo.utils.network.NetConfig; + +public +/** + * @author congtaowang + * @since 2020/8/17 + * + * 描述 + */ +class MogoControllerIntentHandler implements IntentHandler { + + public static final String KEY_OPER = "oper"; + public static final int TYPE_OPER_OPEN_LOG = 1; + public static final int TYPE_OPER_CLOSE_LOG = 2; + + @Override + public void handle( Context context, Intent intent ) { + int oper = intent.getIntExtra( KEY_OPER, 0 ); + switch ( oper ) { + case TYPE_OPER_OPEN_LOG: + Logger.init( LogLevel.DEBUG ); + NetConfig.instance().setLoggable( true ); + break; + case TYPE_OPER_CLOSE_LOG: + Logger.init( LogLevel.OFF ); + NetConfig.instance().setLoggable( false ); + break; + } + } +} diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/receiver/MogoReceiver.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/receiver/MogoReceiver.java index 411d36b927..d1c1876a1e 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/receiver/MogoReceiver.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/receiver/MogoReceiver.java @@ -58,6 +58,8 @@ public class MogoReceiver extends BroadcastReceiver { // 接受高德发过来的广播 public static final String ACTION_AUTO_NAVI_SEND = "AUTONAVI_STANDARD_BROADCAST_SEND"; + public static final String ACTION_MOGO = "com.mogo.ACTION"; + private IMogoIntentManager mMogoIntentManager; public MogoReceiver(Context context) {