From 5322d03ec130baa3e0af26a4e6b93d3f12c5e2c5 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 10 Nov 2022 11:58:05 +0800 Subject: [PATCH] wait --- .../impl/marker/MapMarkerAdapter.java | 14 +- .../impl/marker/MapMarkerInfoView.java | 125 ------------------ .../function/impl/marker/MapMarkerView.java | 4 +- .../drawable/bg_map_marker_yellow_info.xml | 15 +++ .../res/drawable/bg_shape_reverse_yellow.xml | 17 +++ .../core/data/config}/CloudPoiManager.java | 10 +- .../eagle/core/data/enums/EventTypeEnum.kt | 41 +++--- .../main/res/drawable-xhdpi/icon_car_red.png | Bin .../module_common_ic_rc_accident3.png | Bin .../module_common_ic_rc_accident3_white.png | Bin .../module_common_ic_rc_dark_frog2.png | Bin .../module_common_ic_rc_dark_frog2_white.png | Bin .../module_common_ic_rc_freeze2.png | Bin .../module_common_ic_rc_freeze2_white.png | Bin .../module_common_ic_rc_illegal_park.png | Bin ...module_common_ic_rc_illegal_park_white.png | Bin .../module_common_icon_map_marker_living.png | Bin ...le_common_icon_map_marker_living_white.png | Bin ...odule_common_icon_map_marker_pondingl2.png | Bin ...common_icon_map_marker_pondingl2_white.png | Bin ...common_icon_map_marker_road_block_off2.png | Bin ..._icon_map_marker_road_block_off2_white.png | Bin ..._common_icon_map_marker_road_block_up2.png | Bin ...n_icon_map_marker_road_block_up2_white.png | Bin ...ule_common_icon_map_marker_road_check2.png | Bin ...mmon_icon_map_marker_road_check2_white.png | Bin ...dule_common_icon_map_marker_road_work2.png | Bin ...ommon_icon_map_marker_road_work2_white.png | Bin .../module_common_icon_seek_help.png | Bin .../mogo_image_accident_small.png | Bin .../mogo_image_daolushigong_nor.png | Bin .../mogo_image_daolushigong_small.png | Bin .../drawable-xhdpi/mogo_image_fenglu_nor.png | Bin .../mogo_image_fenglu_small.png | Bin .../mogo_image_jiaotongjiancha_nor.png | Bin .../mogo_image_jiaotongjiancha_small.png | Bin .../mogo_image_jiaotongshigu_nor.png | Bin .../drawable-xhdpi/mogo_image_jiebing_nor.png | Bin .../mogo_image_jiebing_small.png | Bin .../drawable-xhdpi/mogo_image_jishui_nor.png | Bin .../mogo_image_jishui_small.png | Bin .../drawable-xhdpi/mogo_image_nongwu_nor.png | Bin .../mogo_image_nongwu_small.png | Bin .../mogo_image_shishilukuang_small.png | Bin .../mogo_image_shishlukuang_nor.png | Bin .../drawable-xhdpi/mogo_image_yongdu_nor.png | Bin .../mogo_image_yongdu_small.png | Bin .../v2x_icon_daolushigong_vr.png | Bin 0 -> 4355 bytes .../res/drawable-xhdpi/v2x_icon_fenglu_vr.png | Bin 0 -> 18071 bytes .../v2x_icon_jiaotongjiancha_vr.png | Bin 0 -> 5733 bytes .../v2x_icon_jiaotongshigu_vr.png | Bin 0 -> 4512 bytes .../res/drawable-xhdpi/v2x_icon_jishui_vr.png | Bin 0 -> 17600 bytes .../res/drawable-xhdpi/v2x_icon_live_logo.png | Bin 0 -> 5165 bytes .../res/drawable-xhdpi/v2x_icon_nongwu_vr.png | Bin 0 -> 14896 bytes .../res/drawable-xhdpi/v2x_icon_yongdu_vr.png | Bin 0 -> 4491 bytes .../res/drawable-xhdpi/v_to_x_marker_1.png | Bin .../res/drawable-xhdpi/v_to_x_marker_11.png | Bin .../res/drawable-xhdpi/v_to_x_marker_16.png | Bin .../res/drawable-xhdpi/v_to_x_marker_2.png | Bin .../res/drawable-xhdpi/v_to_x_marker_3.png | Bin .../res/drawable-xhdpi/v_to_x_marker_5.png | Bin .../res/drawable-xhdpi/v_to_x_marker_6.png | Bin .../res/drawable-xhdpi/v_to_x_marker_7.png | Bin .../res/drawable-xhdpi/v_to_x_marker_8.png | Bin .../res/drawable-xhdpi/v_to_x_marker_9.png | Bin .../drawable-xhdpi/v_to_x_warning_car_red.png | Bin .../res/drawable/bg_v2x_event_type_orange.xml | 0 .../drawable/bg_v2x_event_type_orange_vr.xml | 0 .../res/drawable/bg_v2x_event_type_read.xml | 0 .../res/drawable/bg_v2x_event_type_red_vr.xml | 0 .../src/main/res/values/dimens.xml | 1 + .../mogo/commons/module/CloudPoiManager.java | 110 --------------- .../com/mogo/commons/module/MogoServices.java | 1 + .../mogo/module/common/marker/PoiWrapper.java | 97 -------------- .../service/marker/MapMarkerManager.java | 2 +- 75 files changed, 68 insertions(+), 369 deletions(-) delete mode 100644 core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapMarkerInfoView.java create mode 100644 core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_map_marker_yellow_info.xml create mode 100644 core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_shape_reverse_yellow.xml rename {modules/mogo-module-common/src/main/java/com/mogo/module/common/utils => core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config}/CloudPoiManager.java (97%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/icon_car_red.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/module_common_ic_rc_accident3.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/module_common_ic_rc_accident3_white.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/module_common_ic_rc_dark_frog2.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/module_common_ic_rc_dark_frog2_white.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/module_common_ic_rc_freeze2.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/module_common_ic_rc_freeze2_white.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/module_common_ic_rc_illegal_park.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/module_common_ic_rc_illegal_park_white.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/module_common_icon_map_marker_living.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/module_common_icon_map_marker_living_white.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/module_common_icon_map_marker_pondingl2.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/module_common_icon_map_marker_pondingl2_white.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_off2.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_off2_white.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_up2.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_up2_white.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_check2.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_check2_white.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_work2.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_work2_white.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/module_common_icon_seek_help.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/mogo_image_accident_small.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/mogo_image_daolushigong_nor.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/mogo_image_daolushigong_small.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/mogo_image_fenglu_nor.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/mogo_image_fenglu_small.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_nor.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_small.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/mogo_image_jiaotongshigu_nor.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/mogo_image_jiebing_nor.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/mogo_image_jiebing_small.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/mogo_image_jishui_nor.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/mogo_image_jishui_small.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/mogo_image_nongwu_nor.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/mogo_image_nongwu_small.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/mogo_image_shishilukuang_small.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/mogo_image_shishlukuang_nor.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/mogo_image_yongdu_nor.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/mogo_image_yongdu_small.png (100%) create mode 100644 core/mogo-core-res/src/main/res/drawable-xhdpi/v2x_icon_daolushigong_vr.png create mode 100644 core/mogo-core-res/src/main/res/drawable-xhdpi/v2x_icon_fenglu_vr.png create mode 100644 core/mogo-core-res/src/main/res/drawable-xhdpi/v2x_icon_jiaotongjiancha_vr.png create mode 100644 core/mogo-core-res/src/main/res/drawable-xhdpi/v2x_icon_jiaotongshigu_vr.png create mode 100644 core/mogo-core-res/src/main/res/drawable-xhdpi/v2x_icon_jishui_vr.png create mode 100644 core/mogo-core-res/src/main/res/drawable-xhdpi/v2x_icon_live_logo.png create mode 100644 core/mogo-core-res/src/main/res/drawable-xhdpi/v2x_icon_nongwu_vr.png create mode 100644 core/mogo-core-res/src/main/res/drawable-xhdpi/v2x_icon_yongdu_vr.png rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/v_to_x_marker_1.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/v_to_x_marker_11.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/v_to_x_marker_16.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/v_to_x_marker_2.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/v_to_x_marker_3.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/v_to_x_marker_5.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/v_to_x_marker_6.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/v_to_x_marker_7.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/v_to_x_marker_8.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/v_to_x_marker_9.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable-xhdpi/v_to_x_warning_car_red.png (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable/bg_v2x_event_type_orange.xml (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable/bg_v2x_event_type_orange_vr.xml (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable/bg_v2x_event_type_read.xml (100%) rename {modules/mogo-module-common => core/mogo-core-res}/src/main/res/drawable/bg_v2x_event_type_red_vr.xml (100%) delete mode 100644 foudations/mogo-commons/src/main/java/com/mogo/commons/module/CloudPoiManager.java delete mode 100644 modules/mogo-module-common/src/main/java/com/mogo/module/common/marker/PoiWrapper.java diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapMarkerAdapter.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapMarkerAdapter.java index 6a1dd4c797..00348b0973 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapMarkerAdapter.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapMarkerAdapter.java @@ -24,19 +24,15 @@ public class MapMarkerAdapter { * @param markerShowEntity 要填充的数据 * @return MarkerView */ - public static IMarkerView getMarkerView(Context context, MarkerShowEntity markerShowEntity, MogoMarkerOptions options ) { + public static IMarkerView getMarkerView(Context context, MarkerShowEntity markerShowEntity, MogoMarkerOptions options) { - if ( TextUtils.equals( markerShowEntity.getMarkerType(), ModuleNames.CARD_TYPE_USER_DATA ) ) { + if (TextUtils.equals(markerShowEntity.getMarkerType(), ModuleNames.CARD_TYPE_USER_DATA)) { return OnlineCarMarkerView.getInstance(); } else { - if ( MogoStatusManager.getInstance().isVrMode() ) { - return new EmptyMarkerView( context ); + if (MogoStatusManager.getInstance().isVrMode()) { + return new EmptyMarkerView(context); } else { - if ( markerShowEntity.isChecked() ) { - return new MapMarkerInfoView( context, markerShowEntity, options ); - } else { - return new MapMarkerView( context, markerShowEntity, options ); - } + return new MapMarkerView(context, markerShowEntity, options); } } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapMarkerInfoView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapMarkerInfoView.java deleted file mode 100644 index 987d18edef..0000000000 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapMarkerInfoView.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.mogo.eagle.core.function.impl.marker; - -import android.content.Context; -import android.text.TextUtils; -import android.util.AttributeSet; -import android.view.LayoutInflater; -import android.view.View; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.mogo.commons.module.status.MogoStatusManager; -import com.mogo.eagle.core.data.map.entity.MarkerExploreWay; -import com.mogo.eagle.core.data.map.entity.MarkerShowEntity; -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.map.marker.MogoMarkerOptions; -import com.mogo.module.common.ModuleNames; -import com.mogo.module.common.R; -import com.mogo.module.common.marker.PoiWrapper; -import com.mogo.module.common.utils.CloudPoiManager; - -/** - * author : donghongyu - * e-mail : 1358506549@qq.com - * date : 2020-01-0619:55 - * desc : 地图Marker图标带文本信息 - * version: 1.0 - */ -public class MapMarkerInfoView extends MapMarkerBaseView { - private String TAG = "MapMarkerInfoView"; - - private TextView tvMarkerContent; - private LinearLayout clMarkerContent; - private ImageView ivReverseTriangle; - - public MapMarkerInfoView(Context context) { - super(context); - } - - public MapMarkerInfoView(Context context, @Nullable AttributeSet attrs) { - super(context, attrs); - } - - public MapMarkerInfoView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - - public MapMarkerInfoView(Context context, MarkerShowEntity markerShowEntity, MogoMarkerOptions options) { - super(context); - mOptions = options; - try { - updateView(markerShowEntity); - } catch (Exception e) { - e.printStackTrace(); - } - } - - @Override - protected void initView(Context context) { - LayoutInflater.from(context).inflate(R.layout.modudle_services_marker_layout_info, this); - ivUserHead = findViewById(R.id.ivUserHead); -// ivIcon = findViewById( R.id.ivIcon ); - ivIcon = findViewById(R.id.ivIcon); - clMarkerContent = findViewById(R.id.clMarkerContent); - ivReverseTriangle = findViewById(R.id.ivReverseTriangle); - ivCar = findViewById(R.id.ivCar); - tvMarkerContent = findViewById(R.id.tvMarkerContent); - } - - @Override - public void updateView(MarkerShowEntity markerShowEntity) { - - Object bindObj = markerShowEntity.getBindObj(); - - if (MogoStatusManager.getInstance().isVrMode()) { - ivCar.setImageResource(R.drawable.icon_map_marker_location_yellow_vr); - } else { - ivCar.setImageResource(R.drawable.icon_map_marker_location_yellow); - } - clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_yellow_info); - ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_yellow); - switch (markerShowEntity.getMarkerType()) { - case ModuleNames.CARD_TYPE_USER_DATA: - ivUserHead.setVisibility(View.VISIBLE); - ivIcon.setVisibility(View.INVISIBLE); - loadImageWithMarker(markerShowEntity); - ivCar.setImageResource(R.drawable.icon_map_marker_car_gray); - //ivCar.setRotation(new Random().nextInt(360)); - ivCar.setRotation((float) markerShowEntity.getMarkerLocation().getAngle()); - break; - case ModuleNames.CARD_TYPE_ROAD_CONDITION: - ivUserHead.setVisibility(View.INVISIBLE); - ivIcon.setVisibility(View.VISIBLE); - - if (bindObj instanceof MarkerExploreWay && ((MarkerExploreWay) bindObj).getPoiType() != null) { - // 根据poiType获取对应的图片 - String poiType = ((MarkerExploreWay) bindObj).getPoiType(); - PoiWrapper poiWrapper = - CloudPoiManager.getInstance().getWrapperByPoiType(poiType); - if (poiWrapper != null) { - // 加载图片 - loadPoiTypeIcon(poiWrapper.getIconInfoUrl(), poiWrapper.getIconInfoRes()); - } else { - CallerLogger.INSTANCE.e(TAG, "未能根据poiType获取对应poi信息，无法渲染info marker====" + poiType); - } - } - break; - default: - break; - } - if (!TextUtils.isEmpty(markerShowEntity.getTextContent())) { - String content; - if (markerShowEntity.getTextContent().length() > 8) { - content = markerShowEntity.getTextContent().substring(0, 7) + "..."; - } else { - content = markerShowEntity.getTextContent(); - } - tvMarkerContent.setText(content); - } - - } - -} diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapMarkerView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapMarkerView.java index 68f8f369d9..f7a185bd2b 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapMarkerView.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapMarkerView.java @@ -8,14 +8,14 @@ import android.widget.FrameLayout; import androidx.annotation.Nullable; import com.mogo.commons.module.status.MogoStatusManager; +import com.mogo.eagle.core.data.map.PoiWrapper; import com.mogo.eagle.core.data.map.entity.MarkerExploreWay; import com.mogo.eagle.core.data.map.entity.MarkerShowEntity; import com.mogo.eagle.core.function.map.R; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.map.marker.MogoMarkerOptions; import com.mogo.module.common.ModuleNames; -import com.mogo.module.common.marker.PoiWrapper; -import com.mogo.module.common.utils.CloudPoiManager; +import com.mogo.eagle.core.data.config.CloudPoiManager; /** * author : donghongyu diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_map_marker_yellow_info.xml b/core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_map_marker_yellow_info.xml new file mode 100644 index 0000000000..b2be8e312e --- /dev/null +++ b/core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_map_marker_yellow_info.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_shape_reverse_yellow.xml b/core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_shape_reverse_yellow.xml new file mode 100644 index 0000000000..6bc80c96dc --- /dev/null +++ b/core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_shape_reverse_yellow.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CloudPoiManager.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/CloudPoiManager.java similarity index 97% rename from modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CloudPoiManager.java rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/CloudPoiManager.java index dddf345503..540ffc7574 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CloudPoiManager.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/CloudPoiManager.java @@ -1,15 +1,15 @@ -package com.mogo.module.common.utils; +package com.mogo.eagle.core.data.config; import android.content.Context; import android.util.ArrayMap; -import com.mogo.eagle.core.network.utils.GsonUtil; +import com.elegant.network.utils.GsonUtil; +import com.mogo.eagle.core.data.R; +import com.mogo.eagle.core.data.enums.EventTypeEnum; +import com.mogo.eagle.core.data.map.PoiWrapper; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; -import com.mogo.module.common.R; -import com.mogo.eagle.core.data.enums.EventTypeEnum; -import com.mogo.module.common.marker.PoiWrapper; import java.util.List; import java.util.Map; diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnum.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnum.kt index 956ff35fd1..fb67f3b68d 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnum.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnum.kt @@ -1,7 +1,8 @@ package com.mogo.eagle.core.data.enums -import com.mogo.module.common.R -import com.mogo.module.common.utils.CloudPoiManager +import com.mogo.eagle.core.data.R +import com.mogo.eagle.core.data.config.CloudPoiManager + /** * OBU、V2N事件类型枚举类 @@ -138,63 +139,63 @@ enum class EventTypeEnum( ALERT_ILLEGAL_PARK("99992"), TYPE_USECASE_ID_EBW( - ObuConstants.USE_CASE_ID.EBW.toString(), + 0x2A01.toString(), "紧急制动预警", poiTypeSrcVr = R.drawable.icon_warning_v2x_emergency_brake, content = "前车急刹车", tts = "前车急刹车" ), TYPE_USECASE_ID_FCW( - ObuConstants.USE_CASE_ID.FCW.toString(), + 0x2A02.toString(), "前向碰撞预警", poiTypeSrcVr = R.drawable.icon_warning_v2x_collision_warning, content = "前车碰撞预警", tts = "小心前车" ), TYPE_USECASE_ID_ICW( - ObuConstants.USE_CASE_ID.ICW.toString(), + 0x2A03.toString(), "交叉路口碰撞预警", poiTypeSrcVr = R.drawable.icon_warning_v2x_collision_warning, content = "交叉路口碰撞预警", tts = "注意交叉路口车辆" ), TYPE_USECASE_ID_CLW( - ObuConstants.USE_CASE_ID.CLW.toString(), + 0x2A04.toString(), "车辆失控预警", poiTypeSrcVr = R.drawable.icon_warning_v2x_vehicle_control, content = "前%s失控预警", tts = "小心%s失控车辆" ), TYPE_USECASE_ID_DNPW( - ObuConstants.USE_CASE_ID.DNPW.toString(), + 0x2A05.toString(), "逆向超车预警", poiTypeSrcVr = R.drawable.icon_warning_v2x_reverse_overtaking, content = "逆向超车预警", tts = "注意对向来车" ), TYPE_USECASE_ID_AVW( - ObuConstants.USE_CASE_ID.AVW.toString(), + 0x2A06.toString(), "异常车辆提醒", poiTypeSrcVr = R.drawable.icon_warning_v2x_abnormal_vehicle, content = "%s车异常", tts = "小心%s异常车辆" ), TYPE_USECASE_ID_BSW( - ObuConstants.USE_CASE_ID.BSW.toString(), + 0x2A07.toString(), "盲区预警", poiTypeSrcVr = R.drawable.icon_warning_v2x_blind_area_collision, content = "%s后盲区预警", tts = "注意%s后车辆" ), TYPE_USECASE_ID_LCW( - ObuConstants.USE_CASE_ID.LCW.toString(), + 0x2A08.toString(), "变道预警", poiTypeSrcVr = R.drawable.icon_warning_v2x_reverse_overtaking, content = "%s向变道预警", tts = "注意%s后车辆" ),//注意左后车辆/注意右后车辆 TYPE_USECASE_ID_EVW( - ObuConstants.USE_CASE_ID.EVW.toString(), + 0x2A09.toString(), "紧急车辆提醒", poiTypeSrcVr = R.drawable.icon_warning_v2x_special_vehicle_access, content = "注意特种车辆通行", @@ -215,49 +216,49 @@ enum class EventTypeEnum( tts = "注意摩托车" ),//摩托车碰撞预警 TYPE_USECASE_ID_SLW( - ObuConstants.USE_CASE_ID.SLW.toString(), + 0x2B04.toString(), "限速预警", poiTypeSrcVr = R.drawable.icon_warning_v2x_over_speed, content = "已超速", tts = "已超速" ), TYPE_USECASE_ID_LTA( - ObuConstants.USE_CASE_ID.LTA.toString(), + 0x2B05.toString(), "左转辅助", poiTypeSrcVr = R.drawable.icon_warning_v2x_collision_warning, content = "左转碰撞预警", tts = "注意路口对向来车" ), TYPE_USECASE_ID_HLW( - ObuConstants.USE_CASE_ID.HLW.toString(), + 0x2B06.toString(), "道路危险情况预警", poiTypeSrcVr = R.drawable.icon_warning_v2x_road_dangerous, content = "道路危险情况预警", tts = "前方路况危险，小心行驶" ),//（如果能给出具体的类别，则播报具体危险类别） TYPE_USECASE_OPTIMAL_LANE( - ObuConstants.USE_CASE_ID.HLW.toString(), + 0x2B06.toString(), "最优车道", poiTypeSrcVr = R.drawable.v2x_icon_live_logo, content = "最优车道", tts = "最优车道" ), TYPE_USECASE_ID_IVS( - ObuConstants.USE_CASE_ID.IVS.toString(), + 0x2B07.toString(), "车内标牌", poiTypeSrcVr = R.drawable.icon_warning_v2x_road_construction, content = "车内标牌", tts = "" ), TYPE_USECASE_ID_TJW( - ObuConstants.USE_CASE_ID.TJW.toString(), + 0x2B08.toString(), "前方拥堵提醒", poiTypeSrcVr = R.drawable.icon_warning_v2x_congestion, content = "前方%d米道路拥堵", tts = "前方拥堵，减速慢行" ), TYPE_USECASE_ID_IVP( - ObuConstants.USE_CASE_ID.IVP.toString(), + 0x2B09.toString(), "闯红灯预警", poiTypeSrcVr = R.drawable.icon_warning_v2x_traffic_lights_red, content = "路口红灯，禁止通行", @@ -271,7 +272,7 @@ enum class EventTypeEnum( tts = "建议车速 %s KM/H" ), TYPE_USECASE_ID_COC( - ObuConstants.USE_CASE_ID.COC.toString(), + 0x2B0A.toString(), "预留", poiTypeSrcVr = R.drawable.icon_warning_v2x_abnormal_vehicle, content = "路况预警", @@ -355,7 +356,7 @@ enum class EventTypeEnum( tts = "路况复杂，减速慢行" ), TYPE_ERROR( - ObuConstants.USE_CASE_ID.ERROR.toString(), + "-1", "未知/错误/异常", poiTypeSrcVr = R.drawable.icon_warning_v2x_abnormal_vehicle, content = "", diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_car_red.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/icon_car_red.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/icon_car_red.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/icon_car_red.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_accident3.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_ic_rc_accident3.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_accident3.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_ic_rc_accident3.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_accident3_white.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_ic_rc_accident3_white.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_accident3_white.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_ic_rc_accident3_white.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_dark_frog2.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_ic_rc_dark_frog2.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_dark_frog2.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_ic_rc_dark_frog2.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_dark_frog2_white.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_ic_rc_dark_frog2_white.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_dark_frog2_white.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_ic_rc_dark_frog2_white.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_freeze2.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_ic_rc_freeze2.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_freeze2.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_ic_rc_freeze2.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_freeze2_white.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_ic_rc_freeze2_white.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_freeze2_white.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_ic_rc_freeze2_white.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_illegal_park.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_ic_rc_illegal_park.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_illegal_park.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_ic_rc_illegal_park.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_illegal_park_white.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_ic_rc_illegal_park_white.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_ic_rc_illegal_park_white.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_ic_rc_illegal_park_white.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_living.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_map_marker_living.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_living.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_map_marker_living.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_living_white.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_map_marker_living_white.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_living_white.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_map_marker_living_white.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_pondingl2.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_map_marker_pondingl2.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_pondingl2.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_map_marker_pondingl2.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_pondingl2_white.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_map_marker_pondingl2_white.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_pondingl2_white.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_map_marker_pondingl2_white.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_off2.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_off2.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_off2.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_off2.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_off2_white.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_off2_white.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_off2_white.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_off2_white.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_up2.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_up2.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_up2.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_up2.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_up2_white.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_up2_white.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_up2_white.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_block_up2_white.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_check2.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_check2.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_check2.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_check2.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_check2_white.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_check2_white.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_check2_white.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_check2_white.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_work2.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_work2.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_work2.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_work2.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_work2_white.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_work2_white.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_work2_white.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_map_marker_road_work2_white.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_seek_help.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_seek_help.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_seek_help.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/module_common_icon_seek_help.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_accident_small.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_accident_small.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_accident_small.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_accident_small.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_daolushigong_nor.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_daolushigong_nor.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_daolushigong_nor.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_daolushigong_nor.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_daolushigong_small.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_daolushigong_small.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_daolushigong_small.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_daolushigong_small.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_fenglu_nor.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_fenglu_nor.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_fenglu_nor.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_fenglu_nor.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_fenglu_small.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_fenglu_small.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_fenglu_small.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_fenglu_small.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_nor.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_nor.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_nor.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_nor.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_small.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_small.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_small.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_jiaotongjiancha_small.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_jiaotongshigu_nor.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_jiaotongshigu_nor.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_jiaotongshigu_nor.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_jiaotongshigu_nor.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_jiebing_nor.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_jiebing_nor.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_jiebing_nor.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_jiebing_nor.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_jiebing_small.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_jiebing_small.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_jiebing_small.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_jiebing_small.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_jishui_nor.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_jishui_nor.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_jishui_nor.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_jishui_nor.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_jishui_small.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_jishui_small.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_jishui_small.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_jishui_small.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_nongwu_nor.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_nongwu_nor.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_nongwu_nor.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_nongwu_nor.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_nongwu_small.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_nongwu_small.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_nongwu_small.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_nongwu_small.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_shishilukuang_small.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_shishilukuang_small.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_shishilukuang_small.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_shishilukuang_small.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_shishlukuang_nor.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_shishlukuang_nor.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_shishlukuang_nor.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_shishlukuang_nor.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_yongdu_nor.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_yongdu_nor.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_yongdu_nor.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_yongdu_nor.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_yongdu_small.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_yongdu_small.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/mogo_image_yongdu_small.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/mogo_image_yongdu_small.png diff --git a/core/mogo-core-res/src/main/res/drawable-xhdpi/v2x_icon_daolushigong_vr.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/v2x_icon_daolushigong_vr.png new file mode 100644 index 0000000000000000000000000000000000000000..dffedc1725c69a599643d68d0faf0c8acf1604b1 GIT binary patch literal 4355 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 literal 0 HcmV?d00001 diff --git a/core/mogo-core-res/src/main/res/drawable-xhdpi/v2x_icon_fenglu_vr.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/v2x_icon_fenglu_vr.png new file mode 100644 index 0000000000000000000000000000000000000000..5cbd0c6809415e4c9a0cfceca5e891e41e356762 GIT binary patch literal 18071 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℞NM^UxqeHZo8iK9U+VeyeSxoq9TeaGe%`D3x2>vMWF*!g)=~}ubyL2-v31+Fp zW2=IG20_zYJeWWKnazLv2jBbffJ@S7@Q+QSM4sisLzQ&(@P!MXD(-@ zs2#ZQmv9kTs7=QPE86HuSkF<;WcLXRG{_GEOfk$7Xz7w*VQPE*1;&qxPq1erZ8Yn& zj0Il}h<0+A)TfG8N4SwObpkZa9eS{Gs6L@_uXns7A@|?9m)`qlxi>}o@~0m#oSOQ& zV!4e?wYiOEG;* zWXY$Yo-1piFNhEX((==}Xg4kc8Ot!ll^Z^j^kB$NJ4I(ZQ-4xUuPQ%cZT&R#ZTg;% z7c{4zu0N6iX9k%0esE=E@q?37+Lt|juc^t&Zzw3cPBR&&Fc=Srwi@AW0qf8(L-3m6 zWCLWv+mWmSmSdpWOb|J<(t`s+uq0npK5E-~py8&OlJvEPE-esbC z1@%cpK~&@kE$RT8Ap=+hI3#tnX72GIukt1iEtO2TYh=Uobgz492YV2Wd)e_IWR>8v})w_fsGZ4lyVR~3yjs+0O{2ZsPBveKj@YB!}5_ zIoUu)uP|t-lOm5cuRBoiqA|V*@T^u<(p7w zUsU_62QJe`V^39J^!Zn*>jgRj95BERK&5eAC8e32Z|Kv3H)-5Wy1FT|&sYQsq1ZgD_Wmt6Sg<`5Yh(pS}?fq<;X2uGEmx(398vk!febhkCYYO(XH z3<3MRY7^KlxRr+*yQ*#O1EZmWOdqrXfEXQ;$7AvjH9PNm@IxJ3wD(3w_n|HAiw=D1 z(6%1(4DOrXoc8^5#t(YoLCWS6 zv6@n|dp+ zCsdBAF9Tll1MDM^R_@S^;0et$f90TuGq_kO-H%LZkACL18}6BWkDgNfx`L~}ypU7< z#7cGNpEPe;Umb7O0197mWH*m2?PT}@A1%pbm^E`do)H~r7vZKa%K})GB~+@8wgXsi z^tyXzef_yi{n%jsf)n*T`Ie6MVQkD|^~0!Ls@j+S%Fa{kCf}(Y^YIGL!Yu0`2>L1lhhnZ3uR0Y8WjjMFqKY#j&HOyi#}P5uQcw! zKfMU@oo3K}QXk3toZkN2H68oN_U>)%BWuqz?d^*W-D9|}9H)nu$0?IE9Il14r?C`mfVjG z?F)Y8Df(;2!*!p0xPtLa#Uq}Mby>?$h#G;?hAW!x&l=#M%yZujV(jx~fOW~x^4ok% zlVFAF6$OD^dkaV4n6dT%}FQm)yuzBWi--XDzooxtb*IDe%_&v z)87y6rq3|%qIbpm+m&{4+l(#JhvydS8QLOE2L7ypmj(Jxu(DbcW0l*5y19L7&|K4w qOjZv*%#5{0!X(20000Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91WS|281ONa40RR91WB>pF057}VK>z?1&q+i#MRhj;~@4YjV znY;kmgoh+q)WO9P$a9k@NMeDqD2rIS2t?6rm8F|4c9l0mp(SQ5F(B)L0=2cV*1!q~ zE{Gxt;%*Z1+|^QHc7f#?NPs+MlFZy^@Av(EPTzCy+&j;>1 z{P{-(rP75som>JZ%&%i#L&jf}(Wzy+yw{P0?%Aou)GBnH~d*{qK5q4jN&UP7`(Gp`F5)%b*au^t_ zhJuw-w{3eaF-4Bx#2peWUOcHgoBcXk!wQ_5QjYFJCW%v75vQ`-Cbza;@2y|olceE^ zI%MD6xqk&md>4*5Cdo=PN;bgSA-?~WDODE3g>=uJ{lSvwJq$}GkH&zvU0KiT_JiQu$=kR8$4KfnB8TuOD3nT1jyt0c zCn8aAEJgjy`4aaQl>D^&uQhnGSs18G{^j zJYb0xF&l)nB74XV;dO=?+8)-UsS5N4*qIeEku?G|OKOWtwGBhnR`N|ALCQ``lE26yv4r!Gz>#gH1>d zddf1hw&Ttiy>pH*SPm#@K!@o4jJNL;`hdVBl)2PkT33ACQ+9=6r!@9%E@d*3 zIrB`(oPD;WPB=llBae{at=&?5=_Sek>M_Z$dqN~1%j9ca;6|E(>yy_ex3zWFyYpDr zA@JlXtO~hoq>2+MH*uo0e&Q3-@~KaWKXocpV6q>-FqG4!J$oc~-+hvO-~o{X2Q0&w ziLt8X7Tk5Ld7Gl9L%1LT8EhS?u}}-|sH3Fy)1Q`>^UoKr9Sc>0$O|UTYS1CZDY_d- z(6e8%KYaksxnF{P`^G|5)CRPYA}sB!wQ!=IL+(W7mN&Zw{&B}j%S9JU%Q@$WmrfgV z=nR;xPI1#Vo3zSw(0fp_a7y;xdqwu|x4F%YJ?}0!#3eeL^G}*GN+%ePDq`0nmG!pz_f}ZU`ZgNigFn|1({h)n0$h1 zI4eOe7q6g$963wVRw(JAB=$4;Cx0#Zwd6u|>Brm{wZMbKhF+)H-Hu|fgjJ{Y1j98f4o{?`EPm%o(a(@#sl;cQ2T zWaiJ8mXCc5{n06*5L-t5YUFFgjS@pXm0unR_*14x>&MT-|Kn18bq5@?R`O4*lhTgY z41cToQX^{quuAaf@YSa(Qc+;m#`*qhzdLGVv77QC(W$wP44iDStD6Ln%ux+dK ze&=Q>z51$^*e}kUb(T!{>Q}<+m&gHz&FXaNnr1!{OcNO%AXSbmJoB_`UCK=5M_uQT)9&6zxj=oGU_-pVZw2I zyiR9(`ApxaB^m*#S+godv7-2eemAq23d=gbMyF>S36)FI{p%UDG7ydDMvf-BWxsg-jxkk-1I3Nx}m zRI#NoDA1NvMX$B1EtTk5y*5!xe`tUaV{DK3D8L9YwiVEC#Tl#*)FBWYTMOyC^;RkE z+*z&wt+wFWn03?2nu?Q$fUvR}kkI-Y0wetg!p>IvC&O7c!rWJSF|PPkt`T7MQ@HA9 zw$)*kghkW$y>tgh-2W}L}#KA!_eJY$4H`W54R(Sge@!)RoO$wRFa zT<)5LQ+H*upqLV6ngbk(W?rl1lb>`sYo^($`;)P#Qb9F(BRi@LsH-2M-8|?oKKra3 zyz%Qe-IYgVH4PX(aVCA?>qGg&FFat0((}*D{?C3E7g+G@4fwYw2T{*om#=$D!lGF zbG}syf~#D!VokTU%EY_xmT2@vkTkHuR#TKPG_$V}HZ~@^$s*W6AuqWHACkiFekWc_ zi=;X`F&pp~;;*Cq@QG*2SCfk3U{=k36Dx>`Je{E~%L_ z#h*0`@eJ`MO)|<{kSak5K_r_4u1ynQ4J?npW$p*OBa{3#UlYbhZ|u^QE2S4-lH!Xm zN`Ptk)O+3|Ef-uM`Nw|+$8@Wvq&DBQ}Q22NuhLuU?+)lstTq z#>CbnOe(6OS-6)G^!1HsRK#hK_G_;d4+9b&M09NW-S5`vlEUWA z1KT-@T>2u}76QQ1m=3Qv)u4W9Ovg{;F!IVPoeRi8YC?ctg+8kg+3}{E5@UZ6-1Ppae{Q*afhVd_r6$lj#wB# zZ(F`xCVctJXnj1rBB-q}*4Xc#@XnB);MRxt6MLD8kBhV@uu}MGU>bq*QXQ*S>2e<> zG;7n=D(zpp4yz)~=-=3IEDwM~lks}~I zx~xpoM9gU`(hHszES%0PTqu33SBI-V*dZqvcsgyn_#%v+J`mcdb8E(4O&jIbe%hS$ zq6heb7lu6srr4_=V4*-|FrLr@z#MfEL!j3r6Tb8%tkJqia=1;Jd-PGg7Km74NTg0a zSz571IE}@4UUUwHV7198ARz9(G1VPZ#9&H45%dKw3^5Q-#wDDB=a4#rUe#~|iq*-O z42(4&eaqx2()NYVOY7%8Cxz|X^znki_U#h9@kYN&3`)R|IK?3=W{6wx2!oG%{*gWw zRy(Xc#sC^(TTH}*29nGIho}nlMH<7buGnYxjS9Aq;?vJa`n~UE%?%J*!*HKT>kOM_ zOkBv$#dLG$>Yw{XIJo%7KT7H4m%~4SQ@sly67q)E+^Ag(97rYMXN=Uwn&0)oP`i2{j zHV9Mz!5#hyN|aHVrWBKxBGAX+2)99tm~s_qM;3W29ANSkW2Cw3wg$`3SVQQH(ym>S zk8!1mm0l6U7e3$kTtSR^C%I)BsA?RBtVvK(&`MC5ou)U--@y#l+KOe zS4VKaDpb&&e3x!zq4flqQaO0bts)5zH0TSTuivgRH}>7$n{JZqJ@@Lol0DiLP&*H$ zpi`{{(lvn&06Gc~=u9gcX(p}ZEuCeNc7yJ6gTL}xJ){}=2a|6Zte?mWQ@3xQWv|@UfpDpk6WkQLy5t~MHF735&CVLv z0GTt+2%VvTLpedS;L{eHCSIBc0%HZ23torde^3D=n6lirAxv{{psNxw zaM1OiNFhGa9|@+_G1yqTEvrr;5y3hrVq#hI4+WI>O_6ebSiW!dk5p7M zHZJy&Ltx12W*9@AeRto5wNF_GSjQ3zygJ4@z|D8l7Hx+{Cn;G4lv@p1OoyNU&-MC@ ziCe0{=?MGCA$)=do=WciT;udCatXi!Yd?bB0K897At<6|ZbvZJ4x+=CBFp3n7J)GTP#oa&rvBKL{5X$6{X z(bt{w#*WfVcJFPsNq~#LriCiZD;$E0wKZtQz0ESN7Z1S{u>_|gSO*Y5>m=f?bc3p; zyEH4r(rnDKdPN>c-|ss2B6YF~r;n6%OI^(y;d~C%>UdUY{Jmox>8R*)4#z zEMQ*E;Lw%F*(bj`5;5|!xYv?hQ-MWIiAfTPwfl@ZbyYZo1b*fRjO7JNBsMVcp2q>K zMk&7XDuAu^FR-BdCc10B7Hx^0K%c$B8`lR zarJvnsNbzZWY1W7JyQ!FOK!dJLOfnDCA2RBlBSzhV=cFNwxuXNONe6D=K6FEE?XruV^HvBp-Hlv?0vXmy&-P+!pzxB`Fne!ns4=hfsj_Dd{wwa@Y=uS$B-4hW*V#dtkfqs9J~>#IGddRbe0Gw6dig zE-~xOy2tUQXks?1KBN}t;~%)Mh04%rv9u6Z9j6HRH8RlFy7aeMdM)cX)aj7n)IIhV z;wtC;6x`AKE=FO;xb#CcjlSYF^xl6z(EW_j)-CoH;u=K5^#fQq&!RHPzuDeZ9%Gue zYhQtnc_rx#nw)40aWUb-3G82mXR(*zR(Fe=H&)XCCudgRtgQ9Ds3h!em_w}b`bnii z;R-lqIZkJIUU>`#t|-JJHm;khwNxibiyQ6`TN!@M2lwkQ#QSgAV({kv<_CbW1>cTX zjnmVb>J^2JvaV?kaVv;7qn?D$@)C6Z7vSIN<|Um*|G-uMd^Tn^Momq5XvwYPm~e<| z5Wm#G7t@<}p)Wz+3^zZ9^ox+Oj?eV*F*5t)QVeoq5i#Z*Qe7*)ep}zZjh76g6?Ni~ z%}&0(6P+zz-Z=?J_aw$z4sX*z3+n-24|w*2=XDGtyO7_-hw}Lx_>_$scUS8eOZ)#1 XmmDReo`h!=00000NkvXXu0mjfIvWA{ literal 0 HcmV?d00001 diff --git a/core/mogo-core-res/src/main/res/drawable-xhdpi/v2x_icon_jiaotongshigu_vr.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/v2x_icon_jiaotongshigu_vr.png new file mode 100644 index 0000000000000000000000000000000000000000..b3420a00d72a41a2ad8a733b64675a923ab4e33e GIT binary patch literal 4512 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 literal 0 HcmV?d00001 diff --git a/core/mogo-core-res/src/main/res/drawable-xhdpi/v2x_icon_live_logo.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/v2x_icon_live_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..5480b6d16545fece7e071ce256c5c19a76a588a2 GIT binary patch literal 5165 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 literal 0 HcmV?d00001 diff --git a/core/mogo-core-res/src/main/res/drawable-xhdpi/v2x_icon_yongdu_vr.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/v2x_icon_yongdu_vr.png new file mode 100644 index 0000000000000000000000000000000000000000..e530db6a3d07524b0a92749eaff3487e781912f0 GIT binary patch literal 4491 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 literal 0 HcmV?d00001 diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_1.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/v_to_x_marker_1.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_1.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/v_to_x_marker_1.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_11.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/v_to_x_marker_11.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_11.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/v_to_x_marker_11.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_16.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/v_to_x_marker_16.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_16.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/v_to_x_marker_16.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_2.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/v_to_x_marker_2.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_2.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/v_to_x_marker_2.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_3.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/v_to_x_marker_3.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_3.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/v_to_x_marker_3.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_5.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/v_to_x_marker_5.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_5.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/v_to_x_marker_5.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_6.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/v_to_x_marker_6.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_6.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/v_to_x_marker_6.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_7.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/v_to_x_marker_7.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_7.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/v_to_x_marker_7.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_8.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/v_to_x_marker_8.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_8.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/v_to_x_marker_8.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_9.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/v_to_x_marker_9.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_marker_9.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/v_to_x_marker_9.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_warning_car_red.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/v_to_x_warning_car_red.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/v_to_x_warning_car_red.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/v_to_x_warning_car_red.png diff --git a/modules/mogo-module-common/src/main/res/drawable/bg_v2x_event_type_orange.xml b/core/mogo-core-res/src/main/res/drawable/bg_v2x_event_type_orange.xml similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable/bg_v2x_event_type_orange.xml rename to core/mogo-core-res/src/main/res/drawable/bg_v2x_event_type_orange.xml diff --git a/modules/mogo-module-common/src/main/res/drawable/bg_v2x_event_type_orange_vr.xml b/core/mogo-core-res/src/main/res/drawable/bg_v2x_event_type_orange_vr.xml similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable/bg_v2x_event_type_orange_vr.xml rename to core/mogo-core-res/src/main/res/drawable/bg_v2x_event_type_orange_vr.xml diff --git a/modules/mogo-module-common/src/main/res/drawable/bg_v2x_event_type_read.xml b/core/mogo-core-res/src/main/res/drawable/bg_v2x_event_type_read.xml similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable/bg_v2x_event_type_read.xml rename to core/mogo-core-res/src/main/res/drawable/bg_v2x_event_type_read.xml diff --git a/modules/mogo-module-common/src/main/res/drawable/bg_v2x_event_type_red_vr.xml b/core/mogo-core-res/src/main/res/drawable/bg_v2x_event_type_red_vr.xml similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable/bg_v2x_event_type_red_vr.xml rename to core/mogo-core-res/src/main/res/drawable/bg_v2x_event_type_red_vr.xml diff --git a/core/mogo-core-res/src/main/res/values/dimens.xml b/core/mogo-core-res/src/main/res/values/dimens.xml index dfc124ac5d..7d019b799f 100644 --- a/core/mogo-core-res/src/main/res/values/dimens.xml +++ b/core/mogo-core-res/src/main/res/values/dimens.xml @@ -1,6 +1,7 @@ + 10px 20px 52px 65px diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/module/CloudPoiManager.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/module/CloudPoiManager.java deleted file mode 100644 index 232c089ded..0000000000 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/module/CloudPoiManager.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.mogo.commons.module; - - -import android.content.Context; -import android.util.ArrayMap; - -import com.mogo.commons.R; -import com.mogo.eagle.core.data.map.PoiWrapper; -import com.mogo.eagle.core.network.utils.GsonUtil; -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; - -import java.util.List; -import java.util.Map; - - -/** - * 云端配置poi数据管理公共类 - * - * @author tongchenfei - */ -public class CloudPoiManager { - private static final String TAG = "CloudPoiManager"; - - private final Map poiWrapper = new ArrayMap<>(); - private static CloudPoiManager instance = null; - - public static CloudPoiManager getInstance() { - if (instance == null) { - synchronized (CloudPoiManager.class) { - if (instance == null) { - instance = new CloudPoiManager(); - } - } - } - return instance; - } - - public void generateDefault() { - if (poiWrapper.isEmpty()) { - poiWrapper.put(EventTypeEnum.TRAFFIC_CHECK.getPoiType(), new PoiWrapper(EventTypeEnum.TRAFFIC_CHECK.getPoiType(), - R.drawable.module_common_icon_map_marker_road_check2, R.drawable.module_common_icon_map_marker_road_check2_white, "交通检查")); - poiWrapper.put(EventTypeEnum.ROAD_CLOSED.getPoiType(), new PoiWrapper(EventTypeEnum.ROAD_CLOSED.getPoiType(), - R.drawable.module_common_icon_map_marker_road_block_off2, R.drawable.module_common_icon_map_marker_road_block_off2_white, "封路")); - poiWrapper.put(EventTypeEnum.FOURS_ROAD_WORK.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_ROAD_WORK.getPoiType(), - R.drawable.module_common_icon_map_marker_road_work2, R.drawable.module_common_icon_map_marker_road_work2_white, "施工")); - poiWrapper.put(EventTypeEnum.AI_ROAD_WORK.getPoiType(), new PoiWrapper(EventTypeEnum.AI_ROAD_WORK.getPoiType(), - R.drawable.module_common_icon_map_marker_road_work2, R.drawable.module_common_icon_map_marker_road_work2_white, "施工")); - poiWrapper.put(EventTypeEnum.FOURS_BLOCK_UP.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_BLOCK_UP.getPoiType(), - R.drawable.module_common_icon_map_marker_road_block_up2, R.drawable.module_common_icon_map_marker_road_block_up2_white, "拥堵")); - poiWrapper.put(EventTypeEnum.FOURS_PONDING.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_PONDING.getPoiType(), - R.drawable.module_common_icon_map_marker_pondingl2, R.drawable.module_common_icon_map_marker_pondingl2_white, "积水")); - poiWrapper.put(EventTypeEnum.FOURS_FOG.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_FOG.getPoiType(), - R.drawable.module_common_ic_rc_dark_frog2, R.drawable.module_common_ic_rc_dark_frog2_white, "浓雾")); - poiWrapper.put(EventTypeEnum.FOURS_ICE.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_ICE.getPoiType(), - R.drawable.module_common_ic_rc_freeze2, R.drawable.module_common_ic_rc_freeze2_white, "结冰")); - poiWrapper.put(EventTypeEnum.FOURS_ACCIDENT.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_ACCIDENT.getPoiType(), - R.drawable.module_common_ic_rc_accident3, R.drawable.module_common_ic_rc_accident3_white, "事故")); - poiWrapper.put(EventTypeEnum.FOURS_ACCIDENT_01.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_ACCIDENT_01.getPoiType(), - R.drawable.module_common_ic_rc_accident3, R.drawable.module_common_ic_rc_accident3_white, "重大事故")); - poiWrapper.put(EventTypeEnum.FOURS_ACCIDENT_02.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_ACCIDENT_02.getPoiType(), - R.drawable.module_common_ic_rc_accident3, R.drawable.module_common_ic_rc_accident3_white, "特大事故")); - poiWrapper.put(EventTypeEnum.FOURS_ACCIDENT_03.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_ACCIDENT_03.getPoiType(), - R.drawable.module_common_ic_rc_accident3, R.drawable.module_common_ic_rc_accident3_white, "较大事故")); - poiWrapper.put(EventTypeEnum.FOURS_ACCIDENT_04.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_ACCIDENT_04.getPoiType(), - R.drawable.module_common_ic_rc_accident3, R.drawable.module_common_ic_rc_accident3_white, "一般事故")); - poiWrapper.put(EventTypeEnum.FOURS_ACCIDENT_05.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_ACCIDENT_05.getPoiType(), - R.drawable.module_common_ic_rc_accident3, R.drawable.module_common_ic_rc_accident3_white, "轻微事故")); - poiWrapper.put(EventTypeEnum.FOURS_LIVING.getPoiType(), new PoiWrapper(EventTypeEnum.FOURS_LIVING.getPoiType(), - R.drawable.module_common_icon_map_marker_living, R.drawable.module_common_icon_map_marker_living_white, "实时路况")); - poiWrapper.put(EventTypeEnum.ILLEGAL_PARK_LIVING.getPoiType(), new PoiWrapper(EventTypeEnum.ILLEGAL_PARK_LIVING.getPoiType(), - R.drawable.module_common_ic_rc_illegal_park, R.drawable.module_common_ic_rc_illegal_park_white, "违章停车")); - // 分享里用到的故障求助 - poiWrapper.put("9999", new PoiWrapper("9999", - R.drawable.module_common_icon_seek_help, R.drawable.module_common_icon_seek_help, "故障求助")); - } - } - - public void updateFromConfig(Context context) { - generateDefault(); - // 从sp中获取config属性，将服务端配置内容合并到本地 - String config = SharedPrefsMgr.getInstance(context).getString("SHARE_BUTTON_CONFIG", ""); - if (!config.isEmpty()) { - List configWrappers = GsonUtil.arrayFromJson(config, PoiWrapper.class); - CallerLogger.INSTANCE.d(TAG, "config: " + configWrappers); - if (configWrappers != null) { - for (PoiWrapper wrapper : configWrappers) { - wrapper.setIconInfoRes(R.drawable.module_common_icon_map_marker_road_block_up2_white); - wrapper.setIconRes(R.drawable.module_common_icon_map_marker_road_block_up2); - if (poiWrapper.containsKey(wrapper.getPoiType())) { - PoiWrapper defWrapper = poiWrapper.get(wrapper.getPoiType()); - if (defWrapper != null) { - wrapper.setIconRes(defWrapper.getIconRes()); - wrapper.setIconInfoRes(defWrapper.getIconInfoRes()); - } - } - CallerLogger.INSTANCE.d(TAG, "put===" + wrapper); - poiWrapper.put(wrapper.getPoiType(), wrapper); - } - } else { - CallerLogger.INSTANCE.e(TAG, "解析configWrapper异常: " + config); - } - } - } - - public PoiWrapper getWrapperByPoiType(String poiType) { - return poiWrapper.get(poiType); - } - -} diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/module/MogoServices.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/module/MogoServices.java index 2a80af3028..017b3c747e 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/module/MogoServices.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/module/MogoServices.java @@ -15,6 +15,7 @@ import com.mogo.commons.module.intent.IntentManager; import com.mogo.commons.module.status.MogoStatusManager; import com.mogo.commons.module.receiver.MogoReceiver; import com.mogo.commons.voice.AIAssist; +import com.mogo.eagle.core.data.config.CloudPoiManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.NetworkUtils; import com.mogo.realtime.api.MoGoAiCloudRealTime; diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/marker/PoiWrapper.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/marker/PoiWrapper.java deleted file mode 100644 index 46b3a51238..0000000000 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/marker/PoiWrapper.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.mogo.module.common.marker; - -/** - * poi信息封装 - * - * @author tongchenfei - */ -public class PoiWrapper { - private int id; - private String poiType; - private int iconRes; - private int iconInfoRes; - private String iconUrl = ""; - // "https://yycp-static-1255510688.cos.ap-beijing.myqcloud.com/defaultUserHeadImg/VN000012.jpg"; - private String iconInfoUrl = ""; - // "http://yycp-static-1255510688.cos.ap-beijing.myqcloud.com/sso-server-image/1596705960869.png"; - private String title = "拥堵"; - - public PoiWrapper(){ - - } - - public PoiWrapper(String poiType, int iconRes,int iconInfoRes, String title) { - this.poiType = poiType; - this.iconRes = iconRes; - this.iconInfoRes = iconInfoRes; - this.title = title; - } - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public String getPoiType() { - return poiType; - } - - public void setPoiType(String poiType) { - this.poiType = poiType; - } - - public int getIconRes() { - return iconRes; - } - - public void setIconRes(int iconRes) { - this.iconRes = iconRes; - } - - public String getIconUrl() { - return iconUrl; - } - - public void setIconUrl(String iconUrl) { - this.iconUrl = iconUrl; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public int getIconInfoRes() { - return iconInfoRes; - } - - public void setIconInfoRes(int iconInfoRes) { - this.iconInfoRes = iconInfoRes; - } - - public String getIconInfoUrl() { - return iconInfoUrl; - } - - public void setIconInfoUrl(String iconInfoUrl) { - this.iconInfoUrl = iconInfoUrl; - } - - @Override - public String toString() { - return "PoiWrapper{" + - "poiType='" + poiType + '\'' + - ", iconRes=" + iconRes + - ", iconInfoRes=" + iconInfoRes + - ", iconUrl='" + iconUrl + '\'' + - ", iconInfoUrl='" + iconInfoUrl + '\'' + - ", title='" + title + '\'' + - '}'; - } -} diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index f926227f94..a9fea8487f 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -17,7 +17,7 @@ import com.mogo.map.MogoMarkerManager; import com.mogo.module.common.ModuleNames; import com.mogo.module.common.entity.MarkerCardResult; import com.mogo.module.common.entity.MarkerResponse; -import com.mogo.module.common.utils.CloudPoiManager; +import com.mogo.eagle.core.data.config.CloudPoiManager; import com.mogo.module.service.R; import com.mogo.module.service.network.RefreshModel;