From 92f83ea4cc68ccb5db413dd113ea42dbe2de1c23 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Mon, 28 Sep 2020 09:32:18 +0800 Subject: [PATCH 1/5] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8Dm4=E6=9C=BA=E5=99=A8?= =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E7=BD=91=E7=BB=9C=E9=97=AE=E9=A2=98=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=97=A0=E6=B3=95=E5=8A=A0=E8=BD=BD=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E8=A7=86=E5=9B=BE=E8=B7=AF=E5=86=B5=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=202.=20=E5=8E=BB=E6=8E=89=E4=BA=8B=E4=BB=B6=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E9=87=8D=E5=A4=8D=E7=9A=84=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/launcher/MogoApplication.java | 1 - .../mogo/map/impl/amap/AMapViewWrapper.java | 6 ++- .../com/mogo/module/service/MogoServices.java | 9 +++++ .../service/intent/IntentHandlerFactory.java | 2 + .../service/intent/MockIntentHandler.java | 3 ++ .../intent/NetworkChangedIntentHandler.java | 38 +++++++++++++++++++ 6 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/NetworkChangedIntentHandler.java diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 23b3058a00..41316c66a1 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -86,7 +86,6 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addBaseModule( new MogoModule( V2XConst.PATH_V2X_UI, V2XConst.MODULE_NAME ) ); MogoModulePaths.addBaseModule( new MogoModule( MogoServicePaths.PATH_STRATEGY_SHARE, "StrategyShare" ) ); MogoModulePaths.addBaseModule( new MogoModule( MogoServicePaths.PATH_MOGO_MONITOR, "MogoMonitor" ) ); - MogoModulePaths.addModule( new MogoModule( V2XConst.PATH_EVENT_PANEL, V2XConst.MODULE_NAME_EVENT_PANEL ) ); MogoModulePaths.addModule( new MogoModule( PushUIConstants.PATH, PushUIConstants.NAME ) ); if ( !DebugConfig.isLauncher() ) { diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java index 9ee5089486..7cca05598b 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java @@ -48,6 +48,7 @@ import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.map.uicontroller.MapCameraPosition; import com.mogo.map.uicontroller.MapControlResult; +import com.mogo.utils.NetworkUtils; import com.mogo.utils.WindowUtils; import com.mogo.utils.logger.Logger; @@ -163,7 +164,9 @@ public class AMapViewWrapper implements IMogoMapView, // mMapView.setRouteOverlayVisible( false ); // mMapView.setCarOverlayVisible( false ); changeMapMode( EnumMapUI.CarUp_2D ); - setTrafficEnabled( true ); + if ( NetworkUtils.isConnected( mMapView.getContext() ) ) { + setTrafficEnabled( true ); + } mMapView.getMap().moveCamera( CameraUpdateFactory.zoomTo( mDefaultZoomLevel ) ); } @@ -309,6 +312,7 @@ public class AMapViewWrapper implements IMogoMapView, @Override public void setTrafficEnabled( boolean visible ) { if ( checkMapView() ) { + Logger.d( TAG, "setTrafficEnabled" ); mMapView.getMap().setTrafficEnabled( true ); } } 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 11f2adf816..3cd8dc89bd 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 @@ -5,6 +5,8 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.location.Location; +import android.net.ConnectivityManager; +import android.net.wifi.WifiManager; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -64,6 +66,7 @@ import com.mogo.service.module.MogoAction; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.service.statusmanager.StatusDescriptor; +import com.mogo.utils.NetworkUtils; import com.mogo.utils.UiThreadHandler; import com.mogo.utils.WorkThreadHandler; import com.mogo.utils.logger.Logger; @@ -408,6 +411,7 @@ public class MogoServices implements IMogoMapListener, mIntentManager.registerIntentListener( MogoReceiver.ACTION_AUTO_NAVI_SEND, this ); mIntentManager.registerIntentListener( MogoReceiver.ACTION_MOGO, this ); mIntentManager.registerIntentListener( ServiceConst.COMMAND_ONLINE_CAR_PANEL, this ); + mIntentManager.registerIntentListener( ConnectivityManager.CONNECTIVITY_ACTION, this ); mADASController = MarkerServiceHandler.getADASController(); mLauncher = MarkerServiceHandler.getLauncher(); @@ -503,6 +507,7 @@ public class MogoServices implements IMogoMapListener, filter.addAction( MogoReceiver.ACTION_AUTO_NAVI_SEND ); filter.addAction( MogoReceiver.ACTION_MOGO ); filter.addAction( MogoReceiver.ACTION_TXZ_BLOCK_SEARCH ); + filter.addAction( ConnectivityManager.CONNECTIVITY_ACTION ); try { context.getApplicationContext().registerReceiver( mAIAssistReceiver, filter ); Logger.i( TAG, "register voice receiver." ); @@ -865,6 +870,10 @@ public class MogoServices implements IMogoMapListener, } else if ( ServiceConst.COMMAND_PREVIOUS.equals( command ) ) { onActionDone( MogoAction.Prev ); } else { + if ( TextUtils.equals( command, ConnectivityManager.CONNECTIVITY_ACTION ) + && NetworkUtils.isConnected( mContext ) ) { + mIntentManager.unregisterIntentListener( ConnectivityManager.CONNECTIVITY_ACTION, this ); + } IntentHandlerFactory.getInstance().handle( mContext, command, intent ); } } 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 0124379b5d..8139853b6e 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 @@ -2,6 +2,7 @@ package com.mogo.module.service.intent; import android.content.Context; import android.content.Intent; +import android.net.ConnectivityManager; import com.mogo.module.service.ServiceConst; import com.mogo.module.service.receiver.AccStatusReceiver; @@ -39,6 +40,7 @@ public class IntentHandlerFactory { mHandlers.put( ServiceConst.COMMAND_BACK, WholeVoiceCommandIntentHandler.getInstance() ); mHandlers.put( MogoReceiver.ACTION_MOGO, new MogoControllerIntentHandler() ); mHandlers.put( ServiceConst.COMMAND_ONLINE_CAR_PANEL, new OnlineCarPanelIntentHandler() ); + mHandlers.put( ConnectivityManager.CONNECTIVITY_ACTION, new NetworkChangedIntentHandler() ); } private static final class InstanceHolder { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java index 89a0c1fb74..473261dc5b 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java @@ -345,6 +345,9 @@ public class MockIntentHandler implements IntentHandler { intent3.putExtra( "EXTRA_REQUEST_AUTO_STATE", 0 ); context.sendBroadcast( intent3 ); break; + case 32: + MarkerServiceHandler.getMapService().getMapUIController().setTrafficEnabled( true ); + break; } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/NetworkChangedIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/NetworkChangedIntentHandler.java new file mode 100644 index 0000000000..c61ff760eb --- /dev/null +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/NetworkChangedIntentHandler.java @@ -0,0 +1,38 @@ +package com.mogo.module.service.intent; + +import android.content.Context; +import android.content.Intent; + +import com.mogo.module.common.MogoApisHandler; +import com.mogo.utils.NetworkUtils; +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 NetworkChangedIntentHandler implements IntentHandler { + + private static final String TAG = "NetworkChangedIntentHandler"; + + @Override + public void handle( Context context, Intent intent ) { + if ( NetworkUtils.isConnected( context ) ) { + try { + Logger.d( TAG, "setTrafficEnabled" ); + MogoApisHandler.getInstance() + .getApis() + .getMapServiceApi() + .getMapUIController() + .setTrafficEnabled( true ); + } catch ( Exception e ) { + e.printStackTrace(); + } + } + } +} From f68814f02b2efdd36761988a96c87d4d8e0784c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 28 Sep 2020 10:53:22 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E3=80=90=E7=9B=AE?= =?UTF-8?q?=E7=9A=84=E5=9C=B0=E8=BD=A6=E5=8F=8B=E3=80=91=E8=A7=A6=E5=8F=91?= =?UTF-8?q?=E4=BA=86V2X=E4=BA=8B=E4=BB=B6=EF=BC=8C=E7=9B=AE=E7=9A=84?= =?UTF-8?q?=E5=9C=B0=E8=BD=A6=E5=8F=8B=E9=A1=B5=E9=9D=A2=E6=9C=AA=E5=85=B3?= =?UTF-8?q?=E9=97=AD=20http://jira.zhidaohulian.com/browse/E85XJD-206?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/v2x/scenario/impl/V2XScenarioManager.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java index b55f61e4f1..1129944f32 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java @@ -72,34 +72,27 @@ public class V2XScenarioManager implements IV2XScenarioManager { if (mV2XScenario == null) { switch (v2XMessageEntity.getType()) { case V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING: - hidOtherPanel(); mV2XScenario = V2XRoadEventScenario.getInstance(); break; case V2XMessageEntity.V2XTypeEnum.ALERT_SEEK_WARNING: - hidOtherPanel(); mV2XScenario = V2XSeekHelpScenario.getInstance(); break; case V2XMessageEntity.V2XTypeEnum.ALERT_FATIGUE_DRIVING: - hidOtherPanel(); mV2XScenario = V2XFatigueDrivingScenario.getInstance(); break; case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_WINDOW_WARNING: - hidOtherPanel(); mV2XScenario = V2XPushEventScenario.getInstance(); break; case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_LIVE_CAR_WARNING: - hidOtherPanel(); mV2XScenario = V2XPushLiveCarScenario.getInstance(); break; case V2XMessageEntity.V2XTypeEnum.ALERT_ANIMATION_WARNING: - hidOtherPanel(); mV2XScenario = V2XAnimationScenario.getInstance(); break; case V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP: mV2XScenario = V2XCarForHelpScenario.getInstance(); break; case V2XMessageEntity.V2XTypeEnum.ALERT_ILLEGAL_PARK_WARNING: - hidOtherPanel(); mV2XScenario = V2XIllegalParkScenario.getInstance(); break; default: @@ -111,6 +104,9 @@ public class V2XScenarioManager implements IV2XScenarioManager { // 展示最新的消息 if (mV2XScenario != null) { + if (v2XMessageEntity.getType() != V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP) { + hidOtherPanel(); + } mV2XScenario.init(v2XMessageEntity); mV2XScenarioSet.put(v2XMessageEntity.getType(), mV2XScenario); } From 15ccde7191fbd9e8fab7357db6d7ac8151826174 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 28 Sep 2020 11:28:53 +0800 Subject: [PATCH 3/5] opt --- .../com/mogo/module/extensions/entrance/EntranceFragment.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index e6579f2e41..d00ba77ff0 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -400,10 +400,8 @@ public class EntranceFragment extends MvpFragment Date: Mon, 28 Sep 2020 14:15:13 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=80=8F=E6=98=8E=E5=80=BC-=E5=AE=8C?= =?UTF-8?q?=E5=85=A8=E4=B8=8D=E9=80=8F=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml index 8790c3b9a1..cf7e43c2c0 100644 --- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml +++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_alert_window_bg_light.xml @@ -29,7 +29,7 @@ From 2978fb74d7cfa0e5989425bff3d0635606305104 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Mon, 28 Sep 2020 14:22:17 +0800 Subject: [PATCH 5/5] opt ui --- .idea/misc.xml | 2 +- modules/mogo-module-extensions/src/main/res/values/dimens.xml | 2 +- modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml | 2 +- modules/mogo-module-main/src/main/res/values/dimens.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index cd77a1f062..21e99e2dc0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml index e0ccc1e24d..bc7e325604 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -146,7 +146,7 @@ 58px 3dp 10px - 4px + 6px 6px 10px diff --git a/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml index d27dfc19e4..707ac832c0 100644 --- a/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml @@ -17,7 +17,7 @@ 319px 110px - 10px + 6px 15px 460px 444px diff --git a/modules/mogo-module-main/src/main/res/values/dimens.xml b/modules/mogo-module-main/src/main/res/values/dimens.xml index d27dfc19e4..707ac832c0 100644 --- a/modules/mogo-module-main/src/main/res/values/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values/dimens.xml @@ -17,7 +17,7 @@ 319px 110px - 10px + 6px 15px 460px 444px