diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java index d93570ae25..f88e6f5fb0 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XShareEventsFragment.java @@ -100,6 +100,8 @@ public class V2XShareEventsFragment extends MvpFragment implements AdapterCallba public void onFail(String msg) { // loadingError(true); } + + }); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java index 17d4904862..767fa9cf60 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java @@ -50,6 +50,7 @@ import com.mogo.utils.logger.Logger; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -165,6 +166,7 @@ public class V2XSurroundingFragment extends MvpFragment exploreWayList) { mV2XAnimationManager.stop(); + mloadingImage.setVisibility(View.GONE); if (exploreWayList != null && exploreWayList.size() > 0) { //展示数据 mTopLayout.setVisibility(View.VISIBLE); @@ -211,10 +213,55 @@ public class V2XSurroundingFragment extends MvpFragment handleMapToList(Map map) { Collection valueCollection = map.values(); - List valueList = new ArrayList<>(valueCollection); + List list = new ArrayList<>(valueCollection); + List resultSurroundingList = new ArrayList<>(); + List outSurroundingList = new ArrayList<>(); - Log.d(TAG, "handleMapToList valueList.size() = " + valueList.size()); - return valueList; + if (list != null && list.size() > 0) { + List prioritySorts = prioritySort(); + for (String poiType : prioritySorts) { + for (SurroundingConstruction construction : list) { + if (!prioritySorts.contains(construction.getPoiType())) { + outSurroundingList.add(construction); + continue; + } else if (poiType.equals(construction.getPoiType())) { + resultSurroundingList.add(construction); + } + } + } + } + + if (outSurroundingList != null && outSurroundingList.size() > 0) { + resultSurroundingList.addAll(outSurroundingList); + } + + Log.d(TAG, "handleMapToList resultSurroundingList.size() = " + resultSurroundingList.size()); + return resultSurroundingList; + } + + public static List prioritySort() { + List poiTypes = new LinkedList<>(); + + // 封路 + poiTypes.add("10003"); + // 结冰 + poiTypes.add("10011"); + // 浓雾 + poiTypes.add("10010"); + // 交通检查 + poiTypes.add("10002"); + // 交通事故 + poiTypes.add("10013"); + // 拥堵 + poiTypes.add("10007"); + // 道路施工 + poiTypes.add("10006"); + // 积水 + poiTypes.add("10008"); + //实时路况 + poiTypes.add("10015"); + + return poiTypes; } /** diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java index 52ef87731e..a2d89e3cba 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java @@ -62,12 +62,12 @@ public class V2XRoadEventScenario extends AbsV2XScenario imp V2XRoadEventEntity v2XRoadEventEntity = v2XMessageEntity.getContent(); if (v2XRoadEventEntity != null) { //只上报事故 - if (v2XRoadEventEntity.getPoiType() != null && v2XRoadEventEntity.getPoiType().equals(MarkerPoiTypeEnum.FOURS_ACCIDENT)) { -// V2XServiceManager.getMoGoStatusManager().setUploadingStatus(ServiceConst.CARD_TYPE_ROAD_CONDITION, true); - TanluUploadParams params = new TanluUploadParams(v2XRoadEventEntity.getPoiType(), - IMogoTanluProvider.UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO); - V2XServiceManager.getTanluManager().uploadRoadCondition(params); - } +// if (v2XRoadEventEntity.getPoiType() != null && v2XRoadEventEntity.getPoiType().equals(MarkerPoiTypeEnum.FOURS_ACCIDENT)) { +//// V2XServiceManager.getMoGoStatusManager().setUploadingStatus(ServiceConst.CARD_TYPE_ROAD_CONDITION, true); +// TanluUploadParams params = new TanluUploadParams(v2XRoadEventEntity.getPoiType(), +// IMogoTanluProvider.UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO); +// V2XServiceManager.getTanluManager().uploadRoadCondition(params); +// } if (v2XMessageEntity.isShowState()) { if (!isSameScenario(v2XMessageEntity)) { 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 deeae6aa1c..1ce8a4fed9 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 @@ -10,30 +10,30 @@ + android:textColor="@color/white" + android:textSize="@dimen/module_v2x_surrounding_top_textsize" /> @@ -42,11 +42,11 @@ android:id="@+id/list_layout_container" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="15px" - android:layout_marginLeft="10px" - android:layout_marginRight="10px" - android:layout_marginBottom="20px" - android:layout_below="@+id/layout_top"> + android:layout_below="@+id/layout_top" + android:layout_marginLeft="@dimen/module_v2x_surrounding_root_margin_left" + android:layout_marginTop="@dimen/module_v2x_surrounding_empty_tv_margin_top" + android:layout_marginRight="@dimen/module_v2x_surrounding_root_margin_left" + android:layout_marginBottom="@dimen/module_v2x_surrounding_margin_left"> - + android:layout_width="200px" + android:layout_height="200px" + android:layout_centerInParent="true" + android:visibility="gone"/> diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml index f40530bbef..407831ac28 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml @@ -2,25 +2,25 @@ + android:layout_height="@dimen/module_v2x_surrounding_item_height"> + android:layout_height="@dimen/module_v2x_surrounding_item_image_height" /> + android:layout_height="@dimen/module_v2x_surrounding_item_bottom"> @@ -31,8 +31,8 @@ android:layout_height="match_parent" android:gravity="center_vertical" android:layout_toRightOf="@+id/iv_event_type" - android:layout_marginLeft="8px" - android:textSize="20px" + android:layout_marginLeft="@dimen/module_v2x_surrounding_item_marigin_bottom_left" + android:textSize="@dimen/module_v2x_surrounding_item_bottom_left_textsize" android:textColor="@color/white" android:text="求助" /> @@ -41,9 +41,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" - android:layout_marginRight="12px" + android:layout_marginRight="@dimen/module_v2x_surrounding_item_marigin_left" android:layout_centerVertical="true" - android:textSize="16px" + android:textSize="@dimen/module_v2x_surrounding_item_bottom_right_textsize" android:textColor="@color/transparent_white_30" android:text="23条" /> diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml index b063c2f4ef..805256bb01 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml @@ -30,4 +30,29 @@ 200px 100px + 35px + 90px + 36px + 58px + 15px + 150px + 48px + 32px + 70px + 10px + 20px + 200px + + 173px + 130px + 43px + 26px + 12px + 8px + + 18px + 20px + 16px + +