diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_normal.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_normal.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_normal.png rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_normal.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_pressed.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_pressed.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_pressed.png rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_pressed.png diff --git a/modules/mogo-module-common/src/main/res/drawable/module_common_selector_call.xml b/modules/mogo-module-common/src/main/res/drawable/module_common_selector_call.xml new file mode 100644 index 0000000000..edc0ec8bc3 --- /dev/null +++ b/modules/mogo-module-common/src/main/res/drawable/module_common_selector_call.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-common/src/main/res/drawable/selector_call_btn_normal.png b/modules/mogo-module-common/src/main/res/drawable/selector_call_btn_normal.png new file mode 100644 index 0000000000..361ea19865 Binary files /dev/null and b/modules/mogo-module-common/src/main/res/drawable/selector_call_btn_normal.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable/selector_service_car_panel_call.xml b/modules/mogo-module-service/src/main/res/drawable/selector_service_car_panel_call.xml deleted file mode 100644 index f24ebf2862..0000000000 --- a/modules/mogo-module-service/src/main/res/drawable/selector_service_car_panel_call.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml b/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml index e11c589602..13915be41a 100644 --- a/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml +++ b/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml @@ -62,7 +62,7 @@ android:layout_width="@dimen/modle_car_panel_call" android:layout_height="@dimen/modle_car_panel_call" android:layout_marginEnd="@dimen/modle_car_panel_call_margin" - android:background="@drawable/selector_service_car_panel_call" + android:background="@drawable/module_common_selector_call" android:padding="@dimen/module_services_panel_item_detail_padding" android:textColor="@color/module_services_panel_item_detail_textColor" android:textSize="@dimen/module_services_panel_item_detail_textSize" diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java index 1ef623aac8..d7e2dd62a7 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java @@ -15,7 +15,6 @@ import com.mogo.map.navi.IMogoNaviListener; import com.mogo.module.v2x.fragment.V2XEventPanelFragment; import com.mogo.service.eventpanel.IEventPanelProvider; import com.mogo.service.module.IMogoModuleLifecycle; -import com.mogo.service.module.IMogoModuleProvider; import com.mogo.service.module.ModuleType; import com.mogo.utils.logger.Logger; @@ -35,6 +34,7 @@ public class V2XEventPanelModuleProvider implements @Override public Fragment createFragment(Context context, Bundle data) { + Logger.e(MODULE_NAME, "事件模版 createFragment。。。。"); V2XServiceManager.init(context); return V2XEventPanelFragment.Companion.getInstance(); } @@ -92,21 +92,28 @@ public class V2XEventPanelModuleProvider implements @Override public void init(Context context) { + V2XServiceManager.init(context); Logger.e(MODULE_NAME, "事件模版 模块初始化。。。。"); } @Override public void showPanelWithSelectedItem(int item) { - V2XEventPanelFragment.Companion.getInstance().showPanelWithSelectedItem(item); + if (!V2XServiceManager.getMoGoStatusManager().isMainPageIsBackground()) { + V2XEventPanelFragment.Companion.getInstance().showPanelWithSelectedItem(item); + } } @Override public void showPanel() { - V2XEventPanelFragment.Companion.getInstance().showPanel(); + if (!V2XServiceManager.getMoGoStatusManager().isMainPageIsBackground()) { + V2XEventPanelFragment.Companion.getInstance().showPanel(); + } } @Override public void hidePanel() { - V2XEventPanelFragment.Companion.getInstance().hidePanel(); + if (!V2XServiceManager.getMoGoStatusManager().isMainPageIsBackground()) { + V2XEventPanelFragment.Companion.getInstance().hidePanel(); + } } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java index 834de905b1..214c4a0764 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java @@ -63,7 +63,7 @@ public class V2XScenarioHistoryRoadEventVH extends V2XBaseViewHolder coordinates = message.getCoordinates(); List entityList = new ArrayList<>(); - // 移除上一次的数据 - //Context context = V2XServiceManager.getContext(); for (V2XMarkerEntity coordinate : coordinates) { //故障车机 if (coordinate.getTargetId() == V2XPoiTypeEnum.ALERT_CAR_TROUBLE_WARNING) { - //V2XMarkerEntity.UserInfoBean userInfoBean = coordinate.getUserInfo(); - //if (userInfoBean != null) { entityList.add(coordinate); - //} - //绘制 - //V2XServiceManager - // .getMoGoV2XMarkerManager() - // .drawableSpecialCarPOI(context, coordinate, V2XMarkerClickListener.getInstance()); } } if (!entityList.isEmpty()) { - //V2XUtils.runOnUiThread(() -> V2XServiceManager.getMoGoV2XScenarioManager().showOtherSeekHelpWindow(entityList)); V2XUtils.runOnUiThread(() -> { V2XMessageEntity> v2XMessageEntity = new V2XMessageEntity<>(); v2XMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_SEEK_WARNING); 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 a81d3afe76..5c9bfbafe2 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 @@ -56,66 +56,70 @@ public class V2XScenarioManager implements IV2XScenarioManager { @Override public void handlerMessage(V2XMessageEntity v2XMessageEntity) { //Logger.d(MODULE_NAME, "处理V2X场景：" + GsonUtil.jsonFromObject(v2XMessageEntity)); - synchronized (V2XScenarioManager.class) { - // 展示 - V2XUtils.runOnUiThread(() -> { - // 提取之前存储的场景 - if (v2XMessageEntity != null) { + try { + synchronized (V2XScenarioManager.class) { + // 展示 + V2XUtils.runOnUiThread(() -> { + // 提取之前存储的场景 + if (v2XMessageEntity != null) { - // 广播给应用内部其它模块 - Intent intent = new Intent(V2XConst.BROADCAST_SCENE_ACTION); - intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity); - LocalBroadcastManager.getInstance(V2XUtils.getApp()).sendBroadcast(intent); + // 广播给应用内部其它模块 + Intent intent = new Intent(V2XConst.BROADCAST_SCENE_ACTION); + intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity); + LocalBroadcastManager.getInstance(V2XUtils.getApp()).sendBroadcast(intent); - mV2XScenario = mV2XScenarioSet.get(v2XMessageEntity.getType()); - // 如果没有拿到之前的，根据类型分发 - if (mV2XScenario == null) { - switch (v2XMessageEntity.getType()) { - case V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING: - mV2XScenario = V2XRoadEventScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_SEEK_WARNING: - mV2XScenario = V2XSeekHelpScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_FATIGUE_DRIVING: - mV2XScenario = V2XFatigueDrivingScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_WINDOW_WARNING: - mV2XScenario = V2XPushEventScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_LIVE_CAR_WARNING: - mV2XScenario = V2XPushLiveCarScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_ANIMATION_WARNING: - mV2XScenario = V2XAnimationScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP: - mV2XScenario = V2XCarForHelpScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_ILLEGAL_PARK_WARNING: - mV2XScenario = V2XIllegalParkScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_EVENT_UGC_WARNING: - mV2XScenario = V2XEventUgcScenario.getInstance(); - break; - default: - Logger.e(MODULE_NAME, "当前V2X消息类型未定义。"); - TipToast.tip("当前V2X消息类型未定义"); - return; + mV2XScenario = mV2XScenarioSet.get(v2XMessageEntity.getType()); + // 如果没有拿到之前的，根据类型分发 + if (mV2XScenario == null) { + switch (v2XMessageEntity.getType()) { + case V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING: + mV2XScenario = V2XRoadEventScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_SEEK_WARNING: + mV2XScenario = V2XSeekHelpScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_FATIGUE_DRIVING: + mV2XScenario = V2XFatigueDrivingScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_WINDOW_WARNING: + mV2XScenario = V2XPushEventScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_LIVE_CAR_WARNING: + mV2XScenario = V2XPushLiveCarScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_ANIMATION_WARNING: + mV2XScenario = V2XAnimationScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP: + mV2XScenario = V2XCarForHelpScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_ILLEGAL_PARK_WARNING: + mV2XScenario = V2XIllegalParkScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_EVENT_UGC_WARNING: + mV2XScenario = V2XEventUgcScenario.getInstance(); + break; + default: + Logger.e(MODULE_NAME, "当前V2X消息类型未定义。"); + TipToast.tip("当前V2X消息类型未定义"); + return; + } + } + + // 展示最新的消息 + if (mV2XScenario != null) { + if (v2XMessageEntity.getType() != V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP) { + hidOtherPanel(); + } + mV2XScenario.init(v2XMessageEntity); + mV2XScenarioSet.put(v2XMessageEntity.getType(), mV2XScenario); } } - - // 展示最新的消息 - if (mV2XScenario != null) { - if (v2XMessageEntity.getType() != V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP) { - hidOtherPanel(); - } - mV2XScenario.init(v2XMessageEntity); - mV2XScenarioSet.put(v2XMessageEntity.getType(), mV2XScenario); - } - } - }); + }); + } + } catch (Exception e) { + e.printStackTrace(); } } diff --git a/modules/mogo-module-v2x/src/main/res/drawable/selector_call_btn.xml b/modules/mogo-module-v2x/src/main/res/drawable/selector_call_btn.xml deleted file mode 100644 index bae6d6289a..0000000000 --- a/modules/mogo-module-v2x/src/main/res/drawable/selector_call_btn.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml index 8d055540e7..bb00ca4b09 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml @@ -112,7 +112,7 @@ android:layout_width="@dimen/module_v2x_event_button_size" android:layout_height="@dimen/module_v2x_event_button_size" android:layout_marginEnd="@dimen/dp_40" - android:src="@drawable/selector_call_btn" + android:src="@drawable/module_common_selector_call" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/ivFaultHelpEventNavi" diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_normal_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/selector_call_btn_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_normal_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/selector_call_btn_light.png diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_pressed_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/selector_call_btn_pressed_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/service_car_panel_call_pressed_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable-xhdpi/selector_call_btn_pressed_light.png diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_selector_call_light.xml b/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_selector_call_light.xml new file mode 100644 index 0000000000..44b5570c79 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-common-res/drawable/module_common_selector_call_light.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_normal_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable/selector_call_btn_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_normal_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable/selector_call_btn_light.png diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_pressed_light.png b/skin/mogo-skin-light/src/main/module-common-res/drawable/selector_call_btn_pressed_light.png similarity index 100% rename from skin/mogo-skin-light/src/main/module-services-res/drawable/service_car_panel_call_pressed_light.png rename to skin/mogo-skin-light/src/main/module-common-res/drawable/selector_call_btn_pressed_light.png diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml b/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml deleted file mode 100644 index a0367b590f..0000000000 --- a/skin/mogo-skin-light/src/main/module-services-res/drawable/selector_service_car_panel_call_light.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file