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 e0321d28af..b2471ce6ec 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
@@ -400,7 +400,7 @@ public class MogoServices implements IMogoMapListener,
*/
private void closeAllPanel() {
- if ( mCallProviderResponse != null ) {
+ if ( mCallProviderResponse == null ) {
mCallProviderResponse = new ICallChatResponse() {
@Override
public void hideUserWindowError(@NotNull String errorMsg) {
@@ -411,9 +411,11 @@ public class MogoServices implements IMogoMapListener,
MogoApisHandler.getInstance().getApis().getOnlineCarPanelApi().hidePanel();
MogoApisHandler.getInstance().getApis().getAdasControllerApi().setSettingStatus(false);
MogoApisHandler.getInstance().getApis().getEventPanelManager().hidePanel();
- carsChattingProvider = (ICarsChattingProvider) ARouter.getInstance().build(CallChattingProviderConstant.CAR_CALL_PROVIDER).navigation();
+ if ( carsChattingProvider == null ) {
+ carsChattingProvider = (ICarsChattingProvider) ARouter.getInstance().build(CallChattingProviderConstant.CAR_CALL_PROVIDER).navigation();
+ }
if ( carsChattingProvider != null ) {
- carsChattingProvider.hideUserWindow("MOGO_COMMON_SERVICE", mContext, mCallProviderResponse);
+ carsChattingProvider.hideUserWindow(TAG, mContext, mCallProviderResponse);
}
}
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 4b04d99478..2ee9216924 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
@@ -65,6 +65,11 @@ class AccStatusIntentHandler implements IntentHandler {
if ( state != ACC_OFF && state != ACC_ON && state != ACC_OFF_DELAY ) {
return;
}
+ if ( state == ACC_ON || state == ACC_OFF_DELAY ) {
+ Intent newIntent = new Intent( "com.freedom.ser.ACTION" );
+ newIntent.putExtra( "acc", true );
+ context.sendBroadcast( newIntent );
+ }
boolean accOn = state == ACC_ON;
if ( MarkerServiceHandler.getMogoStatusManager().isAccOn() == accOn ) {
return;
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
index 57fd474a50..b9b2ecf8f1 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
@@ -92,7 +92,7 @@
android:layout_marginTop="@dimen/module_v2x_surrounding_empty_tv_margin_top"
android:gravity="center_horizontal"
android:text="周边5公里,暂无交通事件"
- android:textColor="@color/v2x_FFF_333"
+ android:textColor="@color/v2x_FFF_666"
android:textSize="@dimen/module_v2x_surrounding_top_textsize" />
-
+
\ No newline at end of file