From 2156d2cd18d7d409559086c9879bd7d0c780948c Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 10 Nov 2022 16:54:26 +0800 Subject: [PATCH] wait --- .../och/bus/fragment/BaseBusTabFragment.java | 2 +- .../mogo/och/bus/ui/BusSwitchLineActivity.kt | 9 +- .../mogo/och/taxi/ui/BaseTaxiTabFragment.java | 3 +- .../function/check/view/CheckActivity.java | 3 +- .../check}/view/ImageViewClipBounds.java | 6 +- .../src/main/res/layout/activity_check.xml | 6 +- .../src/main/res/layout/check_dialog.xml | 22 +- .../src/main/res/layout/check_hardware.xml | 26 +- .../src/main/res/layout/check_list.xml | 6 +- .../src/main/res/layout/check_titel.xml | 2 +- .../function/hmi/dialog/BaseFloatDialog.java | 2 +- .../core/function/hmi/dialog}/DialogImpl.java | 4 +- .../hmi/dialog}/IWindowManagerView.java | 2 +- .../core/function/hmi/dialog/WMDialog.java | 4 +- .../hmi/dialog}/WindowManagerImpl.java | 2 +- .../hmi/dialog}/WindowManagerView.java | 2 +- .../core/function/main/MainActivity.java | 5 +- .../function/main/MainMoGoApplication.java | 5 +- .../main/cards/MogoModulesHandler.java | 5 - .../main/cards/MogoModulesManager.java | 86 +- .../main/service/MogoMainService.java | 3 - .../module_commons_shape_dlg_round_bkg.xml | 0 .../module_commons_shape_left_btn_bkg.xml | 9 +- .../module_commons_shape_right_btn_bkg.xml | 5 +- .../module_commons_layout_wm_dialog.xml | 8 +- .../src/main/res/values/attr.xml | 15 + .../src/main/res/values/color.xml | 1 + .../routeoverlay/RouteOverlayDrawer.java | 2 +- .../impl/marker/MapCameraInfoView.java | 2 +- .../impl/marker/MapMarkerAdapter.java | 5 +- .../function/impl/marker/MapMarkerView.java | 5 +- .../function/smp/SmallMapDirectionView.java | 13 +- .../icon_map_marker_car_gray.png | Bin .../icon_map_marker_car_type_110.png | Bin .../icon_map_marker_car_type_119.png | Bin .../icon_map_marker_car_type_120.png | Bin .../icon_map_marker_car_type_bus.png | Bin .../icon_map_marker_car_type_taxi.png | Bin .../icon_map_marker_location_yellow.png | Bin .../icon_map_marker_location_yellow_vr.png | Bin .../icon_map_marker_road_block_up.png | Bin .../icon_map_marker_road_block_up2.png | Bin .../icon_map_marker_road_block_up2_white.png | Bin .../module_camera_real_time_traffic.png | Bin .../module_services_marker_bkg.png | Bin .../module_services_marker_vr_bkg.png | Bin .../module_services_marker_vr_bkg_checked.png | Bin .../res/layout/modudle_camera_layout_info.xml | 0 .../layout/modudle_services_marker_layout.xml | 10 +- .../modudle_services_marker_vr_layout.xml | 6 +- .../function/v2x/events/V2XEventManager.kt | 6 +- .../manager/impl/MoGoV2XMarkerManager.java | 2 +- .../scenario/scene/airoad/AiRoadMarker.kt | 1 + .../scene/road/V2XAiRoadEventMarker.kt | 1 + .../scene/warning/V2XWarningMarker.java | 2 +- .../main/res/layout/item_v2x_event_detail.xml | 2 +- .../res/layout/item_v2x_event_detail_vr.xml | 2 +- .../layout/item_v2x_event_share_load_more.xml | 2 +- .../res/layout/item_v2x_illegal_parking.xml | 6 +- .../layout/item_v2x_illegal_parking_vr.xml | 2 +- .../res/layout/item_v2x_scennario_history.xml | 6 +- .../item_v2x_scennario_history_other_help.xml | 4 +- .../main/res/layout/view_history_empty.xml | 10 +- .../layout/view_v2x_optimal_speed_marker.xml | 4 +- .../view/OnPreventFastClickListener.java | 13 +- .../mogo}/view/SpacesItemDecoration.java | 4 +- .../com/mogo/commons/module/ServiceConst.java | 14 +- .../commons}/utils/DrivingDirectionUtils.java | 2 +- .../com/mogo/commons/utils/MortonCode.java | 149 - .../mogo/commons}/utils/Trigonometric.java | 2 +- .../commons/utils/ViewPagerSpeedScroller.java | 63 - modules/mogo-module-common/README.md | 11 - modules/mogo-module-common/build.gradle | 5 - modules/mogo-module-common/consumer-rules.pro | 9 - modules/mogo-module-common/proguard-rules.pro | 3 - .../com/mogo/module/common/ModuleNames.java | 19 - .../com/mogo/module/common/MogoModule.java | 63 - .../mogo/module/common/MogoModulePaths.java | 88 - .../common/entity/MarkerCardResult.java | 30 - .../module/common/entity/MarkerResponse.java | 54 - .../mogo/module/common/utils/CarSeries.java | 125 - .../module/common/view/CustomRatingBar.java | 310 - .../module_common_my_location_bg.png | Bin 8943 -> 0 bytes .../module_map_amap_my_location_icon.png | Bin 3097 -> 0 bytes .../module_services_marker_bkg.png | Bin 5835 -> 0 bytes .../module_common_my_location_bg.png | Bin 8943 -> 0 bytes .../module_map_amap_my_location_icon.png | Bin 3097 -> 0 bytes .../module_services_marker_bkg.png | Bin 5835 -> 0 bytes .../module_camera_real_time_traffic.png | Bin 7918 -> 0 bytes .../module_common_my_location_bg.png | Bin 18510 -> 0 bytes .../modudle_services_marker_layout_info.xml | 75 - .../res/layout/module_common_my_location.xml | 15 - .../res/layout/module_commons_layout_car.xml | 12 - .../src/main/res/values-mdpi/dimens.xml | 64 - .../src/main/res/values-xhdpi/dimens.xml | 22 - .../src/main/res/values/attr.xml | 39 - .../src/main/res/values/colors.xml | 7 - .../src/main/res/values/dimens.xml | 17 - .../src/main/res/values/strings.xml | 6 - .../src/main/res/values/styles.xml | 34 - modules/mogo-module-service/README.md | 10 - modules/mogo-module-service/build.gradle | 3 - .../mogo-module-service/consumer-rules.pro | 6 - .../mogo-module-service/proguard-rules.pro | 4 - .../src/main/assets/LocParse$1.class | Bin 519 -> 0 bytes .../src/main/assets/LocParse.class | Bin 3779 -> 0 bytes .../src/main/assets/LocParse.java | 164 - .../src/main/assets/loc.csv | 15415 ---------------- .../src/main/assets/loc.txt | 2028 -- .../src/main/assets/roadSide.txt | 94 - .../src/main/assets/snapshot.txt | 1 - .../module/service/MarkerServiceHandler.java | 21 - .../service/marker/MapMarkerManager.java | 168 - .../service/network/RefreshApiService.java | 27 - .../module/service/network/RefreshBody.java | 35 - .../service/network/RefreshCallback.java | 14 - .../module/service/network/RefreshModel.java | 103 - .../icon_map_marker_car_gray.png | Bin 2353 -> 0 bytes .../icon_map_marker_car_type2.png | Bin 3211 -> 0 bytes .../icon_map_marker_location_yellow.png | Bin 270 -> 0 bytes .../icon_map_marker_car_gray.png | Bin 2353 -> 0 bytes .../icon_map_marker_car_type2.png | Bin 3211 -> 0 bytes .../icon_map_marker_location_yellow.png | Bin 270 -> 0 bytes .../icon_map_marker_road_block_up2.png | Bin 1138 -> 0 bytes .../icon_map_marker_car_type2.png | Bin 8658 -> 0 bytes .../res/drawable/bg_map_marker_blue_info.xml | 15 - .../drawable/bg_map_marker_dark_blue_info.xml | 15 - .../bg_map_marker_dark_green_info.xml | 15 - .../res/drawable/bg_map_marker_green_info.xml | 15 - .../res/drawable/bg_map_marker_grey_info.xml | 15 - .../drawable/bg_map_marker_orange_info.xml | 15 - .../drawable/bg_map_marker_purple_info.xml | 15 - .../res/drawable/bg_map_marker_red_info.xml | 15 - .../drawable/bg_map_marker_yellow_info.xml | 15 - .../bg_shape_reverse_triangle_blue.xml | 17 - .../bg_shape_reverse_triangle_dark_blue.xml | 15 - .../bg_shape_reverse_triangle_dark_green.xml | 15 - .../bg_shape_reverse_triangle_green.xml | 17 - .../bg_shape_reverse_triangle_orange.xml | 17 - .../bg_shape_reverse_triangle_purple.xml | 17 - .../bg_shape_reverse_triangle_red.xml | 15 - .../res/drawable/bg_shape_reverse_yellow.xml | 17 - .../main/res/drawable/ic_reverse_triangle.xml | 9 - .../drawable/icon_map_marker_car_type_110.png | Bin 7286 -> 0 bytes .../drawable/icon_map_marker_car_type_119.png | Bin 9086 -> 0 bytes .../drawable/icon_map_marker_car_type_120.png | Bin 5814 -> 0 bytes .../drawable/icon_map_marker_car_type_bus.png | Bin 7408 -> 0 bytes .../icon_map_marker_car_type_taxi.png | Bin 6922 -> 0 bytes 148 files changed, 147 insertions(+), 19811 deletions(-) rename {modules/mogo-module-common/src/main/java/com/mogo/module/common => core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check}/view/ImageViewClipBounds.java (90%) rename {modules/mogo-module-common/src/main/java/com/mogo/module/common/wm => core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog}/DialogImpl.java (92%) rename {modules/mogo-module-common/src/main/java/com/mogo/module/common/wm => core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog}/IWindowManagerView.java (94%) rename {modules/mogo-module-common/src/main/java/com/mogo/module/common/wm => core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog}/WindowManagerImpl.java (98%) rename {modules/mogo-module-common/src/main/java/com/mogo/module/common/wm => core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog}/WindowManagerView.java (98%) rename {modules/mogo-module-common => core/function-impl/mogo-core-function-hmi}/src/main/res/drawable/module_commons_shape_dlg_round_bkg.xml (100%) rename {modules/mogo-module-common => core/function-impl/mogo-core-function-hmi}/src/main/res/drawable/module_commons_shape_left_btn_bkg.xml (68%) rename {modules/mogo-module-common => core/function-impl/mogo-core-function-hmi}/src/main/res/drawable/module_commons_shape_right_btn_bkg.xml (72%) rename {modules/mogo-module-common => core/function-impl/mogo-core-function-hmi}/src/main/res/layout/module_commons_layout_wm_dialog.xml (88%) rename {modules/mogo-module-service => core/function-impl/mogo-core-function-map}/src/main/res/drawable-xhdpi/icon_map_marker_car_gray.png (100%) rename {modules/mogo-module-service => core/function-impl/mogo-core-function-map}/src/main/res/drawable-xhdpi/icon_map_marker_car_type_110.png (100%) rename {modules/mogo-module-service => core/function-impl/mogo-core-function-map}/src/main/res/drawable-xhdpi/icon_map_marker_car_type_119.png (100%) rename {modules/mogo-module-service => core/function-impl/mogo-core-function-map}/src/main/res/drawable-xhdpi/icon_map_marker_car_type_120.png (100%) rename {modules/mogo-module-service => core/function-impl/mogo-core-function-map}/src/main/res/drawable-xhdpi/icon_map_marker_car_type_bus.png (100%) rename {modules/mogo-module-service => core/function-impl/mogo-core-function-map}/src/main/res/drawable-xhdpi/icon_map_marker_car_type_taxi.png (100%) rename {modules/mogo-module-service => core/function-impl/mogo-core-function-map}/src/main/res/drawable-xhdpi/icon_map_marker_location_yellow.png (100%) rename {modules/mogo-module-service => core/function-impl/mogo-core-function-map}/src/main/res/drawable-xhdpi/icon_map_marker_location_yellow_vr.png (100%) rename {modules/mogo-module-service/src/main/res/drawable-mdpi => core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi}/icon_map_marker_road_block_up.png (100%) rename {modules/mogo-module-service/src/main/res/drawable-ldpi => core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi}/icon_map_marker_road_block_up2.png (100%) rename {modules/mogo-module-service/src/main/res/drawable-mdpi => core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi}/icon_map_marker_road_block_up2_white.png (100%) rename {modules/mogo-module-common/src/main/res/drawable-mdpi => core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi}/module_camera_real_time_traffic.png (100%) rename {modules/mogo-module-common => core/function-impl/mogo-core-function-map}/src/main/res/drawable-xhdpi/module_services_marker_bkg.png (100%) rename {modules/mogo-module-common => core/function-impl/mogo-core-function-map}/src/main/res/drawable-xhdpi/module_services_marker_vr_bkg.png (100%) rename {modules/mogo-module-common => core/function-impl/mogo-core-function-map}/src/main/res/drawable-xhdpi/module_services_marker_vr_bkg_checked.png (100%) rename {modules/mogo-module-common => core/function-impl/mogo-core-function-map}/src/main/res/layout/modudle_camera_layout_info.xml (100%) rename {modules/mogo-module-common => core/function-impl/mogo-core-function-map}/src/main/res/layout/modudle_services_marker_layout.xml (74%) rename {modules/mogo-module-common => core/function-impl/mogo-core-function-map}/src/main/res/layout/modudle_services_marker_vr_layout.xml (85%) rename {modules/mogo-module-common/src/main/java/com/mogo/module/common => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo}/view/OnPreventFastClickListener.java (73%) rename {modules/mogo-module-common/src/main/java/com/mogo/module/common => core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo}/view/SpacesItemDecoration.java (87%) rename {modules/mogo-module-common/src/main/java/com/mogo/module/common => foudations/mogo-commons/src/main/java/com/mogo/commons}/utils/DrivingDirectionUtils.java (99%) delete mode 100644 foudations/mogo-commons/src/main/java/com/mogo/commons/utils/MortonCode.java rename {modules/mogo-module-common/src/main/java/com/mogo/module/common => foudations/mogo-commons/src/main/java/com/mogo/commons}/utils/Trigonometric.java (97%) delete mode 100644 foudations/mogo-commons/src/main/java/com/mogo/commons/utils/ViewPagerSpeedScroller.java delete mode 100644 modules/mogo-module-common/README.md delete mode 100644 modules/mogo-module-common/src/main/java/com/mogo/module/common/ModuleNames.java delete mode 100644 modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoModule.java delete mode 100644 modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoModulePaths.java delete mode 100644 modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCardResult.java delete mode 100644 modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerResponse.java delete mode 100644 modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java delete mode 100644 modules/mogo-module-common/src/main/java/com/mogo/module/common/view/CustomRatingBar.java delete mode 100644 modules/mogo-module-common/src/main/res/drawable-ldpi/module_common_my_location_bg.png delete mode 100644 modules/mogo-module-common/src/main/res/drawable-ldpi/module_map_amap_my_location_icon.png delete mode 100644 modules/mogo-module-common/src/main/res/drawable-ldpi/module_services_marker_bkg.png delete mode 100644 modules/mogo-module-common/src/main/res/drawable-mdpi/module_common_my_location_bg.png delete mode 100644 modules/mogo-module-common/src/main/res/drawable-mdpi/module_map_amap_my_location_icon.png delete mode 100644 modules/mogo-module-common/src/main/res/drawable-mdpi/module_services_marker_bkg.png delete mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_camera_real_time_traffic.png delete mode 100644 modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_my_location_bg.png delete mode 100644 modules/mogo-module-common/src/main/res/layout/modudle_services_marker_layout_info.xml delete mode 100644 modules/mogo-module-common/src/main/res/layout/module_common_my_location.xml delete mode 100644 modules/mogo-module-common/src/main/res/layout/module_commons_layout_car.xml delete mode 100644 modules/mogo-module-common/src/main/res/values-mdpi/dimens.xml delete mode 100644 modules/mogo-module-common/src/main/res/values/attr.xml delete mode 100644 modules/mogo-module-common/src/main/res/values/colors.xml delete mode 100644 modules/mogo-module-common/src/main/res/values/strings.xml delete mode 100644 modules/mogo-module-common/src/main/res/values/styles.xml delete mode 100644 modules/mogo-module-service/src/main/assets/LocParse$1.class delete mode 100644 modules/mogo-module-service/src/main/assets/LocParse.class delete mode 100644 modules/mogo-module-service/src/main/assets/LocParse.java delete mode 100644 modules/mogo-module-service/src/main/assets/loc.csv delete mode 100644 modules/mogo-module-service/src/main/assets/loc.txt delete mode 100644 modules/mogo-module-service/src/main/assets/roadSide.txt delete mode 100644 modules/mogo-module-service/src/main/assets/snapshot.txt delete mode 100644 modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java delete mode 100644 modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java delete mode 100644 modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshApiService.java delete mode 100644 modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshBody.java delete mode 100644 modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshCallback.java delete mode 100644 modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java delete mode 100644 modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_car_gray.png delete mode 100644 modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_car_type2.png delete mode 100644 modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_location_yellow.png delete mode 100644 modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_car_gray.png delete mode 100644 modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_car_type2.png delete mode 100644 modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_location_yellow.png delete mode 100644 modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_block_up2.png delete mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_type2.png delete mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_blue_info.xml delete mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_dark_blue_info.xml delete mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_dark_green_info.xml delete mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_green_info.xml delete mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_grey_info.xml delete mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_orange_info.xml delete mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_purple_info.xml delete mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_red_info.xml delete mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_yellow_info.xml delete mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_blue.xml delete mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_dark_blue.xml delete mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_dark_green.xml delete mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_green.xml delete mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_orange.xml delete mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_purple.xml delete mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_red.xml delete mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_yellow.xml delete mode 100644 modules/mogo-module-service/src/main/res/drawable/ic_reverse_triangle.xml delete mode 100644 modules/mogo-module-service/src/main/res/drawable/icon_map_marker_car_type_110.png delete mode 100644 modules/mogo-module-service/src/main/res/drawable/icon_map_marker_car_type_119.png delete mode 100644 modules/mogo-module-service/src/main/res/drawable/icon_map_marker_car_type_120.png delete mode 100644 modules/mogo-module-service/src/main/res/drawable/icon_map_marker_car_type_bus.png delete mode 100644 modules/mogo-module-service/src/main/res/drawable/icon_map_marker_car_type_taxi.png diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java index b86e1da3bf..bcd6018ea8 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java @@ -36,7 +36,7 @@ import com.mogo.map.MogoMapUIController; import com.mogo.map.listener.IMogoMapListener; import com.mogo.map.uicontroller.VisualAngleMode; import com.mogo.module.common.MogoApisHandler; -import com.mogo.module.common.view.OnPreventFastClickListener; +import com.mogo.eagle.core.utilcode.mogo.view.OnPreventFastClickListener; import com.mogo.och.bus.R; import com.mogo.och.bus.bean.BusRoutesResult; import com.mogo.och.bus.model.BusOrderModel; diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt index bc2ebdf0c3..57d37c2805 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt @@ -10,7 +10,6 @@ import android.widget.ImageView import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.PagerSnapHelper import androidx.recyclerview.widget.RecyclerView import com.mogo.commons.mvp.MvpActivity import com.mogo.eagle.core.utilcode.util.SharedPrefs @@ -18,7 +17,7 @@ import com.mogo.och.bus.presenter.BusLinePresenter import com.mogo.och.bus.ui.adapter.SwitchLineAdapter import com.mogo.och.bus.bean.BusQueryLinesResponse import com.mogo.och.bus.ui.adapter.OpenItemAnimator -import com.mogo.module.common.view.SpacesItemDecoration +import com.mogo.eagle.core.utilcode.mogo.view.SpacesItemDecoration import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.bus.R import com.mogo.och.bus.bean.BusQueryLineTaskResponse @@ -74,7 +73,11 @@ class BusSwitchLineActivity : MvpActivity mLinesListView.setLayoutManager(linearLayoutManager) mLinesListView.setItemAnimator(OpenItemAnimator()) mAdapter = SwitchLineAdapter(applicationContext, mData) - mLinesListView.addItemDecoration(SpacesItemDecoration(4)) + mLinesListView.addItemDecoration( + SpacesItemDecoration( + 4 + ) + ) mLinesListView.setAdapter(mAdapter) //设置item 点击事件 mAdapter.setOnLineItemClickListener(object :SwitchLineAdapter.LineItemClickListener{ diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java index 0d204d7ac5..49b50bd6e6 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java @@ -24,7 +24,6 @@ import androidx.fragment.app.FragmentTransaction; import com.mogo.commons.mvp.IView; import com.mogo.commons.mvp.MvpFragment; import com.mogo.commons.mvp.Presenter; -import com.mogo.commons.voice.AIAssist; import com.mogo.eagle.core.data.config.HmiBuildConfig; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; @@ -39,7 +38,7 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.map.MogoMapUIController; import com.mogo.map.listener.IMogoMapListener; import com.mogo.map.uicontroller.VisualAngleMode; -import com.mogo.module.common.view.OnPreventFastClickListener; +import com.mogo.eagle.core.utilcode.mogo.view.OnPreventFastClickListener; import com.mogo.och.common.module.utils.AnimatorDrawableUtil; import com.mogo.och.taxi.R; diff --git a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java index da6dfe3b32..18f3cbc7ea 100644 --- a/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java +++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java @@ -20,8 +20,7 @@ import com.mogo.eagle.core.function.check.api.ICheckResultCallBack; import com.mogo.eagle.core.function.check.net.CheckNetWork; import com.mogo.eagle.core.function.check.net.CheckResultData; import com.mogo.eagle.core.utilcode.util.ThreadUtils; -import com.mogo.module.common.view.ImageViewClipBounds; -import com.mogo.module.common.view.SpacesItemDecoration; +import com.mogo.eagle.core.utilcode.mogo.view.SpacesItemDecoration; import java.math.BigDecimal; diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/ImageViewClipBounds.java b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/ImageViewClipBounds.java similarity index 90% rename from modules/mogo-module-common/src/main/java/com/mogo/module/common/view/ImageViewClipBounds.java rename to core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/ImageViewClipBounds.java index 9d5ee41f38..1159b12ac6 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/view/ImageViewClipBounds.java +++ b/core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/ImageViewClipBounds.java @@ -1,4 +1,4 @@ -package com.mogo.module.common.view; +package com.mogo.eagle.core.function.check.view; import android.content.Context; import android.graphics.Canvas; @@ -7,6 +7,8 @@ import android.util.AttributeSet; import androidx.appcompat.widget.AppCompatImageView; +import java.util.Objects; + /** * @author donghongyu * @date 2019-08-22 @@ -37,7 +39,7 @@ public class ImageViewClipBounds extends AppCompatImageView { } public void setClip(Rect clipBounds) { - if (clipBounds == mClipBounds || (clipBounds != null && clipBounds.equals(mClipBounds))) { + if (Objects.equals(clipBounds, mClipBounds)) { return; } if (clipBounds != null) { diff --git a/core/function-impl/mogo-core-function-check/src/main/res/layout/activity_check.xml b/core/function-impl/mogo-core-function-check/src/main/res/layout/activity_check.xml index c9ba22b89e..104d96fab1 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/layout/activity_check.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/layout/activity_check.xml @@ -42,7 +42,7 @@ app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> - - + app:layout_constraintTop_toBottomOf="@id/error_title" + tools:ignore="MissingConstraints" /> + app:layout_constraintTop_toBottomOf="@id/error_image" + tools:ignore="MissingConstraints" /> @@ -97,8 +99,9 @@ android:layout_width="@dimen/dp_520" android:layout_height="wrap_content" android:text="您的自动驾驶系统已经很久没有进行体检了，建议立即体检。" - android:textColor="@color/module_commons_wm_dialog_text_textColor" - android:textSize="@dimen/dp_44" /> + android:textColor="@android:color/white" + android:textSize="@dimen/dp_44" + tools:ignore="MissingConstraints" /> + app:layout_constraintTop_toBottomOf="@id/check_text_view" + tools:ignore="MissingConstraints" /> diff --git a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_hardware.xml b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_hardware.xml index 0f2653d31d..d965666262 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_hardware.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_hardware.xml @@ -18,7 +18,7 @@ android:layout_marginTop="@dimen/dp_50" android:gravity="left" android:text="硬件检测：" - android:textColor="@color/module_commons_wm_dialog_text_textColor" + android:textColor="@android:color/white" android:textSize="@dimen/dp_42" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -30,7 +30,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_50" android:text="（下面 1 项存在异常）" - android:textColor="@color/module_commons_wm_dialog_text_textColor" + android:textColor="@android:color/white" android:textSize="@dimen/dp_42" app:layout_constraintLeft_toRightOf="@+id/title" app:layout_constraintTop_toTopOf="parent" /> @@ -45,7 +45,7 @@ android:layout_marginTop="@dimen/dp_236" android:gravity="center" android:text="角激光" - android:textColor="@color/module_commons_wm_dialog_text_textColor" + android:textColor="@android:color/white" android:textSize="@dimen/dp_32" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -77,7 +77,7 @@ android:layout_centerVertical="true" android:gravity="center" android:text="Pad" - android:textColor="@color/module_commons_wm_dialog_text_textColor" + android:textColor="@android:color/white" android:textSize="@dimen/dp_32" /> @@ -251,7 +251,7 @@ android:layout_marginStart="@dimen/dp_1000" android:gravity="center" android:text="角激光" - android:textColor="@color/module_commons_wm_dialog_text_textColor" + android:textColor="@android:color/white" android:textSize="@dimen/dp_32" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@+id/check_image" /> @@ -265,7 +265,7 @@ android:layout_marginTop="@dimen/dp_236" android:gravity="center" android:text="OBU" - android:textColor="@color/module_commons_wm_dialog_text_textColor" + android:textColor="@android:color/white" android:textSize="@dimen/dp_32" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -287,7 +287,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp_24" android:text="设备故障" - android:textColor="@color/module_commons_wm_dialog_text_textColor" + android:textColor="@android:color/white" app:layout_constraintLeft_toRightOf="@+id/error_tip" app:layout_constraintTop_toTopOf="@+id/error_tip" /> @@ -307,7 +307,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp_24" android:text="设备正常" - android:textColor="@color/module_commons_wm_dialog_text_textColor" + android:textColor="@android:color/white" app:layout_constraintLeft_toRightOf="@+id/error_tip_green" app:layout_constraintTop_toTopOf="@+id/error_tip_green" /> diff --git a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_list.xml b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_list.xml index 22013e4c85..5d1572382e 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_list.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_list.xml @@ -17,7 +17,7 @@ android:layout_marginLeft="@dimen/dp_50" android:layout_marginTop="@dimen/dp_50" android:text="硬件检测：" - android:textColor="@color/module_commons_wm_dialog_text_textColor" + android:textColor="@android:color/white" android:textSize="@dimen/dp_42" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -52,7 +52,7 @@ android:layout_marginTop="@dimen/dp_22" android:maxLines="2" android:text="自动驾驶" - android:textColor="@color/module_commons_wm_dialog_text_textColor" + android:textColor="@android:color/white" android:textSize="@dimen/dp_42" app:layout_constraintTop_toBottomOf="@id/icon_auto" /> @@ -97,7 +97,7 @@ android:layout_marginTop="@dimen/dp_22" android:text=" 鹰眼\n版本" android:textAlignment="center" - android:textColor="@color/module_commons_wm_dialog_text_textColor" + android:textColor="@android:color/white" android:textSize="@dimen/dp_42" app:layout_constraintTop_toBottomOf="@id/icon_auto" /> diff --git a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_titel.xml b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_titel.xml index c4b8bc1ebf..fbece2cb31 100644 --- a/core/function-impl/mogo-core-function-check/src/main/res/layout/check_titel.xml +++ b/core/function-impl/mogo-core-function-check/src/main/res/layout/check_titel.xml @@ -25,7 +25,7 @@ android:layout_marginLeft="@dimen/dp_65" android:layout_marginTop="@dimen/dp_20" android:text="暂无数据，请关闭重试" - android:textColor="@color/module_commons_wm_dialog_text_textColor" + android:textColor="@android:color/white" android:textSize="@dimen/dp_64" app:layout_constraintLeft_toRightOf="@+id/check_tip_image" app:layout_constraintTop_toTopOf="@+id/check_tip_image" /> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/BaseFloatDialog.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/BaseFloatDialog.java index e492471627..30fe704ff2 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/BaseFloatDialog.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/BaseFloatDialog.java @@ -8,8 +8,8 @@ import android.view.WindowManager; import androidx.annotation.NonNull; import com.mogo.commons.debug.DebugConfig; +import com.mogo.eagle.core.function.hmi.R; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.module.common.R; /** * 浮在各种wm上面的dialog基类，调用了window.setType diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/DialogImpl.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/DialogImpl.java similarity index 92% rename from modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/DialogImpl.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/DialogImpl.java index 57522c11e2..a07614e3aa 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/DialogImpl.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/DialogImpl.java @@ -1,12 +1,10 @@ -package com.mogo.module.common.wm; +package com.mogo.eagle.core.function.hmi.dialog; import android.app.Dialog; import android.view.View; import android.view.ViewGroup; -import com.mogo.module.common.dialog.BaseFloatDialog; - /** * 采用Dialog实现接口 */ diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/IWindowManagerView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/IWindowManagerView.java similarity index 94% rename from modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/IWindowManagerView.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/IWindowManagerView.java index f0e78fc0ea..f65fc8b60b 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/IWindowManagerView.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/IWindowManagerView.java @@ -1,4 +1,4 @@ -package com.mogo.module.common.wm; +package com.mogo.eagle.core.function.hmi.dialog; import android.view.View; diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/WMDialog.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/WMDialog.java index 7ecd28e0b0..1ed2e3c748 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/WMDialog.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/WMDialog.java @@ -7,8 +7,8 @@ import android.widget.TextView; import androidx.annotation.StringRes; -import com.mogo.module.common.R; -import com.mogo.module.common.wm.WindowManagerView; +import com.mogo.eagle.core.function.hmi.R; + /** * @author congtaowang diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/WindowManagerImpl.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/WindowManagerImpl.java similarity index 98% rename from modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/WindowManagerImpl.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/WindowManagerImpl.java index 89f614f7bb..12ccd0f03d 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/WindowManagerImpl.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/WindowManagerImpl.java @@ -1,4 +1,4 @@ -package com.mogo.module.common.wm; +package com.mogo.eagle.core.function.hmi.dialog; import android.content.Context; import android.graphics.PixelFormat; diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/WindowManagerView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/WindowManagerView.java similarity index 98% rename from modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/WindowManagerView.java rename to core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/WindowManagerView.java index e5c0a562af..e633a08e82 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/wm/WindowManagerView.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/dialog/WindowManagerView.java @@ -1,4 +1,4 @@ -package com.mogo.module.common.wm; +package com.mogo.eagle.core.function.hmi.dialog; import android.content.Context; import android.view.LayoutInflater; diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java index 7dc5338c6a..6a226ede4b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java @@ -288,7 +288,6 @@ public class MainActivity extends MvpActivity implement */ protected void loadOthersModules() { // 加载地图，触发地图加载完毕回调，在初始化其他卡片模块，保证卡片模块可以正确获取地图相关服务。 - MogoModulesManager.getInstance().loadModules(); MogoModulesManager.getInstance().loadFunctionModules(); mPresenter.delayOperations(); MogoModulesManager.getInstance().loadFunctionModulesServer(); @@ -305,8 +304,8 @@ public class MainActivity extends MvpActivity implement * 启动后台服务 */ private void startBaseService() { - Intent intentMainServicee = new Intent(this, MogoMainService.class); - startService(intentMainServicee); + Intent intentMainService = new Intent(this, MogoMainService.class); + startService(intentMainService); // USB 摄像头行车记录仪进程 // Intent intentCarcorderService = new Intent(this, CarcorderService.class); diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index 35d2c6ba18..3fc2839ae2 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java @@ -10,6 +10,8 @@ import com.elegant.utils.UiThreadHandler; import com.mogo.cloud.socket.SocketBuildConfig; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; +import com.mogo.commons.module.MogoModule; +import com.mogo.commons.module.MogoModulePaths; import com.mogo.commons.voice.AIAssist; import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.data.constants.MoGoConfig; @@ -24,8 +26,6 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; import com.mogo.eagle.core.utilcode.util.ProcessUtils; import com.mogo.map.MapApiPath; -import com.mogo.module.common.MogoModule; -import com.mogo.module.common.MogoModulePaths; import com.zhidao.support.obu.ami.AmiClientManager; import com.zhjt.mogo_core_function_devatools.monitor.db.CpuInfo; import com.zhjt.mogo_core_function_devatools.monitor.db.MemInfo; @@ -136,7 +136,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { MogoModulePaths.addModuleFunction(new MogoModule("/och/api", "IMoGoFunctionProvider")); MogoModulePaths.addBaseModule(new MogoModule(MapApiPath.PATH, "CustomMapApiBuilder")); - //todo emArrow 此处业务调用放置map module MogoModulePaths.addBaseModule(new MogoModule(ServiceConst.PATH_REFRESH_STRATEGY, ServiceConst.PATH_REFRESH_STRATEGY)); // MogoModulePaths.addBaseModule(new MogoModule(V2XConst.PATH_V2X_UI, V2XConst.MODULE_NAME)); // OBU 模块 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/cards/MogoModulesHandler.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/cards/MogoModulesHandler.java index 9de2412f78..d63f6bdaa4 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/cards/MogoModulesHandler.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/cards/MogoModulesHandler.java @@ -8,11 +8,6 @@ package com.mogo.eagle.core.function.main.cards; */ public interface MogoModulesHandler { - /** - * 加载模块 - */ - void loadModules(); - /** * 架构升级v1.1加载功能模块 */ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/cards/MogoModulesManager.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/cards/MogoModulesManager.java index 11ac8711e2..c62981d154 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/cards/MogoModulesManager.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/cards/MogoModulesManager.java @@ -5,18 +5,14 @@ import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_HMI import android.app.Application; import android.content.Context; -import androidx.fragment.app.Fragment; - import com.alibaba.android.arouter.facade.template.IProvider; import com.alibaba.android.arouter.launcher.ARouter; +import com.mogo.commons.module.MogoModule; +import com.mogo.commons.module.MogoModulePaths; import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider; import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider; -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.function.main.MainActivity; -import com.mogo.eagle.core.utilcode.mogo.toast.ResourcesHelper; -import com.mogo.module.common.MogoModule; -import com.mogo.module.common.MogoModulePaths; -import com.mogo.service.module.IMogoModuleProvider; +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import java.util.Collection; import java.util.HashMap; @@ -35,18 +31,15 @@ public class MogoModulesManager implements MogoModulesHandler { private MainActivity mActivity; private Application mApp; - - private Map mModuleProviders = new HashMap<>(); - // 空间换效率 - private Map mModuleNameProviders = new HashMap<>(); + private static final byte[] obj = new byte[0]; // 架构升级后的加载功能模块的方式 - private Map mModuleFunctionProviders = new HashMap<>(); - private Map mModuleNameFunctionProviders = new HashMap<>(); + private final Map mModuleFunctionProviders = new HashMap<>(); + private final Map mModuleNameFunctionProviders = new HashMap<>(); // 架构升级后的加载功能模块的方式 - private Map mModuleFunctionServerProviders = new HashMap<>(); - private Map mModuleNameFunctionServerProviders = new HashMap<>(); + private final Map mModuleFunctionServerProviders = new HashMap<>(); + private final Map mModuleNameFunctionServerProviders = new HashMap<>(); private static volatile MogoModulesManager sInstance; @@ -55,7 +48,7 @@ public class MogoModulesManager implements MogoModulesHandler { public static MogoModulesManager getInstance() { if (sInstance == null) { - synchronized (MogoModulesManager.class) { + synchronized (obj) { if (sInstance == null) { sInstance = new MogoModulesManager(); } @@ -84,21 +77,6 @@ public class MogoModulesManager implements MogoModulesHandler { return mApp; } - @Override - public void loadModules() { - final List modules = MogoModulePaths.getModules(); - if (modules != null && !modules.isEmpty()) { - for (MogoModule module : modules) { - CallerLogger.INSTANCE.d(M_HMI + TAG, "module.getPath():" + module.getPath() + " name: " + module.getName()); - IMogoModuleProvider provider = load(module.getPath()); - if (provider != null) { - mModuleProviders.put(module, provider); - mModuleNameProviders.put(module.getName(), provider); - } - } - } - } - @Override public void loadFunctionModules() { final List modules = MogoModulePaths.getModuleFunctions(); @@ -151,15 +129,6 @@ public class MogoModulesManager implements MogoModulesHandler { } } - private IMogoModuleProvider load(String path) { - try { - return (IMogoModuleProvider) ARouter.getInstance().build(path).navigation(getContext()); - } catch (Exception e) { - e.printStackTrace(); - return null; - } - } - private IMoGoFunctionProvider loadFunction(String path) { try { return (IMoGoFunctionProvider) ARouter.getInstance().build(path).navigation(getContext()); @@ -178,45 +147,8 @@ public class MogoModulesManager implements MogoModulesHandler { } } - private void addFragment(IMogoModuleProvider provider, int containerId) { - if (provider == null) { - CallerLogger.INSTANCE.e(M_HMI + TAG, "add fragment fail cause provider == null, container is " + ResourcesHelper.getResNameById(getApplicationContext(), containerId)); - return; - } - Fragment fragment = null; - fragment = mActivity.getSupportFragmentManager().findFragmentByTag(provider.getModuleName()); - if (fragment == null) { - fragment = provider.createFragment(getContext(), null); - } - if (fragment == null) { - CallerLogger.INSTANCE.e(M_HMI + TAG, "add fragment fail cause fragment == null, container is " + ResourcesHelper.getResNameById(getApplicationContext(), containerId)); - return; - } - mActivity.getSupportFragmentManager().beginTransaction() - .replace(containerId, fragment, provider.getModuleName()) - .commitAllowingStateLoss(); - } - - @Override public void onDestroy() { - if (mModuleNameProviders != null) { - Collection modules = mModuleNameProviders.values(); - if (modules != null) { - for (IMogoModuleProvider module : modules) { - try { - CallerLogger.INSTANCE.d(M_HMI + TAG, "destroy module: " + module.getModuleName()); - module.onDestroy(); - } catch (Exception e) { - CallerLogger.INSTANCE.e(M_HMI + TAG, e + " onDestroy"); - } - } - } - mModuleNameProviders.clear(); - } - if (mModuleProviders != null) { - mModuleProviders.clear(); - } if (mModuleFunctionProviders != null) { Collection modules = mModuleFunctionProviders.values(); if (modules != null) { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/service/MogoMainService.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/service/MogoMainService.java index c8c2bd0bad..bd68201761 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/service/MogoMainService.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/service/MogoMainService.java @@ -35,7 +35,6 @@ public class MogoMainService extends Service implements IMogoLocationListener { private static final String TAG = "MogoMainService"; - private IMogoServiceApis mServiceApis; /** * 主模块管控定位，可以向各个模块发送统一定位信息 @@ -45,7 +44,6 @@ class MogoMainService extends Service implements IMogoLocationListener { @Override public void onCreate() { CallerLogger.INSTANCE.d(M_HMI + TAG, "基本服务启动"); - mServiceApis = MogoApisHandler.getInstance().getApis(); initAndStartLocation(); UiThreadHandler.postDelayed(() -> { CallerLogger.INSTANCE.d(M_HMI + TAG, "5秒已过，启动基础服务……"); @@ -106,6 +104,5 @@ class MogoMainService extends Service implements IMogoLocationListener { mLocationClient.destroy(); mLocationClient = null; } - mServiceApis = null; } } diff --git a/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_dlg_round_bkg.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/module_commons_shape_dlg_round_bkg.xml similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable/module_commons_shape_dlg_round_bkg.xml rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable/module_commons_shape_dlg_round_bkg.xml diff --git a/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_left_btn_bkg.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/module_commons_shape_left_btn_bkg.xml similarity index 68% rename from modules/mogo-module-common/src/main/res/drawable/module_commons_shape_left_btn_bkg.xml rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable/module_commons_shape_left_btn_bkg.xml index a1038a702d..94bbe93c7b 100644 --- a/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_left_btn_bkg.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/module_commons_shape_left_btn_bkg.xml @@ -1,14 +1,11 @@ - - + - + diff --git a/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_right_btn_bkg.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/module_commons_shape_right_btn_bkg.xml similarity index 72% rename from modules/mogo-module-common/src/main/res/drawable/module_commons_shape_right_btn_bkg.xml rename to core/function-impl/mogo-core-function-hmi/src/main/res/drawable/module_commons_shape_right_btn_bkg.xml index d570e1ef36..171d2f183a 100644 --- a/modules/mogo-module-common/src/main/res/drawable/module_commons_shape_right_btn_bkg.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/module_commons_shape_right_btn_bkg.xml @@ -1,11 +1,12 @@ - + - + diff --git a/modules/mogo-module-common/src/main/res/layout/module_commons_layout_wm_dialog.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_commons_layout_wm_dialog.xml similarity index 88% rename from modules/mogo-module-common/src/main/res/layout/module_commons_layout_wm_dialog.xml rename to core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_commons_layout_wm_dialog.xml index b4aaabda53..4a58449555 100644 --- a/modules/mogo-module-common/src/main/res/layout/module_commons_layout_wm_dialog.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/module_commons_layout_wm_dialog.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/module_commons_dlg_bkg" + android:background="@color/color_99000000" android:layout_gravity="center"> + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml index 630730aace..673fe26115 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml @@ -40,6 +40,7 @@ #FF2966EC #FFA7B6F0 #B3FFFFFF + #99000000 #6D7BAF diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java index b4399622d8..b0b0ea6137 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java @@ -12,7 +12,7 @@ import com.mogo.map.MogoOverlayManager; import com.mogo.map.overlay.IMogoOverlayManager; import com.mogo.map.overlay.IMogoPolyline; import com.mogo.map.overlay.MogoPolylineOptions; -import com.mogo.module.common.utils.DrivingDirectionUtils; +import com.mogo.commons.utils.DrivingDirectionUtils; import java.util.LinkedList; import java.util.List; import mogo.telematics.pad.MessagePad; diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapCameraInfoView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapCameraInfoView.java index 0d13d26fc5..a022bc145f 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapCameraInfoView.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapCameraInfoView.java @@ -9,8 +9,8 @@ import android.widget.ImageView; import androidx.annotation.Nullable; import com.mogo.eagle.core.data.map.entity.MarkerShowEntity; +import com.mogo.eagle.core.function.map.R; import com.mogo.map.marker.MogoMarkerOptions; -import com.mogo.module.common.R; /** * author : 李小鹏 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 00348b0973..0559792de1 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 @@ -1,12 +1,13 @@ package com.mogo.eagle.core.function.impl.marker; +import static com.mogo.commons.module.ServiceConst.CARD_TYPE_USER_DATA; + import android.content.Context; import android.text.TextUtils; import com.mogo.commons.module.status.MogoStatusManager; import com.mogo.eagle.core.data.map.entity.MarkerShowEntity; import com.mogo.map.marker.MogoMarkerOptions; -import com.mogo.module.common.ModuleNames; /** * author : donghongyu @@ -26,7 +27,7 @@ public class MapMarkerAdapter { */ 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(), CARD_TYPE_USER_DATA)) { return OnlineCarMarkerView.getInstance(); } else { if (MogoStatusManager.getInstance().isVrMode()) { 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 f7a185bd2b..5394de5de8 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 @@ -1,5 +1,7 @@ package com.mogo.eagle.core.function.impl.marker; +import static com.mogo.commons.module.ServiceConst.CARD_TYPE_ROAD_CONDITION; + import android.content.Context; import android.util.AttributeSet; import android.view.LayoutInflater; @@ -14,7 +16,6 @@ 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.eagle.core.data.config.CloudPoiManager; /** @@ -69,7 +70,7 @@ public class MapMarkerView extends MapMarkerBaseView { public void updateView( MarkerShowEntity markerShowEntity ) { Object bindObj = markerShowEntity.getBindObj(); switch ( markerShowEntity.getMarkerType() ) { - case ModuleNames.CARD_TYPE_ROAD_CONDITION: + case CARD_TYPE_ROAD_CONDITION: if ( mMarkerShowEntity != null && mMarkerShowEntity.isChecked() ) { clMarkerTopView.setBackgroundResource( R.drawable.module_services_marker_vr_bkg_checked ); } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java index 6d1da969a3..07020f2266 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java @@ -1,7 +1,5 @@ package com.mogo.eagle.core.function.smp; -import static com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.BIZ_SLW; -import static com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.V2I; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_MAP; import android.content.Context; @@ -9,7 +7,6 @@ import android.graphics.Color; import android.location.Location; import android.os.Bundle; import android.util.AttributeSet; -import android.util.Log; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; @@ -35,28 +32,20 @@ import com.amap.api.maps.model.PolylineOptions; import com.mogo.cloud.commons.utils.CoordinateUtils; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.data.map.MogoLocation; -import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.api.map.listener.IMoGoMapLocationListener; -import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; import com.mogo.eagle.core.function.call.map.CallerMapLocationListenerManager; -import com.mogo.eagle.core.function.call.v2x.CallLimitingVelocityListenerManager; import com.mogo.eagle.core.function.map.R; import com.mogo.eagle.core.function.smp.view.ISmallMapDirectionView; import com.mogo.eagle.core.utilcode.mogo.MapAssetStyleUtils; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.eagle.core.widget.RoundLayout; -import com.mogo.map.MogoMapUIController; -import com.mogo.module.common.utils.DrivingDirectionUtils; -import com.zhjt.service_biz.BizConfig; +import com.mogo.commons.utils.DrivingDirectionUtils; import java.util.ArrayList; import java.util.List; import java.util.Timer; import java.util.TimerTask; -import mogo.telematics.pad.MessagePad; - /** * 小地图的方向View * diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_gray.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_car_gray.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_gray.png rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_car_gray.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_type_110.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_car_type_110.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_type_110.png rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_car_type_110.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_type_119.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_car_type_119.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_type_119.png rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_car_type_119.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_type_120.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_car_type_120.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_type_120.png rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_car_type_120.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_type_bus.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_car_type_bus.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_type_bus.png rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_car_type_bus.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_type_taxi.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_car_type_taxi.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_type_taxi.png rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_car_type_taxi.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_location_yellow.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_location_yellow.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_location_yellow.png rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_location_yellow.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_location_yellow_vr.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_location_yellow_vr.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_location_yellow_vr.png rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_location_yellow_vr.png diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_block_up.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_block_up.png rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up.png diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_up2.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_up2.png rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2.png diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_block_up2_white.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_block_up2_white.png rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2_white.png diff --git a/modules/mogo-module-common/src/main/res/drawable-mdpi/module_camera_real_time_traffic.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_camera_real_time_traffic.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-mdpi/module_camera_real_time_traffic.png rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_camera_real_time_traffic.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_services_marker_bkg.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_services_marker_bkg.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_services_marker_bkg.png rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_services_marker_bkg.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_services_marker_vr_bkg.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_services_marker_vr_bkg.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_services_marker_vr_bkg.png rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_services_marker_vr_bkg.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_services_marker_vr_bkg_checked.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_services_marker_vr_bkg_checked.png similarity index 100% rename from modules/mogo-module-common/src/main/res/drawable-xhdpi/module_services_marker_vr_bkg_checked.png rename to core/function-impl/mogo-core-function-map/src/main/res/drawable-xhdpi/module_services_marker_vr_bkg_checked.png diff --git a/modules/mogo-module-common/src/main/res/layout/modudle_camera_layout_info.xml b/core/function-impl/mogo-core-function-map/src/main/res/layout/modudle_camera_layout_info.xml similarity index 100% rename from modules/mogo-module-common/src/main/res/layout/modudle_camera_layout_info.xml rename to core/function-impl/mogo-core-function-map/src/main/res/layout/modudle_camera_layout_info.xml diff --git a/modules/mogo-module-common/src/main/res/layout/modudle_services_marker_layout.xml b/core/function-impl/mogo-core-function-map/src/main/res/layout/modudle_services_marker_layout.xml similarity index 74% rename from modules/mogo-module-common/src/main/res/layout/modudle_services_marker_layout.xml rename to core/function-impl/mogo-core-function-map/src/main/res/layout/modudle_services_marker_layout.xml index fef5eefbac..357a944fac 100644 --- a/modules/mogo-module-common/src/main/res/layout/modudle_services_marker_layout.xml +++ b/core/function-impl/mogo-core-function-map/src/main/res/layout/modudle_services_marker_layout.xml @@ -11,14 +11,14 @@ + android:layout_height="@dimen/dp_130"> @@ -29,6 +29,6 @@ android:id="@+id/ivCar" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/module_service_marker_dot_marginTop" + android:layout_marginTop="@dimen/dp_4" android:src="@drawable/icon_map_marker_location_yellow" /> \ No newline at end of file diff --git a/modules/mogo-module-common/src/main/res/layout/modudle_services_marker_vr_layout.xml b/core/function-impl/mogo-core-function-map/src/main/res/layout/modudle_services_marker_vr_layout.xml similarity index 85% rename from modules/mogo-module-common/src/main/res/layout/modudle_services_marker_vr_layout.xml rename to core/function-impl/mogo-core-function-map/src/main/res/layout/modudle_services_marker_vr_layout.xml index 780e6ac082..55f73ce388 100644 --- a/modules/mogo-module-common/src/main/res/layout/modudle_services_marker_vr_layout.xml +++ b/core/function-impl/mogo-core-function-map/src/main/res/layout/modudle_services_marker_vr_layout.xml @@ -11,9 +11,9 @@ + android:layout_height="@dimen/dp_69"> \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt index 91388eab96..a6cca39824 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt @@ -8,6 +8,7 @@ import androidx.core.util.Pair import androidx.localbroadcastmanager.content.* import com.mogo.cloud.commons.utils.* import com.mogo.cloud.passport.* +import com.mogo.commons.module.ServiceConst.CARD_TYPE_ROAD_CONDITION import com.mogo.commons.module.status.IMogoStatusChangedListener import com.mogo.commons.module.status.MogoStatusManager import com.mogo.commons.module.status.StatusDescriptor @@ -55,7 +56,6 @@ import com.mogo.eagle.core.utilcode.util.TimeUtils import com.mogo.eagle.core.utilcode.util.Utils import com.mogo.map.listener.* import com.mogo.map.marker.* -import com.mogo.module.common.* import com.mogo.v2x.* import com.mogo.v2x.callback.* import com.mogo.v2x.config.* @@ -128,7 +128,7 @@ object V2XEventManager : IMoGoMapLocationListener, IMoGoTokenCallback, IV2XCallb BridgeApi.registerCenter()?.let { it.registerMogoMapListener(MODULE_NAME, this) it.registerMogoMarkerClickListener( - ModuleNames.CARD_TYPE_ROAD_CONDITION, + CARD_TYPE_ROAD_CONDITION, object : IMogoMarkerClickListener { override fun onMarkerClicked(marker: IMogoMarker?): Boolean { handleRoadConditionMarkerClick(marker) @@ -146,7 +146,7 @@ object V2XEventManager : IMoGoMapLocationListener, IMoGoTokenCallback, IV2XCallb CallerMapLocationListenerManager.removeListener(TAG, false) BridgeApi.registerCenter()?.let { it.unregisterMogoMapListener(MODULE_NAME) - it.unregisterMogoMarkerClickListener(ModuleNames.CARD_TYPE_ROAD_CONDITION) + it.unregisterMogoMarkerClickListener(CARD_TYPE_ROAD_CONDITION) } MogoStatusManager.getInstance().unregisterStatusChangedListener(MODULE_NAME, StatusDescriptor.ACC_STATUS, this) MogoStatusManager.getInstance().unregisterStatusChangedListener(MODULE_NAME, StatusDescriptor.SEEK_HELPING, this) diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoV2XMarkerManager.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoV2XMarkerManager.java index 02af44519b..83ed3ee04d 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoV2XMarkerManager.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoV2XMarkerManager.java @@ -1,5 +1,6 @@ package com.mogo.eagle.core.function.v2x.events.manager.impl; +import static com.mogo.commons.module.ServiceConst.CARD_TYPE_NOVELTY; import static com.mogo.eagle.core.function.v2x.events.consts.V2XConst.V2X_EVENT_ALARM_POI; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X; @@ -57,7 +58,6 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager { private static final CopyOnWriteArraySet mV2XRoadEventEntityArrayList = new CopyOnWriteArraySet<>(); // 上次的道路事件的预警Marker private static IMogoMarker mAlarmInfoMarker; - public static final String CARD_TYPE_NOVELTY = "CARD_TYPE_NOVELTY"; @Override public void drawableLastAllPOI() { diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/airoad/AiRoadMarker.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/airoad/AiRoadMarker.kt index 1fb0866cfd..4cf98fa202 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/airoad/AiRoadMarker.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/airoad/AiRoadMarker.kt @@ -10,6 +10,7 @@ import androidx.lifecycle.* import androidx.lifecycle.Lifecycle.Event import androidx.lifecycle.Lifecycle.Event.ON_CREATE import androidx.lifecycle.Lifecycle.Event.ON_DESTROY +import com.mogo.commons.utils.DrivingDirectionUtils import com.mogo.eagle.core.data.map.* import com.mogo.eagle.core.data.map.MapRoadInfo.StopLine import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XAiRoadEventMarker.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XAiRoadEventMarker.kt index fb42765d08..3ac0858d07 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XAiRoadEventMarker.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XAiRoadEventMarker.kt @@ -3,6 +3,7 @@ package com.mogo.eagle.core.function.v2x.events.scenario.scene.road import android.graphics.* import android.util.* import com.mogo.cloud.commons.utils.* +import com.mogo.commons.utils.DrivingDirectionUtils import com.mogo.eagle.core.data.map.* import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi.context diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/warning/V2XWarningMarker.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/warning/V2XWarningMarker.java index 4b904fdd23..934749b42e 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/warning/V2XWarningMarker.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/warning/V2XWarningMarker.java @@ -24,7 +24,7 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.map.MogoMarkerManager; import com.mogo.map.marker.IMogoMarkerManager; import com.mogo.map.overlay.IMogoPolyline; -import com.mogo.module.common.utils.Trigonometric; +import com.mogo.commons.utils.Trigonometric; import com.mogo.v2x.data.V2XLocation; import com.mogo.v2x.data.V2XWarningTarget; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_detail.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_detail.xml index 2bc87bd48c..33a3d85876 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_detail.xml +++ b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_detail.xml @@ -88,7 +88,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_10" android:alpha="0.6" - android:textColor="@color/v2x_FFF_666" + android:textColor="@android:color/white" android:textSize="@dimen/module_v2x_event_sub_title_text_size" app:layout_constraintBottom_toBottomOf="@id/ivEventDistanceLogo" app:layout_constraintStart_toEndOf="@id/ivEventDistanceLogo" diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml index e2614fa538..3f7f58569c 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml +++ b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml @@ -77,7 +77,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_10" android:alpha="0.6" - android:textColor="@color/v2x_FFF_666" + android:textColor="@android:color/white" android:textSize="@dimen/module_v2x_event_sub_title_text_size" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@id/ivEventDistanceLogo" diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_share_load_more.xml b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_share_load_more.xml index 644113fcf9..458d551b9d 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_share_load_more.xml +++ b/core/function-impl/mogo-core-function-v2x/src/main/res/layout/item_v2x_event_share_load_more.xml @@ -7,7 +7,7 @@