From c69a959b6ad2ed6062cc7e9996bf37e9af5b7416 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Tue, 7 Jan 2020 17:56:33 +0800 Subject: [PATCH] dev --- .idea/misc.xml | 2 +- app/build.gradle | 2 + .../launcher/ExampleInstrumentedTest.java | 27 ---- .../com/mogo/launcher/MogoApplication.java | 4 + .../com/mogo/launcher/ExampleUnitTest.java | 17 -- config.gradle | 1 + .../mogo/commons/mvp/MvpDialogFragment.java | 106 +++++++++++++ gradle.properties | 1 + .../map/impl/amap/AMapNaviViewWrapper.java | 8 +- .../impl/amap/navi/NaviListenerAdapter.java | 2 +- .../map/impl/amap/utils/IconTypeUtils.java | 96 +++++++++++ .../mogo/map/impl/amap/utils/ObjectUtils.java | 5 +- .../src/main/res/drawable-xhdpi/ic_1.png | Bin 0 -> 2811 bytes .../src/main/res/drawable-xhdpi/ic_10.png | Bin 0 -> 2732 bytes .../src/main/res/drawable-xhdpi/ic_11.png | Bin 0 -> 2055 bytes .../src/main/res/drawable-xhdpi/ic_12.png | Bin 0 -> 2241 bytes .../src/main/res/drawable-xhdpi/ic_13.png | Bin 0 -> 1650 bytes .../src/main/res/drawable-xhdpi/ic_14.png | Bin 0 -> 2944 bytes .../src/main/res/drawable-xhdpi/ic_15.png | Bin 0 -> 2395 bytes .../src/main/res/drawable-xhdpi/ic_16.png | Bin 0 -> 2475 bytes .../src/main/res/drawable-xhdpi/ic_17.png | Bin 0 -> 2050 bytes .../src/main/res/drawable-xhdpi/ic_18.png | Bin 0 -> 2091 bytes .../src/main/res/drawable-xhdpi/ic_19.png | Bin 0 -> 2352 bytes .../src/main/res/drawable-xhdpi/ic_2.png | Bin 0 -> 1339 bytes .../src/main/res/drawable-xhdpi/ic_20.png | Bin 0 -> 1371 bytes .../src/main/res/drawable-xhdpi/ic_21.png | Bin 0 -> 2378 bytes .../src/main/res/drawable-xhdpi/ic_22.png | Bin 0 -> 2144 bytes .../src/main/res/drawable-xhdpi/ic_23.png | Bin 0 -> 2322 bytes .../src/main/res/drawable-xhdpi/ic_24.png | Bin 0 -> 2409 bytes .../src/main/res/drawable-xhdpi/ic_25.png | Bin 0 -> 2156 bytes .../src/main/res/drawable-xhdpi/ic_26.png | Bin 0 -> 2357 bytes .../src/main/res/drawable-xhdpi/ic_27.png | Bin 0 -> 2314 bytes .../src/main/res/drawable-xhdpi/ic_28.png | Bin 0 -> 2468 bytes .../src/main/res/drawable-xhdpi/ic_3.png | Bin 0 -> 1261 bytes .../src/main/res/drawable-xhdpi/ic_4.png | Bin 0 -> 1836 bytes .../src/main/res/drawable-xhdpi/ic_5.png | Bin 0 -> 1830 bytes .../src/main/res/drawable-xhdpi/ic_50.png | Bin 0 -> 2736 bytes .../src/main/res/drawable-xhdpi/ic_51.png | Bin 0 -> 3016 bytes .../src/main/res/drawable-xhdpi/ic_52.png | Bin 0 -> 3101 bytes .../src/main/res/drawable-xhdpi/ic_53.png | Bin 0 -> 2840 bytes .../src/main/res/drawable-xhdpi/ic_54.png | Bin 0 -> 3049 bytes .../src/main/res/drawable-xhdpi/ic_55.png | Bin 0 -> 3138 bytes .../src/main/res/drawable-xhdpi/ic_56.png | Bin 0 -> 2922 bytes .../src/main/res/drawable-xhdpi/ic_57.png | Bin 0 -> 3140 bytes .../src/main/res/drawable-xhdpi/ic_58.png | Bin 0 -> 3140 bytes .../src/main/res/drawable-xhdpi/ic_59.png | Bin 0 -> 3158 bytes .../src/main/res/drawable-xhdpi/ic_6.png | Bin 0 -> 2212 bytes .../src/main/res/drawable-xhdpi/ic_60.png | Bin 0 -> 2719 bytes .../src/main/res/drawable-xhdpi/ic_61.png | Bin 0 -> 3018 bytes .../src/main/res/drawable-xhdpi/ic_62.png | Bin 0 -> 3083 bytes .../src/main/res/drawable-xhdpi/ic_63.png | Bin 0 -> 2829 bytes .../src/main/res/drawable-xhdpi/ic_64.png | Bin 0 -> 3041 bytes .../src/main/res/drawable-xhdpi/ic_65.png | Bin 0 -> 3155 bytes .../src/main/res/drawable-xhdpi/ic_66.png | Bin 0 -> 2904 bytes .../src/main/res/drawable-xhdpi/ic_67.png | Bin 0 -> 3138 bytes .../src/main/res/drawable-xhdpi/ic_68.png | Bin 0 -> 3146 bytes .../src/main/res/drawable-xhdpi/ic_69.png | Bin 0 -> 3173 bytes .../src/main/res/drawable-xhdpi/ic_7.png | Bin 0 -> 2233 bytes .../src/main/res/drawable-xhdpi/ic_8.png | Bin 0 -> 2348 bytes .../src/main/res/drawable-xhdpi/ic_9.png | Bin 0 -> 1546 bytes .../src/main/res/drawable-xhdpi/tc_10.png | Bin 0 -> 2276 bytes .../src/main/res/drawable-xhdpi/tc_11.png | Bin 0 -> 2271 bytes .../src/main/res/drawable-xhdpi/tc_12.png | Bin 0 -> 1890 bytes .../src/main/res/drawable-xhdpi/tc_13.png | Bin 0 -> 1861 bytes .../src/main/res/drawable-xhdpi/tc_14.png | Bin 0 -> 2027 bytes .../src/main/res/drawable-xhdpi/tc_15.png | Bin 0 -> 2033 bytes .../src/main/res/drawable-xhdpi/tc_16.png | Bin 0 -> 1576 bytes .../src/main/res/drawable-xhdpi/tc_17.png | Bin 0 -> 1624 bytes .../src/main/res/drawable-xhdpi/tc_20.png | Bin 0 -> 2509 bytes .../src/main/res/drawable-xhdpi/tc_21.png | Bin 0 -> 2489 bytes .../src/main/res/drawable-xhdpi/tc_22.png | Bin 0 -> 2495 bytes .../src/main/res/drawable-xhdpi/tc_23.png | Bin 0 -> 2240 bytes .../src/main/res/drawable-xhdpi/tc_24.png | Bin 0 -> 2236 bytes .../src/main/res/drawable-xhdpi/tc_25.png | Bin 0 -> 2615 bytes .../src/main/res/drawable-xhdpi/tc_26.png | Bin 0 -> 2478 bytes .../src/main/res/drawable-xhdpi/tc_27.png | Bin 0 -> 2611 bytes .../src/main/res/drawable-xhdpi/tc_28.png | Bin 0 -> 2478 bytes .../src/main/res/drawable-xhdpi/tc_30.png | Bin 0 -> 1989 bytes .../src/main/res/drawable-xhdpi/tc_31.png | Bin 0 -> 1968 bytes .../src/main/res/drawable-xhdpi/tc_32.png | Bin 0 -> 1954 bytes .../src/main/res/drawable-xhdpi/tc_33.png | Bin 0 -> 2268 bytes .../src/main/res/drawable-xhdpi/tc_34.png | Bin 0 -> 1949 bytes .../src/main/res/drawable-xhdpi/tc_35.png | Bin 0 -> 1658 bytes .../src/main/res/drawable-xhdpi/tc_36.png | Bin 0 -> 2291 bytes .../src/main/res/drawable-xhdpi/tc_37.png | Bin 0 -> 2481 bytes .../src/main/res/drawable-xhdpi/tc_38.png | Bin 0 -> 1873 bytes .../src/main/res/drawable-xhdpi/tc_39.png | Bin 0 -> 2440 bytes .../src/main/res/drawable-xhdpi/tc_40.png | Bin 0 -> 2294 bytes .../src/main/res/drawable-xhdpi/tc_41.png | Bin 0 -> 1650 bytes .../src/main/res/drawable-xhdpi/tc_42.png | Bin 0 -> 2490 bytes .../src/main/res/drawable-xhdpi/tc_43.png | Bin 0 -> 1878 bytes .../src/main/res/drawable-xhdpi/tc_44.png | Bin 0 -> 2482 bytes .../src/main/res/drawable-xhdpi/tc_68.png | Bin 0 -> 2643 bytes .../src/main/res/drawable-xhdpi/tc_84.png | Bin 0 -> 2634 bytes .../src/main/res/drawable-xhdpi/tc_85.png | Bin 0 -> 1550 bytes .../mogo/map/marker/IMogoMarkerManager.java | 7 + .../mogo/map/marker/MogoMarkersHandler.java | 21 +++ .../java/com/mogo/map/navi/MogoNaviInfo.java | 19 ++- .../java/com/mogo/map/MogoMarkerManager.java | 5 + modules/mogo-module-apps/build.gradle | 5 + .../module/apps/AppNavigatorFragment.java | 65 ++++++++ .../com/mogo/module/apps/AppsFragment.java | 63 +++++--- .../module/apps/AppsFragmentProvider.java | 4 +- .../com/mogo/module/apps/AppsPresenter.java | 14 ++ .../com/mogo/module/apps/model/AppInfo.java | 10 ++ .../drawable-xhdpi/module_apps_ic_apps.png | Bin 0 -> 16180 bytes .../drawable-xhdpi/module_apps_ic_chat.png | Bin 0 -> 16380 bytes .../drawable-xhdpi/module_apps_ic_music.png | Bin 0 -> 8963 bytes .../module_apps_ic_navigation.png | Bin 0 -> 10502 bytes .../res/layout/module_apps_fragment_apps.xml | 22 ++- .../module_apps_fragment_apps_navigator.xml | 35 ++++ .../main/res/layout/module_apps_item_app.xml | 5 +- .../com/mogo/module/common/ModuleType.java | 5 + modules/mogo-module-extensions/build.gradle | 7 +- .../extensions/ExtensionsModuleConst.java | 10 ++ .../extensions/ExtensionsPresenter.java | 2 +- .../extensions/entrance/EntranceFragment.java | 146 +++++++++++++++++ .../entrance/EntrancePresenter.java | 16 ++ .../extensions/entrance/EntranceProvider.java | 75 +++++++++ .../extensions/entrance/EntranceView.java | 12 ++ .../extensions/navi/BaseNaviInfoView.java | 108 +++++++++++++ .../module/extensions/navi/NaviInfoView.java | 100 ++++++++++++ .../module/extensions/weather/Phenomena.java | 92 +++++------ .../src/main/res/drawable-xhdpi/ic_cloudy.png | Bin 0 -> 988 bytes .../main/res/drawable-xhdpi/ic_dust_sand.png | Bin 0 -> 551 bytes .../main/res/drawable-xhdpi/ic_duststorm.png | Bin 0 -> 754 bytes .../src/main/res/drawable-xhdpi/ic_fog.png | Bin 0 -> 449 bytes .../src/main/res/drawable-xhdpi/ic_haze.png | Bin 0 -> 934 bytes .../main/res/drawable-xhdpi/ic_heavy_rain.png | Bin 0 -> 801 bytes .../main/res/drawable-xhdpi/ic_light_rain.png | Bin 0 -> 631 bytes .../res/drawable-xhdpi/ic_moderate_rain.png | Bin 0 -> 631 bytes .../main/res/drawable-xhdpi/ic_overcast.png | Bin 0 -> 929 bytes .../res/drawable-xhdpi/ic_severe_storm.png | Bin 0 -> 987 bytes .../src/main/res/drawable-xhdpi/ic_shower.png | Bin 0 -> 967 bytes .../src/main/res/drawable-xhdpi/ic_snow.png | Bin 0 -> 1029 bytes .../src/main/res/drawable-xhdpi/ic_sunny.png | Bin 0 -> 913 bytes .../main/res/drawable-xhdpi/ic_thunder.png | Bin 0 -> 772 bytes .../res/drawable-xhdpi/ic_thundershower.png | Bin 0 -> 1091 bytes .../main/res/drawable-xhdpi/ic_unknown.png | Bin 0 -> 906 bytes .../drawable-xhdpi/module_map_ic_company.png | Bin .../res/drawable-xhdpi/module_map_ic_home.png | Bin .../module_map_ic_move2_current_location.png | Bin .../drawable-xhdpi/module_map_ic_search.png | Bin .../module_map_dw_common_corner_bkg.xml | 0 .../module_map_dw_navi_info_extras_bkg.xml | 9 ++ .../module_map_dw_navi_info_panel_bkg.xml | 9 ++ ...odule_map_dw_upload_road_condition_bkg.xml | 0 .../res/layout/module_ext_layout_entrance.xml | 149 ++++++++++++++++++ .../layout/module_ext_layout_extensions.xml | 6 +- .../module_map_layout_navi_info_panel.xml | 66 ++++++++ .../src/main/res/values/strings.xml | 3 + .../com/mogo/module/main/MainActivity.java | 42 +++-- .../com/mogo/module/main/MainPresenter.java | 21 +++ .../java/com/mogo/module/main/MainView.java | 2 + .../com/mogo/module/main/MogoCardManager.java | 28 ++++ .../module/main/cards/CardModulesAdapter.java | 37 ++--- .../module/main/cards/MogoModulesHandler.java | 7 + .../module/main/cards/MogoModulesManager.java | 5 + .../cards/OnPageChangeListenerAdapter.java | 27 ++++ .../main/cards/PlaceholderFragment.java | 26 --- .../cards/PlaceholderFragmentProvider.java | 101 ------------ .../main/cards/UnDestroyedViewFragment.java | 44 ------ .../main/cards/VerticalStackTransformer.java | 2 - .../main/cards/ZoomOutPageTransformer.java | 38 ----- .../main/livedata/CardSwitchLiveData.java | 24 +++ .../res/layout/module_main_activity_main.xml | 70 ++++---- .../java/com/mogo/module/map/MapFragment.java | 57 ------- .../res/layout/module_map_fragment_map.xml | 116 -------------- .../src/main/res/values/strings.xml | 2 - .../service/network/RefreshApiService.java | 2 +- .../module/service/network/RefreshBody.java | 2 +- .../module/service/network/RefreshModel.java | 20 ++- .../zhidao/tanlu/ExampleInstrumentedTest.java | 27 ---- .../com/mogo/service/MogoServicePaths.java | 5 + .../service/cardmanager/IMogoCardManager.java | 19 +++ .../com/mogo/service/module/ModuleType.java | 5 + .../com/mogo/service/map/ExampleUnitTest.java | 17 -- 177 files changed, 1457 insertions(+), 650 deletions(-) delete mode 100644 app/src/androidTest/java/com/mogo/launcher/ExampleInstrumentedTest.java delete mode 100644 app/src/test/java/com/mogo/launcher/ExampleUnitTest.java create mode 100644 foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpDialogFragment.java create mode 100644 libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/IconTypeUtils.java create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_1.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_10.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_11.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_12.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_13.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_14.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_15.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_16.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_17.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_18.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_19.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_2.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_20.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_21.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_22.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_23.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_24.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_25.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_26.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_27.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_28.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_3.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_4.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_5.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_50.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_51.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_52.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_53.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_54.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_55.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_56.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_57.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_58.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_59.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_6.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_60.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_61.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_62.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_63.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_64.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_65.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_66.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_67.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_68.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_69.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_7.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_8.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/ic_9.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_10.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_11.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_12.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_13.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_14.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_15.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_16.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_17.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_20.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_21.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_22.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_23.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_24.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_25.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_26.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_27.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_28.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_30.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_31.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_32.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_33.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_34.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_35.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_36.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_37.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_38.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_39.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_40.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_41.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_42.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_43.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_44.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_68.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_84.png create mode 100755 libraries/map-amap/src/main/res/drawable-xhdpi/tc_85.png create mode 100644 modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java create mode 100755 modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_apps.png create mode 100755 modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_chat.png create mode 100755 modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_music.png create mode 100755 modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigation.png create mode 100644 modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps_navigator.xml create mode 100644 modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java create mode 100644 modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java create mode 100644 modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceProvider.java create mode 100644 modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceView.java create mode 100644 modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java create mode 100644 modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/NaviInfoView.java create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_cloudy.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_dust_sand.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_duststorm.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_fog.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_haze.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_heavy_rain.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_light_rain.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_moderate_rain.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_overcast.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_severe_storm.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_shower.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_snow.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_sunny.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_thunder.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_thundershower.png create mode 100755 modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_unknown.png rename modules/{mogo-module-map => mogo-module-extensions}/src/main/res/drawable-xhdpi/module_map_ic_company.png (100%) rename modules/{mogo-module-map => mogo-module-extensions}/src/main/res/drawable-xhdpi/module_map_ic_home.png (100%) rename modules/{mogo-module-map => mogo-module-extensions}/src/main/res/drawable-xhdpi/module_map_ic_move2_current_location.png (100%) rename modules/{mogo-module-map => mogo-module-extensions}/src/main/res/drawable-xhdpi/module_map_ic_search.png (100%) rename modules/{mogo-module-map => mogo-module-extensions}/src/main/res/drawable/module_map_dw_common_corner_bkg.xml (100%) create mode 100644 modules/mogo-module-extensions/src/main/res/drawable/module_map_dw_navi_info_extras_bkg.xml create mode 100644 modules/mogo-module-extensions/src/main/res/drawable/module_map_dw_navi_info_panel_bkg.xml rename modules/{mogo-module-map => mogo-module-extensions}/src/main/res/drawable/module_map_dw_upload_road_condition_bkg.xml (100%) create mode 100644 modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml create mode 100644 modules/mogo-module-extensions/src/main/res/layout/module_map_layout_navi_info_panel.xml create mode 100644 modules/mogo-module-main/src/main/java/com/mogo/module/main/MogoCardManager.java create mode 100644 modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/OnPageChangeListenerAdapter.java delete mode 100644 modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/PlaceholderFragment.java delete mode 100644 modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/PlaceholderFragmentProvider.java delete mode 100644 modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/UnDestroyedViewFragment.java delete mode 100644 modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/ZoomOutPageTransformer.java create mode 100644 modules/mogo-module-main/src/main/java/com/mogo/module/main/livedata/CardSwitchLiveData.java delete mode 100644 modules/mogo-module-tanlu/src/androidTest/java/com/zhidao/tanlu/ExampleInstrumentedTest.java create mode 100644 services/mogo-service-api/src/main/java/com/mogo/service/cardmanager/IMogoCardManager.java delete mode 100644 services/mogo-service/src/test/java/com/mogo/service/map/ExampleUnitTest.java diff --git a/.idea/misc.xml b/.idea/misc.xml index 703e5d4b89..8a8f75bfe2 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,7 +5,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 19f74dadbe..9d09a34991 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -61,6 +61,8 @@ dependencies { // implementation rootProject.ext.dependencies.moduledemo // implementation rootProject.ext.dependencies.moduledemo2 + implementation rootProject.ext.dependencies.modulechatting + if (Boolean.valueOf(RELEASE)) { api rootProject.ext.dependencies.modulemain diff --git a/app/src/androidTest/java/com/mogo/launcher/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/mogo/launcher/ExampleInstrumentedTest.java deleted file mode 100644 index 2784cd1c3f..0000000000 --- a/app/src/androidTest/java/com/mogo/launcher/ExampleInstrumentedTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.mogo.launcher; - -import android.content.Context; - -import androidx.test.platform.app.InstrumentationRegistry; -import androidx.test.ext.junit.runners.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith( AndroidJUnit4.class ) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - - assertEquals( "com.mogo.launcher", appContext.getPackageName() ); - } -} diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 87f83e0486..8fda4175be 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -5,6 +5,8 @@ import android.content.Context; import androidx.multidex.MultiDex; import com.mogo.commons.AbsMogoApplication; +import com.mogo.commons.debug.DebugConfig; +import com.mogo.module.carchatting.CallChatConstant; import com.mogo.module.common.MogoModule; import com.mogo.module.common.MogoModulePaths; import com.mogo.tanlu.constant.TanluConstants; @@ -22,7 +24,9 @@ public class MogoApplication extends AbsMogoApplication { super.onCreate(); // MogoModulePaths.addModule( new MogoModule( DemoConstants.TAG, "CARD_DEMO" ) ); // MogoModulePaths.addModule( new MogoModule( Demo2Constants.TAG, "CARD_DEMO2" ) ); + DebugConfig.setNetMode( DebugConfig.NET_MODE_QA ); MogoModulePaths.addModule( new MogoModule( TanluConstants.TAG, "CARD_TYPE_ROAD_CODITION" ) ); + MogoModulePaths.addModule(new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME)); } @Override diff --git a/app/src/test/java/com/mogo/launcher/ExampleUnitTest.java b/app/src/test/java/com/mogo/launcher/ExampleUnitTest.java deleted file mode 100644 index cde4cc10d4..0000000000 --- a/app/src/test/java/com/mogo/launcher/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.mogo.launcher; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals( 4, 2 + 2 ); - } -} \ No newline at end of file diff --git a/config.gradle b/config.gradle index a09c88791e..85d58d1a96 100644 --- a/config.gradle +++ b/config.gradle @@ -94,6 +94,7 @@ ext { moduleapps : "com.mogo.module:module-apps:${MOGO_MODULE_APPS_VERSION}", mogoconnection : "com.mogo.connection:mogo-connection:${MOGO_CONNECTION_VERSION}", moduleextensions : "com.mogo.module:module-extensions:${MOGO_MODULE_EXTENSIONS_VERSION}", + modulechatting : "com.mogo.module.carchatting:module-carchatting:${CARCHATTING_VERSION}", // 长链 socketsdk : 'com.zhidao.socketsdk:socketsdk:2.1.0', diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpDialogFragment.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpDialogFragment.java new file mode 100644 index 0000000000..bcd2e6412a --- /dev/null +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpDialogFragment.java @@ -0,0 +1,106 @@ +package com.mogo.commons.mvp; + +import android.content.Context; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; + +/** + * @author congtaowang + * @since 2019-12-23 + *

+ * mvp fragment + */ +public abstract class MvpDialogFragment< V extends IView, P extends Presenter< V > > extends DialogFragment implements IView { + + private Context mContext; + protected P mPresenter; + protected View mRootView; + + @Override + public void onAttach( Context context ) { + super.onAttach( context ); + mContext = context; + } + + @Nullable + @Override + public View onCreateView( @NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState ) { + if ( mRootView == null ) { + mRootView = inflater.inflate( getLayoutId(), container, false ); + } else { + ViewGroup viewGroup = ( ViewGroup ) mRootView.getParent(); + if ( viewGroup != null ) + viewGroup.removeView( mRootView ); + } + return mRootView; + } + + @Override + public void onViewCreated( @NonNull View view, @Nullable Bundle savedInstanceState ) { + super.onViewCreated( view, savedInstanceState ); + } + + /** + * 布局资源 + * + * @return + */ + protected abstract int getLayoutId(); + + @Override + public void onActivityCreated( @Nullable Bundle savedInstanceState ) { + super.onActivityCreated( savedInstanceState ); + initViews(); + mPresenter = createPresenter(); + getViewLifecycleOwner().getLifecycle().addObserver( mPresenter ); + } + + /** + * 初始化控件，必须在初始化完成之后才可以实例化presenter，避免 + * presenter 生命周期错乱 + */ + protected abstract void initViews(); + + /** + * 创建 presenter 实例 + * + * @return + */ + @NonNull + protected abstract P createPresenter(); + + @Nullable + protected < T extends View > T findViewById( int id ) { + if ( mRootView != null ) { + return ( T ) mRootView.findViewById( id ); + } + return null; + } + + @Nullable + @Override + public Context getContext() { + if ( mContext == null ) { + mContext = super.getContext(); + } + return mContext; + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + if ( mPresenter != null ) { + getViewLifecycleOwner().getLifecycle().removeObserver( mPresenter ); + } + mPresenter = null; + mRootView = null; + mContext = null; + } +} diff --git a/gradle.properties b/gradle.properties index 832da15ccb..c412eb98ca 100644 --- a/gradle.properties +++ b/gradle.properties @@ -44,4 +44,5 @@ MOGO_CONNECTION_VERSION=1.0.0-SNAPSHOT MOGO_MODULE_NAVI_VERSION=1.0.0-SNAPSHOT MOGO_MODULE_SERVICE_VERSION=1.0.0-SNAPSHOT MOGO_MODULE_EXTENSIONS_VERSION=1.0.0-SNAPSHOT +CARCHATTING_VERSION=1.0.0-SNAPSHOT diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java index 6815b5ec0d..1ddd0337b9 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java @@ -71,7 +71,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, // 设置是否开启自动黑夜模式切换，默认为false，不自动切换 options.setAutoNaviViewNightMode( false ); // 设置6秒后是否自动锁车 - options.setAutoLockCar( true ); + options.setAutoLockCar( false ); // 设置路线上的摄像头气泡是否显示 options.setCameraBubbleShow( true ); // 设置路线相关的配置属性，如：路线的路况颜色，路线上是否显示摄像头气泡等。 @@ -80,6 +80,8 @@ public class AMapNaviViewWrapper implements IMogoMapView, options.setCarBitmap( BitmapFactory.decodeResource( getContext().getResources(), R.drawable.ic_amap_navi_cursor ) ); // 设置指南针图标否在导航界面显示，默认显示。true，显示；false，隐藏。 options.setCompassEnabled( false ); + // 黑夜模式 + options.setNaviNight( true ); //设置路况光柱条是否显示（只适用于驾车导航，需要联网）。 options.setTrafficBarEnabled( false ); // 设置[实时交通图层开关按钮]是否显示（只适用于驾车导航，需要联网）。 @@ -391,8 +393,8 @@ public class AMapNaviViewWrapper implements IMogoMapView, @Override public void moveToCenter( MogoLatLng latLng ) { - if ( latLng == null ) { - Logger.e( TAG, "latlng = null" ); + if ( latLng == null || latLng.lat == 0.0d || latLng.lng == 0.0d ) { + Logger.e( TAG, "latlng = null or is illegal" ); return; } mMapView.getMap().animateCamera( CameraUpdateFactory.newLatLng( new LatLng( latLng.lat, latLng.lng ) ) ); diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviListenerAdapter.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviListenerAdapter.java index ffeec9b2b6..f5d9d1d93b 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviListenerAdapter.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviListenerAdapter.java @@ -109,7 +109,7 @@ public class NaviListenerAdapter extends AMapNaviListenerAdapter { @Override public void onNaviInfoUpdate( NaviInfo naviInfo ) { - MogoNaviListenerHandler.getInstance().onNaviInfoUpdate( ObjectUtils.fromAMap( naviInfo ) ); + MogoNaviListenerHandler.getInstance().onNaviInfoUpdate( ObjectUtils.fromAMap( mContext, naviInfo ) ); mNaviOverlayHelper.handleNaviInfoUpdate( naviInfo ); } diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/IconTypeUtils.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/IconTypeUtils.java new file mode 100644 index 0000000000..46657869d0 --- /dev/null +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/IconTypeUtils.java @@ -0,0 +1,96 @@ +package com.mogo.map.impl.amap.utils; + +import android.content.Context; +import android.util.SparseArray; + +import com.amap.api.navi.enums.IconType; + +/** + * @author congtaowang + * @since 2019-09-29 + *

+ * 描述 + */ +public class IconTypeUtils { + + private static SparseArray< String > sIconName = new SparseArray<>(); + + static { + sIconName.put( IconType.ARRIVED_DESTINATION, "到达目的地" ); + sIconName.put( IconType.ARRIVED_SERVICE_AREA, "到达服务区" ); + sIconName.put( IconType.ARRIVED_TOLLGATE, "到达收费站" ); + sIconName.put( IconType.ARRIVED_TUNNEL, "到达隧道" ); + sIconName.put( IconType.ARRIVED_WAYPOINT, "到达途经点" ); + sIconName.put( IconType.BRIDGE, "通过桥" ); + sIconName.put( IconType.BY_ELEVATOR, "电梯换层" ); + sIconName.put( IconType.BY_ESCALATOR, "扶梯换层" ); + sIconName.put( IconType.BY_STAIR, "楼梯换层" ); + sIconName.put( IconType.CABLEWAY, "通过索道" ); + sIconName.put( IconType.CHANNEL, "通过通道" ); + sIconName.put( IconType.CROSSWALK, "通过人行横道" ); + sIconName.put( IconType.CRUISE_ROUTE, "通过游船路线" ); + sIconName.put( IconType.DEFAULT, "自车" ); + sIconName.put( IconType.ENTER_BUILDING, "进入建筑物" ); + sIconName.put( IconType.ENTER_ROUNDABOUT, "进入环岛" ); + sIconName.put( IconType.ENTRY_LEFT_RING, "进入环岛" ); + sIconName.put( IconType.ENTRY_LEFT_RING_CONTINUE, "绕环岛直行" ); + sIconName.put( IconType.ENTRY_LEFT_RING_LEFT, "绕环岛左转" ); + sIconName.put( IconType.ENTRY_LEFT_RING_RIGHT, "绕环岛右转" ); + sIconName.put( IconType.ENTRY_LEFTRINGU_TURN, "绕环岛调头" ); + sIconName.put( IconType.ENTRY_RING_CONTINUE, "绕环岛直行" ); + sIconName.put( IconType.ENTRY_RING_LEFT, "绕环岛左转" ); + sIconName.put( IconType.ENTRY_RING_RIGHT, "绕环岛右转" ); + sIconName.put( IconType.ENTRY_RING_UTURN, "绕环岛调头" ); + sIconName.put( IconType.FERRY, "通过轮渡" ); + sIconName.put( IconType.LADDER, "通过阶梯" ); + sIconName.put( IconType.LEAVE_BUILDING, "离开建筑物" ); + sIconName.put( IconType.LEAVE_LEFT_RING, "驶出环岛" ); + sIconName.put( IconType.LEFT, "左转" ); + sIconName.put( IconType.LEFT_BACK, "左后" ); + sIconName.put( IconType.LEFT_FRONT, "左前方" ); + sIconName.put( IconType.LEFT_TURN_AROUND, "左转掉头" ); + sIconName.put( IconType.LIFT, "通过直梯" ); + sIconName.put( IconType.LOW_CROSS, "通过普通路口" ); + sIconName.put( IconType.LOW_TRAFFIC_CROSS, "红绿灯路口" ); + sIconName.put( IconType.NONE, "无定义" ); + sIconName.put( IconType.OUT_ROUNDABOUT, "驶出环岛" ); + sIconName.put( IconType.OVERPASS, "通过过街天桥" ); + sIconName.put( IconType.PARK, "通过公园" ); + sIconName.put( IconType.RIGHT, "右转" ); + sIconName.put( IconType.RIGHT_BACK, "右后方" ); + sIconName.put( IconType.RIGHT_FRONT, "右前方" ); + sIconName.put( IconType.SIGHTSEEING_BUSLINE, "通过观光车路线" ); + sIconName.put( IconType.SKY_CHANNEL, "通过空中通道" ); + sIconName.put( IconType.SLIDEWAY, "通过滑道" ); + sIconName.put( IconType.SLOPE, "通过斜坡" ); + sIconName.put( IconType.SPECIAL_CONTINUE, "顺行" ); + sIconName.put( IconType.SQUARE, "通过广场" ); + sIconName.put( IconType.STAIRCASE, "通过扶梯" ); + sIconName.put( IconType.STRAIGHT, "直行" ); + sIconName.put( IconType.SUBWAY, "通过地铁通道" ); + sIconName.put( IconType.U_TURN_RIGHT, "右转掉头" ); + sIconName.put( IconType.UNDERPASS, "通过地下通道" ); + sIconName.put( IconType.WALK_ROAD, "通过行人道路" ); + } + + private static int lastIconType = 0; + private static int lastIconResId = 0; + + public static String getNameByIconType( int iconType ) { + return sIconName.get( iconType ); + } + + public static int getResIdByIconType( Context context, int iconType ) { + try { + if ( iconType == lastIconType ) { + return lastIconResId; + } + int target = context.getResources().getIdentifier( "ic_" + iconType, "drawable", context.getPackageName() ); + lastIconType = iconType; + lastIconResId = target; + return target; + } catch ( Exception e ) { + return -1; + } + } +} diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/ObjectUtils.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/ObjectUtils.java index 943899af3e..b035a4fdf3 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/ObjectUtils.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/utils/ObjectUtils.java @@ -1,5 +1,6 @@ package com.mogo.map.impl.amap.utils; +import android.content.Context; import android.graphics.Bitmap; import android.view.View; @@ -622,7 +623,7 @@ public class ObjectUtils { return mogoPoiResult; } - public static MogoNaviInfo fromAMap( NaviInfo naviInfo ) { + public static MogoNaviInfo fromAMap( Context context, NaviInfo naviInfo ) { if ( naviInfo == null ) { return null; } @@ -631,7 +632,7 @@ public class ObjectUtils { mogoNaviInfo.setCurrentSpeed( naviInfo.getCurrentSpeed() ); mogoNaviInfo.setCurStepRetainDistance( naviInfo.getCurStepRetainDistance() ); mogoNaviInfo.setCurStepRetainTime( naviInfo.getCurStepRetainTime() ); - mogoNaviInfo.setIconType( naviInfo.getIconType() ); + mogoNaviInfo.setIconResId( IconTypeUtils.getResIdByIconType( context, naviInfo.getIconType() ) ); mogoNaviInfo.setNextRoadName( naviInfo.getNextRoadName() ); mogoNaviInfo.setPathRetainDistance( naviInfo.getPathRetainDistance() ); mogoNaviInfo.setPathRetainTime( naviInfo.getPathRetainTime() ); diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_1.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_1.png new file mode 100755 index 0000000000000000000000000000000000000000..20d7a511d716dbf89133948a90828dce7a6e84af GIT binary patch literal 2811 zcmeHJYd8}O8=jamn{zpYSiIXDB7~$g)*QxcX6Y^F@QOKzBRzTRKo_v8Kj{d%A4y6^kB?w|K{U)S>_IG~YY!t%lZ06+|N4&nG) zv;Kx4?{5~FB)ZJ|H=N>`!|9AcLE@@37g-Q{TSki#_k;axv-HE z0ua)DuEHD2vvpvbUke1BThad^AhRUC3=jXDFuXpb-uzWUl$)mZp?BsG0*tNGyFiC;#5T6+b$T+NVDR0?8Xpx}E~AdVr%`X`y)^k!ABV3DdYzl~P`MP@W2gDz z@XZoc&%est-d^x^IClD7zOYS>Q%0kUBFCCJU|~>fUXcB$3*w=Z?jQB);>0O;?}|51 z%&w6JwKF4>yzKvYV06$`9{>=5q7Y|r;Ui1=o32te;O1TcI$TKT=uJL{J0X_Mw@XT> zeTe8Hx5yt8k;|;jiO9g-!M~T)Cyl)n^|3!u0fC#^+l{^5fw?bpe@zF3d3%SY+@ebN zwCgc#;ZmIc%APqP!7lVr@amm~%900_^NDNIp8W=p+lOGMUi_*_DL|NLlL{4;4e4KU zJ{6RRrlQ0J@Q=0B>cM*MHX65>&?m^NQ1$tUhh)N2tI%nj^$g}|Qfq}myF_P^$ytUU z%h+Ph|AX=ZQ5p%yfI>Th>}s#bx9h!ssDYo?ML!U=831v(v=8u${t?6%`Z5Yi`ktf3 z$=GMriVZp!=CW*`pCSZo_e^|>r&D5$JbPKDJ~yM-VGCrhjA;D0el;pEbT{O$#<8^; zCfk~};OuG$9lsPlZ=AbF>yqa{^!asIa&O(&%IEsN&$=fK*!8uqzs|Q9vK=~lY`#Ob zvapmq80?fYo*lOy184f(JyUOPN!w)Yw70$Q0F!D@`jf<{|eh@RiDQ zTqDa47J(@94SYT3w4Q5VKy!zw@FAj-G-d;m*dX+EXjesno?enkDqH!?KEK&l!u0gs z3vbnKoY_5CP@U`0X5UZegv;wtKx)W+iE zclGpU08IRO*ts-ps#s0a>N*%LwLR;i$V>m$>2bHnBGw^k8^{zGp=8@wh zO!=}{2p_QV*7JNb`w2gx8^O2V*~=B@OPWGtW8!69i@Li>KIdCt_nn1BcUP(ceBKN% zulVe#L?$Y}Iq@eXZ&S<8`Wklk=>FCWPUJm7luXgzc@;I1lg1(6J3Ofsy(?dvIcpbB zqw=QOt&1wqv;u1B2B2%zywM*1f;_s*sPlIAx~{S`^acsyff%2;mRw zaMGG#7jAWGH!Uy8oZQM)udMz^Sdie#?zcfX%SGC+QztgVng=1DC>uBe45OAEJ#v;W z5~Or^C%X9LWrz${yT6@=|BBUkbH6h_#&wM{auG*(T}ByhdS_AVw3amKtnZSBA$D78 z5y}|>LUqCAjEcDGg3}aANvMnr{`eiLIF!C~nOf8K+4l>>u$}64>m)be8Ua;C5eg!h zsay4Sc@&owA}AC*YL8JVL3-ejf0jbYpptO}k+=~L9KqW`1Y6E{mtk&0sY7TNat$RT zOLQCZg-N<--9>4FewtyfFeguI%2t7kD6VO>qyXc+OtKB>ip4=ZUtLb!$`B{n5$a9h zkJ^K#3{zGbhCLrARHgh-^OEq#C)*2Yhf56xNz$jeS96Z`M*yi3giCa%tI z^~D~kNm^EtLHTM-xz^NYyic;1#eXOjyq;{V-`Y`ssBo`Pj~!dtGT1S&ZLEe@AK+(s!x-#5JO^Wq zB8wCJ*(Y2mMG>(8&Il#N7d{&c47_l;3@SSp2ek2FcSSAXNJ|aG7Mr~ClZepF zQm2NQTK6geGbU8O4pYTkxC0b1NbX2^QKTaqRRmlxoK1ErBRXCLGr54l=PI2=z&9)`WlWanLp9=^zd(^gD*~@-mCo z%SIm`^Os-QDWyhj3&SJzu<9I}#rGn4~=Xa19 zIOW_XaIK5)?j=D`)+__lKR$W$3b6&~ML!{^oE2InIiN16CYuS33N%rN&n;T{E*V~+@h3tO!j}z*Ae*zbMz)- V$mPmC^WPr=0A-0rR9m>k{s%G8q8R`H literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_10.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_10.png new file mode 100755 index 0000000000000000000000000000000000000000..a5c40ead1aac1c90a51dd06272921f02a4bd4548 GIT binary patch literal 2732 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 W(Awiw^?~2p2jGgrI6Zc}obhjj-8zT> literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_13.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_13.png new file mode 100755 index 0000000000000000000000000000000000000000..1fb0f4b1247743444494d6f3341feaa65772e6d7 GIT binary patch literal 1650 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 literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_15.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_15.png new file mode 100755 index 0000000000000000000000000000000000000000..d8b275656370c74fce8641e16555609ce07bcc51 GIT binary patch literal 2395 zcmeHI`!^E`9A7bM2pRJzU2#1ws--p0%9`ZH%zIpq%*BliF@;dmG=z&Nk2^BfL~BH5 z-mg{i2(x)VE*DX;F70M(uI>-_f4Jw|&pF@MIiK_Sp7S~1bH1r)l&u^{9RvUXgw~&_D%`&sM-vR)8nP_`g8`}u`o&WK_1OGJ#lmKs0yQjPy?Tm5(d=`kmu5ax5 zO9cEPE9p9u;r{XcUN%TV$d^VAfB$K2A6@B#%~QDxko~_mK(BSHwka=^o=ne;K5{k@6$IHcngJ z@-_~hm}9u0EXHjtzBWwleyzaW(#Rx7V<^)IRCGI0Z;s8alXxU2HhZ7Aj`Rc+Qy@ zYs<-qhU+(&Y2!m1E;)>{{$NqZg33=Aqs5VH1{h(VZF!(7f4PsIS*J4+&?2jO;teU@ zC$uQN@r8KxBZFxnkq(6BZytnT{z0Wp$_8$z$zPw1I8Dovec_oiNKawo+UI_)$nQx?cJxg@xv4x@7Onn zCXUrxS#zO`fs;~B;X^)Su+?+YP9ymHdQ^0SA!w8yrZS>zlK}$~w*WLoA4!{#T7%Vw zVp3iDL62jxR`@0sWn$~L=jG!9ttMK{Higl;PgzAHlDxZXRx5-h>MFsm#)O@V%){98 zR70x0!0td=J3Oe8gE8o&uDOv-t^4aiJ@~PcqAR8B9}xZt{%T^`GIn8Rr+J{7m|0Zm z;9-zfHFQ#>hM1-+>sLD(b(N4gm|!#}-iT^A6~~|JWE0F<^Xg%gYf9+zj8eY-2#~xb z>)0&yW1IjImLjAM2j(tK#HbbR+9%O~J|ps+nW2wb_^rH(IW)FZOB{s|>)Ga_%9~AF zaA9w5={;KG>DG}pJgJcGB(_KPyvi~A&9s6uvS;v}C3EYjDib!TDqhS3N~@%G5hNPY zW6u1w$-NbXWoEF?O5wsMgul#Z0vM~=Z`K}5p2k5RSWtQg5ZDC$+DMra!7H~)#1lr9 z_-@Z>oYfOO--0KTC{aJ@Qc%G-v!-LHF0*nqALKoTF=&pAvL7f&8fSSWe*J=Y6t6?< z)PT34$WKi%5jy6l`tuTxH3W^Fn-?0t)8$?|fIsCIy`XCwOoZc{!3D;w$Xtq^4IFo^ zZhtX0(;TyqjNBbIX)A1pOn2$^!tw>rFzw(zYhd#plaN9>a1LxZ z+CiX(W+NV(`fL{F9y=q zy29!uJ~Mj_^{FX?{JbdbZT!Yf+OU_!b~&HAWYGFdAwO0a9Mk+GhVKyeASTX&Gklv! jFRhWtIqdZ>%C|K(?kkO$banr<`)L4nHYg+=ahdQpDen0p literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_16.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_16.png new file mode 100755 index 0000000000000000000000000000000000000000..28a3ad90836a0a180135a63bbddc4e51049d19cb GIT binary patch literal 2475 zcmeH|`8yPf8pj7I+bGK<%NbLH8DlJo9Q%?zCNaa9+t`;l$(D#ZWXm!bH(P0xE!&V8 z$G)#q##UsgkR+NhWQ-7TyFc9f!~F~H59jkd@B4kezkZ(gdEQh9loe1&MhE}^0Bx+z z9e-uszej-Y*A`y5KLG&nmO9v>Ev!Q9j{fFv1OLYcwo-3D`*pP+Z#klz06+J69v+^E z*3CRv-DV%>+xnh&lK0rhvkZmxW#-%lYgSE?_N1zJS4-wgVfe7fLcYyJ=qW*iZmuX$ zey2oW^Rn>|*}WHUzKY-T3cv^zEq=;E)w^(fd?h-@toz(k-Nc>?OP^7(uu?9?HumUg ztDc9|nrBaa!(Y;W#UFg(*#SYc*mQ> z(FV^8?KvZ)gqM}K>XgWow@pb=uEjOu2t~U{(6fQ`agnnCSR;qbUsc3a(YfuiKop&pExOzE+6U$7PwZs<;yWOP?v^rYa zy4O$R8SXwG{hYZbEqNry+IXw7Qbd!bL-~p7-vzy%wmJz{A1a|r&UD{sEG|MV`CNaE zi>Lx4zWAiFzd4^o?1NBEROVDkT1VlQi8O1f7{?g6Q%3aEu3Q&7`?IL{9;+e9uRF4H zjD*mWGx=g`T*-@pf4@4PuixTXTwk)-2Uj^;;*FriZ#~g{j%ou6b4`A zP<0J?DK|f-q|HhWSFT>5xexZm1D%rV%+V_9^S$8mi4gZUYJnI1ibnPPq56}%0oIQO zT||O!X+$a~90$-Xg2}feIKQos#ti zr6~1rl2q3Vvu?bAwHQkjDKBrhbj{p;u!8+ZB3tpA+4ILH$``m)?Sly=u*HE?bjN^L zra@@-ORXzj@ENQ?h$edWJqB{uK`(o`f7B8B_%GYI6QEAK>FfBR`G#7YcbOHgBB~pm z?Mv~;W(ibW5N1vxb;Tf8vK68s?%OHDaDj)?@Ab4?oIPYT240}d^K7!7|7Lng>V{M5 zNSyAhfTyt_Fe^H~@y$HSK*p+}HjHm?1E7}XHw4*3s|>T*l92v;REE@fML@Rzki?-J z3y#o#tkE~Q{2~Sg;0n?~97>*^NL(oxN#niT1Ao%+so!U(_+CYDxH7J*ZQgIm4DWV? zF}N5`)hTFW2i-99y|AYfE{fS$I6h>yzz!&5w;Y2at1w=?;>U3C38X@uodk~GFpQe+ zz|x5eH4QDjM#g`K13*&5$`R3;N2<#+fh&L?{1!FWkTK{EK9D@jfqgrS+*{Yfm$2CJ z?15`5_Pf#q;yK||yL?|%lNXDV9``=Jgof3vDXg<>=2nr8~riAC5)<|`Ks zDF-QIZj$L?&v1_-l8^z8Qq$ygnp>9*{o99nylc3|@0kNC|dSuA}5mgb_> zFLPp-R$Eq^b;o!~JEML^_7m(884oWn!$HZ%Lyf9c8X@C8_VpsEnGc0r(;aLV>y@xo z16mM56O^F^tha-XZT{wJzncC^23T*&bNKNCL-2EqQv^~;+j-)q8*BvBS2oru7 zrisi%gD7e0y+j+$ynvKQ`SVo|v^9Pbt)zPt>fjC&cwXHsD_1gH3o;Y-oo- zp^23aF!~pl1o;K~DsnOLdvh{qJF)w)v6x7C{ByST`Yp;~ttMv4=q?lOW@GB8a*tU; zmetCRPlU%+$6$$ueuKQ>2UX#t@9x*1{H65hbI!8Wm$(If2yI$re&@#2@AKup`p2FA zqgz6&)E`o)dGo7X1yrQuDYiDgB)0mQQc@SdzS%Sd~0o978H@y}kY1S=wBJt>9

JN`L~r*ikIx(?04zqC&%;U zv*p!)?hUt+Z75G^NYb2!KzDDhx#6M^bT(~Q@yCjF)|1z|F$o*ak8Ew6$+N*DEp5RA z@$8~J4vUnGydXPm!4pk=C)tF8A|Jk#S>TmtrPI6gY&%1#)8|xBAM_NFgg z*6`YAsZCnzZ-(GshvGK5{bo%5oJF$`1GJ%(>U0KXU&U>Dw)&VJj){N%s>6sUB^1S zB;{Uj+Mnr`yeJ~|_NfikiFbY}Kjz+@``RT^;PkpKvCn?;MwMydJinAG0tZFx; z7=K%=6p?uPcftzu8$Wk9@10h>#$Kl(^`^0lX8ns@Pg!3-PS1_~GyBgyy;sNdZl*r< z`nc)cU6=YzzER8N&xB0sH~l2;G+i$_e%IyL*IOn(z5e3NDn(^&@rsaX>wYB4U0XNL zid)v|yj9b-#}?-g-rC$X%krMt?Z|22PxkP)-i+L=E9!N9o3`_$)~PD5kC+&*Zrb+w z-R!mXLG3;lJ9o|UHrT{e?JH*W)%Wq~s>tsmRh_3r6Ow!HwB9OSW7y&t7B)fRn2z-7 zve{fq=bPe_R)GFv{lJ0{wjN8}T&T5{y`n1iO!aZeYccdh4J$UA;LO=I@*3_6y zStsDF!$<<{)Z`{4I-!Wfq zq4SS@Q?tLar0)In>HuTR{VjJ|e>6X`d-C)n&yUWpyV7?&R=2f1!}QR-Z1?W-mfynV z@L$j8ooW}*}k6Upn^B0w^iS4H@8!c`ow5?{FFjX+0o3&DUTlnPkmHnXZSB5 z;ky0w|FOQ_RxRv__bttLGi>V9akAK=*`)fbLA^yi>__CI{=-f`em~x$qtD0h{Nst8 z-86IewY|Ser?o%5day)Uye>JlvZCj{#{)yNY1{Q}9U}IqU=*vO5ave?m zD_3qmV7C3T=E9#uj-?xVzCOOGT%t2mKihQI%IW*wotgAEEBf=dzdudYr|Ii6nSDOY z-JiEaH==Hz*-fvml%IbmWh$$1Yata_z{2b2kxwdJOC#Xu-Di30ldC@pziajf7VZq5 Lu6{1-oD!M<*CE$C literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_18.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_18.png new file mode 100755 index 0000000000000000000000000000000000000000..875c448856bdc6dffba7601b72c5850282377d87 GIT binary patch literal 2091 zcmeHI`#TegA6_Iy_{(RvI zz_kGTgeqsP?P0rOCK8*PQi^IrvSxOw+6E`AuFG2*ZkQk30UtW4V|rZounf>v@9Mf7 zN^%}54Z<>F5*|~Q>b=sIxcCy6`btx+Dbav5YxKG{QU0Do5h&+ z_O(s_mbRk-G{JrS=gI8Zd!5&3xZ43ex3g_hyW~$}Je8N4=Kne|#jv6Do1L zL^jCHUrbOhfdkcG{)(911$YSAfjNr7Xt;D>f=i4EB!l2kmOC=&q=z^5w;zxnRWA&* zBt+5GQqw(Tmk1f5zLX-*-5fLeuo}MD?1UTYSQ_*kvkP;k03AXJEhYTHd`%Cy6@j|- z^72qCGnwEu1l30Kl)A|z`a^o3cz2nk%u^IC>fos;WSIwqZ-14yHFk)*93wWo#}p(R7wvPm}}bd_E>qM##PW#ig7!+gQG0+cGhF*vwA=+>?YnwCQAXQ#OX z=liHAa#(r{a30Ct%t@;UtjYHlYvREnHWCY4O*(q!pmI`Mz&SXUe23DJd+F|D7xzmv z_7j|~<=&(;ZzhH4N%*>umjdRbXf;|~u+|^_(+Lq7`=?PbRQOyu??BCi4|vzdOrtLE z=Gm&}MDNPLP7jWVwbfr#o8!P;x?ieis?k^gD7#Z&4?05I)vVf79Utq1)wHE))hmeD zlQJNGdya5Emlc_6!Hy5z3lhV?mh0z;JyWazejJ5FVii|YE#^+m)>9^QNBpbo*7F36 za91oxG6|i?ftc^}E_;KmMS1|;A;Sr1D1>%;I5Hcb%%bZ;XxO4v&}!CFV%V!yda1#} z5y(Pu7P744(@)Zkj&tbPDO^4kk=SvYf45{^+%@YA1J~A7>*p03V8TcZBKE8q0ej|) z^D#L=ExG2icGuw~eRoD*FdAEjNBD`~R>4zx(9xX)@cn($oQ@-e^_Rv2@*RyDT zW1JH|qwYfuA70K>tTLTCmZK@c9Vee9+davxERU;)BpQ#1Hvl*XP^G##w`B2fxv+zi$)N}wTF7o5yAGhzaqT~(S6-M`0D z?4Q!8`O4H3r#Q{0%XJPm1ifu;t?x^v%J4Q8#S{fy>i6=eE4lZ!nto0rzan*sW{7P^ z4RfGYS}*(7OR~M(j7r`%^`A?{0)k!{Z0S? literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_19.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_19.png new file mode 100755 index 0000000000000000000000000000000000000000..e6ef7d4c89761659b5aebe4c734c0d2064398e99 GIT binary patch literal 2352 zcmeH|`8U)H1I7o}a*Z%%ELmzIWDH{L70TAcFvbjDk@Ye%g*!zImym2BVNjtgy=Izh zV;{n`O!jOeE~168U9v{S+k4J?&igOCKitnb&-48LoadY;32SG4OjuSJ1OgpHU$(&g zOzM9m#P`#|?_=JAK)jE!ws=eHVB4dA_@{yYzXtN9wd#J3b>=qC&Jpwr4=?-2_uZYt z_41Xq1A(o~CBd&kFr)q4syS`>^f#OJj{KjsuHX|Ff7SV7b!t>vWVv}yHJjPj8dFW1 zHf`bK{B?Ev(%&c01?Qs?$2OFshB4xkpPqNUkbLA5oY3q4UiOXk0e(%wx9T9{Q(>&9E>iXc z{o7_9*He*cHi{P+XW?x(EsXC_z0Eu6#0t&99$e_V$A)f&ukU(Y_%jO{LNRbvuq6#x zYdFg|Dcy^A*fa-$`2Eoq7x7_JYftuE@z${WS~hjnETlTYEF*0@fCo}4gn(Q4tjnfq zbNqF8XMGGXqb!x-?b(Q+$HqrCz0geYh5r6V6l?2KPo(Mk{_YHGZ}6$nqFbNN|2Swx zm{iP#v11DI34e#YCipCLYM8t;yoSQzK9&TCEvc?|?+oNM<$6!;5h2)F1LE2+sMes} z-jJNCnV70M=4{`Xm}qsuSeJqgFHWkY7bGQ#j&18ow{yGy7=C8_SqbPOSjZy6;Z@H! z_TS*LXU%T(Jb4JaNT0Fuc8*(5f#FAq7MIQ$SleSuQ-w@EN)SiK;}k3Tx*^y1 zb?}Zx9C7~5_eC-!35TMp2}EhY9eTTBhrBSYm)9a&rK~tvf$<>OkgeX)@1{QNui~kgx`r+K6X_jrZzS? zL~Nw=z90GWKF=53kuD6X(TbPED@m#jWVq6Rz!_j-*dR@K0NAvXM-JWF9O0IkSrtj{G#^w=W};Y;)AZ8RFw|+^b>G=~yTYK9*c_gU^?nvSYNWf9Z5o zh+?$D0DFBb!i)9fp2+NCsE=uNh8Z$uE!GVrQ2*uMOcAxrgvGr&A4RH)@2*Hv04X0j*)Xvh@T9DZS~7P51#`E8e_MuVa% z+`ZicU|^D5H;uXI0ez=4>f0|er;$bQE3A@B@0Y(9XXMZ#N2GokqP>umz;i+uqV$E9 zcGupUZt@>TtSCm%xzDZ|y_3wt2X@ireY5ffPe&n$l!0$Uz3q-zpVlWVkV43IM7BFy*#Q4Rujm1*MLZ zdyEwTty@)f+_t8a6hb*)$`PGR6-CxhERkP<1stJJ(sZD`&6z9$ZshY;EkEy*?}zk_ ksanf(NTvT$d{h+0uLMKFIKw3+KhFh(wzRV-zvLPFZ@e48$p8QV literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_2.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_2.png new file mode 100755 index 0000000000000000000000000000000000000000..7dc5d8dc52e729fbc9b5c5ca9e92e2388f4ac2d5 GIT binary patch literal 1339 zcmeAS@N?(olHy`uVBq!ia0vp^(?FPm8Ax*9Z@j?3z~~j=6XN<+b1434HtYUZJqsGSXbStK?=4MdJ$dBjTi*$q9y>+$B_=#-nK{qK zTypZo0NxLk;_Cu88+~&>t8pT0mB|yHZ?4N27?_PbT^vIyZoR$Zo`2gxpzUG*6pzx? zHwu-GZj?Pesj2 ztm`(nyuZD#cSlTqL_BkQ`pk&$Gwwf~dCTf(?a_p+?5V$<(z3F@z1-Cp`aEsst*nZ3 z(h-3e$U7PQ| zEVy}Y)im8B7Qa{SzZJED|A|x2R__pry4TpV6i?}HsNc3VLViW7#?EkgJ@MDf zTLt{C{mtalo|=5ra!o|v)F&H+EW_^AE>SwRYTEwP9SK*9BTF^Il&4>vkhFB?nvgEh z=bMr=!zP{fS`rbcr!ABeD)~*|!(H|$#Rt3jw>TXrm(OTzcyD)si}8N#0#T-Yza6w$ z_Iz&);i!1eyi(x9J@z2Q2YdOKIDObWD=aLyX=+4dCyVx`O-hW@_VQ10I#4gK(c19e zE`aOcxh%m5-T!OU8n1pi@5Qm^h`qMb2Br5pUh*8R4Gwq-7x_1>4fqKU`8BN#c!>-3 j76FK)4NT?#{IBuzrSJs(3@?5P%(o1lu6{1-oD!M!r$@;-tCt4jnP#d}Xg~~~JlkT^lE}!%GUdDc-9qO9*W}SwU z&yxLOT-FQ>Os73v978H@y}g}UuH-1tnyBEwBE;d@F_Gb7X*mRZ|8;tH>7)yHx85`^ z{k`GqzozHH#p$~^TTOf~gOTv6fDeIJ#d^2>T<*19VC$0F;Ly?w0kWZWD|cnRtlkHO7u-LDn&w>?z$qpN84@=3Rn>sGwll^Joj)NVzPsmY>QB5_ksUS9D@ z(n8xY)oVd$@7JdhUwb1$(}kz5T`9csRp;b|75sjpc?!wAiBneXoT{_ctU1DR)3n1Y zew_@oPgB_)(INOZS7rAk`HS{$o3vjF{>@g|EhKl*GfB;A(dHw51uoP3Qo@UrtA2Qt zshTcw2Xc&*tG)m^hKr1Azg+*yYQIR>q>V}b;#2ocs~5O$$yC|RRpui8*yPwF*E1ev zqIWvB^{0e4_P&t$8$3z*SLeY3mf!z&T{sZcn`&#cL9g;hYRZb;5n=ZZ+-grjAWm<#@g*#%>u2|y8gRd zDQ8X3&o~$-^Lk2Z+}cAMk3~n!FIZzMc8yggdui)d-s89O5`CLj=H0rdVRj&5dhVL( z2G?X>b4$Egbu3!@wOyC#(NnkjlWezbn${4)-2AU*l743EV;1HkR@v!$`7)ziOHX{& z{lnHGT3kDI4_l&c>Bcn+h+O^}tRcf;r)B z>1MkZ{ky{~WBZNHy?XM#vhInDqMum$*#{f;b!?U^idcUn@^QrTpO4mmCEpcJd;4r7-;2iqt9#Ol*DH#;M5gapBfe-2Ys|I4 zz-yJ??pg<4bJ2Uf^U3{_+hS7U_fGy3{($da?}3#~YdGeYx=tvaalT67MAh;1w?Zkp uk2Wvk-gNJCWcF9jwVAV)fzbcpct-b%k9So|UfcubI0jEwKbLh*2~7ZxmTfHn literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_21.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_21.png new file mode 100755 index 0000000000000000000000000000000000000000..1da8dc87523765730dd43cd7bcb8a78f71a2f58d GIT binary patch literal 2378 zcmeHI`8OK~0}L7@>ZoIdXdOjWMXJu0)D?uJXb^;8L$#u`Hk3NL#k#3F8m+5!UkOU0 zRYk44)K#~Ju3O`_61I!4``-7yzv25~=e?Qvecrs81Y2thL9jF!000PDqLA1hPWgxY zJU>)mE^-I};Lf(i*qd40$DI6&e-rrsOCV1Y-teQW%s{NQ9e|sME8XwtM#u}+H2>kT zoVeBL^}Q|WbC`Xnv%jI$1^=89y8QPdO4V3^_dDlfm{jhi1zF&Z(#r25YF9MaS|HNw zRnthS=ml8KOz85Yrf|#Z<0kkiLu4uR`o={wW_!`SwL6wSW&L&Si^qs(Tt(F|<()~+ z`PNrA1ABL|pDa}Ley%IW%PaTs#e2#4+w|XpNGQhY-mj*;?><8wcXMS(>OX9IRJauV zRUtKD`+3>WSc8slqIN{VoO7pjTCKfZ@Gmg~cfm>YMn}Z_sLKTIZSx=bM(#f0gzSKx z&C#5}X#fBiWr;Ml51HP`-gksLi$8W3%{F?f=!BAcD+$B8TJ4w=49x?h{H!*ft{LnM=!D^ zW14EYpE%PQq;R22L^mo0SEJSiPH-yD8{^rlCDz@=J1ZfcIDCCR+EuB?RYf$)=;n-w zQq!FqrAMm()NG;s6sM`NHOA3|myQ0H7V=^si|<&rrQy@MPd$)CQ$At8WCwSOu9dm< zE+w8off1jRgW9k;%4Jpcbyv5wXdT}b1+b?HZ5yVdRWHVvS`FsbWL@<{fo`N@LPn>`FuD%sw zRtWJA+69y{%$@VL5w3^UgaXr-r(C9(`CYniWP?WmB@&=90z(^Uw|+b}Vk; z!ABBg^h}EFPS`<_p>o!iE}i|EPe5n)d9k^Q@Gsp1CF}?S`c3j*N?Z?mV;`9-ug*8S zkB`K4$mp4&4ffGO+q{MtZPW087gfg1TjsCE#q2ZcGg&G%JkDb#NrCemuSEFOLh6i% zK#W05UOKdU$+NH(SnW>wfYyT5B@KoL#ic22?jz4>SQ~B`ssuYNpk%_bC?WlZ;FVd@&-${MV_;cZ# zkmDhsVqa+ej;ux<-Bz^ZRvkCRbEVvu4Bw_4dPkMqDq)N?Hu1N^M-2=O&fpKa7Nqdy zacrykPfo@*xw;>^{mHx#d?%e!@fbdrkQ6vog}q$dZ&Sbk+xgJS#SEs@HD<45sz|Tl zMK2?Kyk*p9j&>WRzex?o?}Ock&KA+H_?@m%X>u)Xk%i!dFGjeCOc;|iYSc3-dKbd< zOn;SQH9y;}K?&twU<9sVYRpQ`9XA4Z-gslbvfUPiO_Cg%O0B)99U_eTeS7P06cr^{ z27=)#Uj8lt{kZzQdLwf+fn62$GX7Z0dSaw3r}%)*A#k+u?ZblUgahwl${bwGR5d3P z2k7ecYbN_vU(1>>cpn-Q_srg-oCHIBmKVHZU!i?7PD>v5j1thOgX^&^ zG3g7D@rfyLc})pW8hL6QgMY$#TI%F#MaNF3b!CpXF|H}3EsNv07*TVafwGB4ga|E3 zq6fYD+4Vgh%?{n$`@@DvFu*V8A{Pl!AG?<5q&MDjTSZ&?VoEfJsTohB>k2(?*E>e8 z!1eJd;po+Sbc*aQLi0DukSN{+eFp?9P@?-w!v439uMj7I_7INPS#+oBkJ|xQnpq>O IO+2Fh1IL@s`2YX_ literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_22.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_22.png new file mode 100755 index 0000000000000000000000000000000000000000..79f705a31718cf89d5e07eec5608d6e3e7e373aa GIT binary patch literal 2144 zcmeH|`!gGe7RS>njd-sJ_3XB5RmH0)QSV11q^L(EZIz@}ko77OqufQxrHYo)rJ}8j zN+n3dR_hVb3hk0;y9DuS-FlRGR2qho-rl)0_x{qq;LbhsJ?A^;^W%5U%qa}?hpT{e zK>z?i1>xfr^vx^()j+v#Q)xEmH2`o>B@h|n{q=hVPeOhV|DXMjCjd3MulMafnp1=P zgU_YN9V|LP0VE^!j;b93`knBxl}DUCeDY^s!!xQs9J7W(ydAY*>WZddxSf(r-#{B= z;j!lIpy2MbyT9jRwe`h} ze{J&nM~w_g)5Cx(8`!$u{(|M$9ZY&nmPpKF-X5v!3HO}gwj8-MJ+Km2NUhCoRY?_| zo(xUnKRvZrYMx8XyNJ?ExJi0&0lPCA4*R)PSBcZFIi4TgDm!)fvWfSS1>ktT7Xm-Y3XpCN|Hxv0(Ir9Nl=W z!rReJwwv<&xS6!|FYSJ{kdV+t$>I}H#W60+!p9fUV726yC{Z?ai}SE=E+H>@?DI>0Pl`U|UWq9a*JVV1)SKn~ z0X9*mGshhF)NrELZeK*yi=7rJSi>TN@cvfi%l2rCy9%(eWTU%0)YvV?)snadadbZd ztYJ|^5x-ywxB-T@)^tx<&5ubi;yqx#7W-29AHm#N$M{XmuVqKkn7Pl}9q{An*ZjG- zV6#m|3pPRLIn#o?9ae;95Xx=oG|tS|!U*A!W2%T&;){yWB0AKF%N!5R2h;VKy0_&M z&2R8Z@KI>R0b6s;g?)#yRYye#)UO@)MQ$oIN<64Q5+3M`)9#4JxVMhmV8bBe>Sx|C z4p#COR;JNM2f`j=Sk`TXYg8LEP^C~YQvxfEX6@URFq9)#d)Y3%?C~W%e@0XGC>h^f z&&A;>Xlrg9mt7kiXyDOoo>!EvS}bD8Uo$z06s>z&GR`b@Rk+cEg2yLcUp?0lITM}} zZOlXv`m!V+56S7;5+DtZJCr_@%79uET4;P{ncaoNmP=ja!g)0RZJ&x94Xz_O#C)P> zho?FJwg0f2G>#HwuBNKmq+BA+-KSeBUR2)7L_Xmyr7m5Hnxn36t^dvArRY~5k_#aT zr_W>7w$X*1-VBn)s@W9dyldDXl_<>Z#iwQ6taiW2m1(^x>pp~%Vr9y>WpIM+a~MbG zPNLNPmyVu$gVj#C`ajjrEid}Qp86Rr3fcvw)P@{+!H3RpU#)!*t)t9IXg{#w`R81 zLN0&OGXhaP<>yV9(5h8FU*wUDR1s+;sWNr+1GhDoD*;q}}A?_dB4a%z7h^Mrl925Blus z4N8J9YpKj$xHLSXjiOB`4bE_8Z6L*}G&b>)^*-)R4ErQOd^oYR3+CFRbs^|V(`?-c zT-d)KW6GSd2)d7HYmnn-I3Tm|Z-f{032jhMxybW2HC{}CN{}v)Koyw2Y^`;!smo!V zULFPc<)%q)6Me~1@t+Oyo+=S!ANA|q*{630HVS^XgJn7U#+ssk8#WO-mOBaO#Lig- z5$}Jq9(uWbEA(t^A?8lPTPXiO+U;TH0{^@In_n&L0o*<68Ia@NJo@c301)2(Ud~Vf literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_23.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_23.png new file mode 100755 index 0000000000000000000000000000000000000000..ca288d22cd56ee69e10297982b17bfb1a093e27f GIT binary patch literal 2322 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 SE3ExT0SNRB@oDjnEBGgN{vzH0 literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_26.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_26.png new file mode 100755 index 0000000000000000000000000000000000000000..864e7d9c31398e7fac1fb9c6172c32cd96897a6f GIT binary patch literal 2357 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 literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_3.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_3.png new file mode 100755 index 0000000000000000000000000000000000000000..2dce00f26af11def95f4fa95fbfbce1fc5b67a27 GIT binary patch literal 1261 zcmeAS@N?(olHy`uVBq!ia0vp^(?FPm8Ax*9Z@j?3z!)6h6XNP#;PZbJP&EWhX6kbT zL%Eq|aozcDmyI-&@CH9_ z&jSJrx2iTR6WjeWWYU~3Jb7y_u%CW)HNAqkUV# znPb8P21cfrd(AIZzu)`a>VN%ISF^Z+rJa9c&+0t;&0KZvm?iV-srs}-f6L@mbVSaa$O&xr9fz02x zLpN#c-07#>{o;=QRGnFtmWw93Zu!2zODuM;*uPEs@84F|d{g>+ebV~$LyKlDzjsl= z+E!LzYmkb`gJb&a!Ma~FI&z~q7ymMFc3x{P>a=yUxAVI{lV2BHJ^t9_PuTayP<5-8 z8%yIOt_3o^J)gHAtAy|9qV)2@HS#UD@BA~Ikkz%I`Y+evUoEK@#oGgX)f28AQfb;M zxhATnAwbu@ebKS&$@9XeFIaW|zQcFLPsVS|0!lmV9*4{gjPS}o@b2&v+YdJ?xR<`N zb*l4@XIyFK=O8a9rnsU;sH-ceBkOe77s)fl3)O!A=+e%(Kd1fak2T-a{#;!2Fwt~} zPJ-j_u!;!Q$*ejV|8L2K%|7a7#!~fh+V6K2e5=jnU$ne`?;LfONqovh_IO1mu_>2v zQU63uR@+Y+xi0UkKIwHCzB3b?j*Tm2bM!mHYv|PUaJ{giM-@^4!E7A`{2Zn6o>a7*f za)~>6D)gJ<5&>Pd)k`<>E46k=f^@oYO*D)En(HCb^!;}l&|Ie00-b4>Z?HEyiRgp@ zEoN#x5xFKNRX$7KrTb)7<{Rg?tsOH#I)MVmQc|UU2b3%R_}}kk`fcGeCkwOFKow_O uXQXaU0}DLKnRaLWTxe1>o9%n_ACuEF&kI_q=dJ@Y7=x#)pUXO@geCx>mi+_( literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_4.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_4.png new file mode 100755 index 0000000000000000000000000000000000000000..7ff7329c6fadb97481b042d2b15bbf1176514c19 GIT binary patch literal 1836 zcmeAS@N?(olHy`uVBq!ia0vp^(?FPm8Ax*9Z@j?3z?2x^6XNP#;PZbJjD`TsLg3Nb z?p?q%cd8`FFPMS%eBo#2cjEt8zORY>CGv>r{vY2T*Eu}d8H+!?&9?oyvYTthIo1i6 z_0r9zmVPU1m3UyMv;U5Z%u-90;HQf7Iy0RLl->EmPa0aipSa=qVkK++)1sz4N5p)- zo>{nJcEv7>m$&RAch9+MAbg-n;fXX`d#&G6t1qrP9q_r!if6db# zRynz4)?wnmC7o|BEUDed6p{bOYF^)^eyxtby(f+JJ=E8fTvHF1OWpmlv9$eWdXAHk z?dr*vC+5wJ?ub-9Q~2l`|I(DHMqAgM*tK_d&(tFpomQKT+S*JzK0b~T%~45MYM9u! z{7OsG<{$}`=I474r#>}Exc6>W>xo-O4j7uaTuIz0HDg*uty#Z&qHcpV>rgkH8=1Tn9Qm$+q8BEIfcPsB?R=fJzq z4W7@-H3)h2N8pNPA+yIRTaC#sm8mNXMj(yyyYJe(o3OTNB*r?!~fuyqV(jiJZHFi z+*4E!oz@k130rd4?LjZY*Nyx5`k&r^ewJNcOa1C>ZL$8;ZL+7i?}{9Kxk~Hwda>TE zSJN1G9QgHQMpdz`d-B?UpU+Ldy5DV+MQOOOnD(#l()q0x@A7JmM6*xtTl>A%`;6K7 zV=H%0nh8fEBfsw5uAW1$e!Y6}*ghbA=DNfUw`AWftekx%HkT{bZ{=n^A-Qb!Vy-z%R@0=H zU#l){~D6{@GJ9TWX@fd|^m)9Fi>^gdX<9`36s~*Vn2FE&bcRkwGwPIHH z{@b^Gj;?z2zWl1tMwaPKV!|8!K1V(*&Wy-r**)!_iOzfmJMH!t(L5qC7S)c2cd7pn zE5ESe7)QiBlQjkxw;mJ_x~6iG(}|N)+xf^X_d`PW_J34OJj!vt(a1AqrP4Kyzf(Wk zuDp_X^r~^}?|= zCp3sErs=9C$ck=0#SxKq;A}QinC1hcPIJ503=LDe&vUVDkbAuOnsIEOfFwhhiQQ|f zhEkUKq09+ykEDk(M4bDvCWfJV!Iqtz3AsnoRhc8iKSX|In5J!)E&1ep-VdF{>mok#Ng@b=d#Wzp$PyL?VW}I literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_5.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_5.png new file mode 100755 index 0000000000000000000000000000000000000000..7e76168488c4653a7a56fecb28d4905b6d776700 GIT binary patch literal 1830 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 YM81|z3Qa8(IPGqL1;W~-*2p9FA9`GjU;qFB literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_51.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_51.png new file mode 100755 index 0000000000000000000000000000000000000000..5c1e7e31aa5f8cd0989bdc0d90c749b62d838213 GIT binary patch literal 3016 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 literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_52.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_52.png new file mode 100755 index 0000000000000000000000000000000000000000..5d59916fc960244cea09bc20f7e05fa0599643b9 GIT binary patch literal 3101 zcmeH}_ct317speT8Z~MKK@noaie00vnz2Vvsx^w5Mf+H_)!tQGqO=qhVnl64No&`B zL`zj{V#KCR-#+KO??3UL=brQZ+iw;#{dAT88ahG9X&sz-~ZOX3H*O0aB&{Q|L4&6{Vhz8fU_TIzb=F>QGWJQ9cZMV zuUtK(_Br{!psBXY+(@37r@MWP395*V`z*&{88GI%rqql%RZiGv{1zd`0M31C)3$x< zr6>*8a%WZ&H_#$)BziBN#XiMbob*CsvUW4a<;K_SH!w*PUR0ezBz?O;SwlXW?WpDb z1O7g#bzxd#grj=Ro#H4jS5U@~LH#{=lVHX82dBkq+zzX}!$#4~yFAaeUte+mqVvgm z<`HL)X{vsv%ww&$0}rK*Y?GI+_f|o4x851Xu72#e9OE&kN(c<{zi%e{%qmf2Iyk%> z8P-KCc{0o18d~_bc?jPtJwH!3bXe~~Ys{JB6dJJNyEF~aimJOHj%T@nl!X2OU!%END0BMkq{5&;T; zM+rIBj+cg+F`=e^9Irjqe|ECwnDY5&Fc*M)z8O4Cl+Ly~sTgf4CQ-~cE^QV~u#Q6d zW0fNikDbLx=;r8a8-*n7W3{S1EseSsB@-{6N-6FT4M^ci?{Y!|wv93IZC?8~n~Es0 zf|o);jRb+@Aol zI2~@hV0zk4>E~~)U+8GO9^S?kroLD5?Y@ay2w=gC1I`IEt&2(`!Ik(Ba?s! z)q*me@W>bV*8x*Sia9U>2R=O$T`0741`#KRD$}slFK9Z1DkHm z>{zJPT8p4k`2;ywo#PIqa232yvSg(c*J9%x-?DX2Bidgmn zT9XV*h>OBoPhj?6;85o^ziI-ka#@hx(3tV0N4L(je)^ZMNsBC#A0aRC<9Ryx7C%a9 zcCnoaSsy52_nYuZLDur}B16;9U1~tY!L;+n{E$)gk02E4##stpB{OT)VlztJoLH z*1)0{zi3dHJ@YvA@C>TK4`7VkYaytmHwFCIrFW&L(2#H&q8+-1dC=YjJ)1bLk$hIC zO7MVCg;@i*ejK`dQ%`8xBS>2(hEiy%bHVL?^`=%Rexuo z-SV<&-r>Y07B$mxDTo}rUj@lY25amH53U^PglSbf7aC?QxY)pXOxWUp>d#hrSacWL z5KYKqU{Qh^|GiDS5y@f7(u9nWN2fG3E%TA%<)o6N%*ni5Y@1()M2|bM6A{m$o7Q{1 z^=L;!UoNbvf%-|nXGU+;J6n57i43=9%hcHlv6{@tvDgYY@f$Z##_24}G_5^h@|3$U z{oz0YpryyYcY1?M8WBw4)=J|^o}8sNzWXLYek?YNaD}f~IoR3sr4uO*FQWuaC@*Ck z1aJSwou-fLk_EY~uk+@ok8AjpVd9ue$6|?Tx`%Emao=>fFwSS^kRaO$E}FUVE?hLF zF}O*t`L-Zvcq$UF*yK)AM354!$__+cLqGad`1DwM5TYsRHcQucY_L? zwCNe|v*~YybQBbv@wh=2*Ch(CP1Br%Revo#M+)s6_iDpq_HWSUYRrarYQCyKBhR8qQG!TqOjzZy;|dLw$b-H zddaTg9QLQ~Bm#q)Z?I2(Yym@DDT48Y#H08mr=BLg^DA0*dy>1jK^0e1DjF_7*QWnD z&PppafQ?d$zh||>d8^uOLL%*_{axQ{oZy!3&Hj{z5dZt|25{)}u3=P!>`cW|xZ&Jd z8jx+AeNQ8YVJ$qNyI*2q9DAI=?;Z9dGi5-p!m)cNvC^sHU_l+SUQzoHh*5q!03Cq- z=nDqb1q?wNJHuxujj;LZJ+8x-=z-Lbw9jG z8l6}lO+h<$9O%%zE6ep@+lJeGi5{(`nE%GTV;L}E=8FKseK$MPu-;wYH;J_`@2GB1 z;vOo}UnKQU+rbKi1JdGw7!BI&c~+H3Go;#Gx7Zx1DA-@I2KHy}=urSBopUq4#vmdI zHQcBAd8CXVT;j>I@0e{Si0+CrxL4!JUy$lHm|tP_K99ZbQR*?>yr&gOVgpxnkeASU xKP0{|62IPi_DJ literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_53.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_53.png new file mode 100755 index 0000000000000000000000000000000000000000..fb264f39df0fd7dfd9f247de77a724b5747c92db GIT binary patch literal 2840 zcmeH}`8U)HAII%6$WB)#OIc@x7-ir0VJOCz?6N$_b|;rcmKc&Dj40WLEKNhBY>6Uk zBN~ITg~&)I$&|PlZawGuC!TZe=bX=SUO&Fi`<(YD%h}0B5F`y^V`CGvv$eeVYZv`) zUd~^We=(K9#>Ua(40pA%iH0BjTmLHXf2%-}#sKt}r`J&zoi4Gd>>nIHnT_jZXSs7M zz5YALe8IGl&d2}BWbe3v#Nzj&l`mXBaIpF8I;M<}^v>X>K-+2Eu47SIq8r~*-zy5r zsy@by=M@)TXg=o@`#{I|1qD>#dg5yf$-b|~^Zc3JZQd$1;VV8KTk?Jx!x6TQBisx# zXi7s<Q1+MmO7zCytB;5N+x;-SiE_3_U^@ph@K=XF}MTL z(5*c;$T?V~V)>Lp`dDY$fAn7(T@!!yQ9Bw%o4Y4fmZ0T308wh4tR>rpUe%~vi;p2p zqrFO8u7g*tZ`*_q&4lRien_W9aua+(EzZHNh;o!kDva9=ZUpqS!<8*O5 z%mViALe)#P@cZY2$c3tL-oDEj&Svw}%6%8`pXO_E0LDYO1B`TgW4o3Fq|N;%r#R(N z2E@09zP|{h`u8pL^*7%D`%_q?qys_owqE`B$JJDzr%97N%YC1<6+F4Zyjql9?YMr1eGyi6IEX)laNy`+i2M^ zZ$$i{Y#w##BYQ1QE}$>shP@HeBNE@OY-|N4d-kKqPtdE<#u)Fo-2!c1#@HviWE-~P za>aLA-ZY@hLxx{}E(gyTrRGI#M-NeR77W=nh4OFMS7zvtqHa!vYMT(=sk6@&KH+kx zbB{=3RTVOHH3-iUPvhp4Wdmxbv~**shNcC7#h0z>v{pFsl+$0S`9Aq3|B0z>aLcO& zm*7k<1RYXk>NFWFu4U0c%ZwpdxXv-+eAO#ER`l8qzb&L_nYD~Zu)I&wzu4>I-g+B(?96vvpUu>LM8yr)=M>2S1>SW%0fYF1@ z!on1O_DBXA?04w${e7ab-w<@aZD1B|soPIEtg|xFn&xUM#t4;|r=D%=j{{;Pn1fD|@ot+UYz) z9WiE;Hc($A84Gm>Y$vhFIQmgEj*47hsJx6gKa%AsQHCL{C$wsLmj*lCNi zO5>5dbggJ^+Mv1A+ywD}GW+CII~Tv><#0Fb0!W0YyQ1wsNxX&cT~|ZJ*ehZy$9epZ z*d>Xumb};-IkbkkEnPHSrWpu#H_{rZ>oq^Qvirg-E0(1XF)A`T-`ax$gON`u+`2cd zDjf?mh1g)UX%v&BNL_CRAP{qf5g+RY~Z$rBOzFf~Odk23Hy(gteE3T)5=K(E~hf9ZH>tQDL zT-8^6rHWhvjil3MQ#UCAZv5)nXOtncM@#&wO*fenPWX|!ex`-vqD4(7OkT~vpA6vF z5no(Aq5E#A57kY<<2#k>FYyXAzXy9d%auMs5!P4V=_Go!z2W%W)Lrea9tQl_7oHju zDhuM)TRemN`7p-frMV!nG|2_25h?W}IjuA8PKDg^Fv%})t?9MP$9&J+uE;Ini9|gy z-%NIcK2iqQ-Y~(^1#x66Li9o8XAjFSiFkngJfP+4@d2rYt)OG-9x@{zvVy#;K18T= zRg9qn69PuuV|8<8M_iOw^jd?}Mt6o)y52H4P+rjK6 z*cW!)`Br-<9Zx>s=mKaLq*N*D{!sXooI;E^1W7qmQZDJL{qy~3 z{pY&_DM5lJR8**BDUa8rDp@M~T1bt#e^>CgfmQ9rO7rf^RwsKkfd;%H{*ac=c}m16 zpy-&%n%-ZFITHEyn^D`kD>a#;4?4x0io(!VE9;xxatUW<#7WF%Q_O}A6H}7F4;>*9 zV9pKF{MgAC4p2uDIm>yFmAXYX))lbj3*(%7Q2poJ_x_t$|BJ3rmXI3<)x`RHaQv_D OfX&Xz$+FSh@8&;^o6hV2 literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_54.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_54.png new file mode 100755 index 0000000000000000000000000000000000000000..b4c5267c13cc2f9864cecdc57d4933c2124e7657 GIT binary patch literal 3049 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 VJy|7vzl%=^V5D!Z*Q^6e{1@;dXU+fs literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_56.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_56.png new file mode 100755 index 0000000000000000000000000000000000000000..fda44310fbfda908990b7f2486b60b6026314be2 GIT binary patch literal 2922 zcmeH}={FP%8^(tsrpFj%Df=?A%Tn2iF?N$IV=#)bgt2eQ*om?v8H3_MiR>n1ow4s! zYDUfI8D+~hi458DdOyAY!+W0Vocq4c`F*_3ea?M7w1Jy)0R@2o0D#Nf%-HtC@&6r; zQz!fEY~p(WfOXo&${uDKY<2vv{!QTjD}jUkyJ9DYz8P){w*wp=9ccWK?Yqyy`fYDE z>pJJ6QL7I9pR?Z$ws-eI`1-3`e7`nM%YEb)_WE+|FF5eb`a%%#S?=*!YnWvjf;C3Ch;y^n6M-FU+v z=TK#%t9lQSB5Bg~HQBe8rX3MUqUxzPMTLY<&lCt0Um8*fqr|RM_^^)!kT2)Nbk8qW z^E$R;QBObZMBfxydSU63jtL&|duzL5XaxYAu{Ad~w2z`Op6x<;wRng7`y?|O6^V); zPQ%LOk`g47xL~k>xE(rH54#b4=TlQL@$cxJ$jVRH4dO2T_^WZDXXNMvr0}nG?q5fo zkxzE@o1U4|v7-RDF`S%Tg;k-N*BEcBGU(TJ*+ZQW{*Z{TQQgt=^rXj=CeR*qz}E;7qp$k@VXe!)X)c z(TRen6)p!auEQ--kO-8@AJ5`T?ot~-+_ew5okj+t)Jg+O_XqA7@;mWIUKJhdUYGSm z)PP?Q^b=8n?H`sYOKJj+3B()%s)=3cD=Wrl`!dx(A2zyM-V0OE!0!#VLb8tFpcj=7 z-tji7>{lI~$G8U2CYQ@f_Hfz=CRAve&^@yVn$KFY*lT1XqpGDUYa@w2iambwz8MiM z6*2q_(qEy?rEi93eA+cn)bnha z2o2mM-pSgqB%PBhxy3iXCbNKYgxzFf!7VQISZnuak-#a?)6VfZPy;b(Xy?UfkIt^Z z7PI;ujc~XM^oC_j7REBP9GA#LQT6=yS8M)5?lYXf;oF_Mn`<9sFvP#$mCtn$FzaeOZ zXm^ghCnSCQe8p88JHgG~A&gG^EgcqWR8ctf##QR3)KlG*dVww5Ntjewr8O_UPD8M+ z%W^(&VeX>((FsXTtL6*^L-^O$`z7IYP7;d&;jJJ!%^yyZ)F*2V(NPFCN;Ia zS*&i9Y@H9Ln6j~>iPHC0EH&s@$yzHZjGqt98A|EOylmFchVM(I7=|_#Rzv{dq*fJ8 zrxt#-rB6P7F(nmDG0l>4?jO^N@$X68Li{xG%6)uD)q%D1nLk>p6oyNayR=1|52BIh z!Kx{(Q_OinEj)*wBP^{t>C`>tR1*GrsSWJ;g$(s5KvP_^EsgKI%9Q!K;>j(9Ads`s z;|$%rBOb$!6;uJaqZocC9$@$793hH$U)NS=f#i6++^il_yXnH=(qb?MbD=Xb6}hGckN z+VAjlzoVgmKW4H2{_3G-C;Za7&=Ojp{7YRv>}WfynD4Cr_1O4^Kdnq31>bz8(E1#2 zh?`!JLqB>pt?fZz_yaD_Sxd-<`Ei1)Y!RZ$_SCr7jWPTjBWWTZ7x^<+E(w?NHr=hC zO6arsesk=*NDM((zW1FOTjNJzt@Z1Zxu)9|2Jq7^)s-XC3y&Lb$g(KnhCi6)AjMlG zzLiR6mlaA9{QEhE*k8{SGJP}6YD1q8A||{+sn8q`jCKfVW7NkBuD}69*F6?_7sb+z z3{4v~E74u_D#?&{j{GgdozV1d`Y^Vz*QB>w$sVsNS}jhM4cHH+5f3;N(|d>fD6o=b zzm!b*_VT6vPD;P0(ou3u%S)ur}E3k0os<67Y!o7iFppITl#(D`2Nqm(dD!LZkbm6WpK532unIrBN{9pz(>4B`Fk%qA221@ zD2HHK<8L-mB&r3b1=;4~l13VyZezl}Ig76x)ja~aC3Ix%NTQX>u&{+5X}8BQGDr^O z-W3}{Q&vowHyn#mss}LoWqqcKYHKXPkvQ8Ju5p^V7T>}cATDy*Z-a! b?%Tc?EWc~8jt*TtsTKfp7~Htt$SvtVg+Kwk literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_57.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_57.png new file mode 100755 index 0000000000000000000000000000000000000000..dbbb2e25730a4b4658270a1dbd641eb91aebe752 GIT binary patch literal 3140 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 bkj9?KC4L}O(tr8Sy96*bvNU|D?;Q6Zy-RH_ literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_59.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_59.png new file mode 100755 index 0000000000000000000000000000000000000000..97e999225938795ff71cc58ce9a3e17376d28d06 GIT binary patch literal 3158 zcmeH}_ct4i9>!zUC^~E^yu4@NlbH1PNInR&Jd4713Zdn=gaEWpO0016S69dHA&pEqn z4wf@6iT~UH0GKCkSs)FK11(Pf(LV|NeNa5X=wD1%k7c}14(6D@ zy+8a;;N6*rr`%Cgi^)cEPneU`d#gpPSj6EEpa|mZ92*m5i?j9S;%G|ox_y_Xu_8< zXTbD|^oZGv&wxKlY4T!J^WFd8tiJS-@dyNBdsC zzvm1TMBJ4Hc$Xx}=KmL*E_tv?U`75XuEfwM<6QvaaZqC!+&cz+*XB7<924Ttapq`j zCVW1j;>>4@#WCwY{^LadW`-XvG8j9LLVI_6L^#&d>4#z&Qoz_kKO?(e+S3s7!}1YL zE%@`2y#v**sR?9L<0f2Yq`szlFu`G)UhKX-71C{lJn|q&rcf(^-Ynp~%H|A5)IN$p zk197S%XHA$;wLc&@9a>Z4$Y3{NW5z8VfxfBIibc2=@xVZ1_S}uO8Ya_`nc~B7LvJz zymW*9iW@H1XD1zH;hfRcemYNMRnU; z8^aXk#?41V`sL#nFmFW?3(w6R*gGx%imVk&*m9Uj397u}mPD}ZwP5Y{Xy8pW^dAsu zEpO!vyA!}NebK^p`m^#Ry;t5%T;V|yT5T&#_YO07K8c}3o>2b87 z`LcLvI-)<`ZkK&yx+6zrq5tyV%(pTmR^gC$$_m3v-2tfpU z#Ug{R&>C-0bK-eE^=~eGRrmE?exdO!zVV=AdF`0QF|`OrLpfZUO75+fd)8|hQL{0# z!DSae&gCdDQjq$*!iCkuiIhtZgCDKTB?U9zb)G!V7qlKW%W~G$f4d6W|4VwB)PZJm zn5vF!*cD9`@aqNpvS1xaZH}?Yx!%Q3AkcHC_v*54ep3n;&0AHQ7P+r?5#AFPoD~$( z)8z9JOu5Hh|A-5#Cp!aKr1i9tYjC`B%?05CX=yfBm}pd#q^(S(JBZ99r4cmCC;!y8 zH{Mz-Lmy`o4y@iuM|2h!LCM5gxFiQ;ez{xK>e>yK3WhlAw#st;V_Tiie2{k-4mq;e z$Q|1;6Xj*p1rP`$K)d)&+X`KD{v7+&#rK>N2L_iBZ6A`(`@48#21Uo)j&67BWqyz} zoBS;c#SmwYGNFp@tCuudnLs<<5*SHNirw5*pBtsA5N?v-ErdDBQQK?9@A#pSVrGXN zv|VW-M=3kTWy7s+{4hEdU0%s)_c6=RvTrMaadXR=}u1%VTVJh)auKO*_ z3Sqv`C}By=Uf6SJOel6HHbcn+-LG}F6sC;kbW#IhvZGSePqcWxMSmLgGJBuPs1LuQ zdiO){BWRZcembO*TS%ly#(jY@ocIat{f+&yJ+$Q{I1Yo}$O8wIRJtxR42K@#@}t>D z{00Yppo_Z;2z1fwIa&;%#HOc%9r%!yR4Cdti~V|zMARzYdIJVn(|VogMKxHV;D)M4 z3l@@HSMr}8KFia*6|Tuv2$O}4 zXV~1{tOY{M1*>r98-!$2Hcd-4q=}j4-mFQ;r02hp-(Bc?C1#-C`c~#sp6<#wv|sBXu)cbqm-ph3hBL>q!jWJU~gV%fhh(5#)e?= zSjAS0_ge+8YQ$(iih>oC?y)QbfZy6(a)^chh;&>BnR3$)9F5!1O+JtNwW_2ZY_M5) zDIYtE?jJBWaL=b+*QVY$;FsgY9jaJ{V{DGO-{_kxAS8)Mmvo(8$9rpPj zoBA;RGkQK94Qr8|;p}TGT-1L2c_0)WRSa`I8jYJJEYkQ$|GHm?3J;lcmY8 z;TIp&uxShhk(}9em?kc-)G6|l5i&?1U)7;5Az<;B5t<<2y8Z%CDPMh#E`w(Cs!&rs zr`vAwBfeOc1BjVslvB7=50pqRPKpbc@Y={VxOllb=v7%pp};_MY-F}#YXX1O zpc>XJ6#J{qua`GXm~tZj*?`YdW%z%%r+CVe71!Y72>10on^6E$Ln{L^+!gn4>ac4U literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_6.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_6.png new file mode 100755 index 0000000000000000000000000000000000000000..de674eb2f0fad41941cdf5ee2a5a22f01b7a610b GIT binary patch literal 2212 zcmeH{`B&130>w#O5QoZ)CduuY`!Z@H=90Up6eb~?G%ApjC2Be@IW8?8wGvz0NO7!( zmKuC96wOg{OAVFMa*`1$r%|&U*Kr{YrE$*u^!|hQ!+g%U_x^s*J@*>+cmNEFfPz3E z7&_1ox1FrN1p#ln)^C?zfIuoYuoyflARhDOU;b_2|Dyq8rnb}eK&45z;~^mES39(} z6rcAfV>kNLmab$6z7gq+(FerMPba{pq3eEK`cLM~Z^?EgEc%l+Q&#IV-t&bQ$$YRsE&9KSWyo`{lF`xh5ZlmI2E<<9{ug`Lwo>uReUd;Faf*hD=VPcG9)I zEezcbXD*dZ`wnM;ed$)q2ab6~qTV|^E}S*K@b!(ulf5@jx3`5GWlh~HCA{v&{HOBl z(HC*n^}%LUFi5mb(X@BonZXr-l|8)4!?5$dFLNlU@tcR=zD;+(YtVD)2ip^eh$r{o zNuGP)^vBhGBuZ>22&6iP_VdQ4%I05xBH;t}YQztYsIrWMTrHrzxqIRFbh}kpW9f_j z*V}P(2zdIUsT{$e2RYW8u+LNuY#!FmZ~cDZ+2ac7c^A=!^6AR>S|TfRWxUNTHTC2F z@UyLOUw)W=+#0Mg<+oNdZt$c%DpI7n`}Jy!R8zmiEz&t*=p!W|gK=Aci`hey_4=b293*L;-erP9@ZL z#xk_|QvpcelwpKmnb>oACjVGCH*8ji66A>lu;r#{vbMWA;CHVl7{$Uq2hUoXl#eCU zTpR)udh|7Rsx@*0k-#;%UF#nFhD}mTP?g7y2Q(BjoLKGBbfZSHVNFZkjZdci)SL2S zZMJDDY1C%C1zAoB<@+G97^HK>$N?YQb|9<7NZyO72v8p7!wB7MqsnD#j(o&Uqlh3F zG`%DA4`D{}s1mLI`gCUPdEM21v*FLVoiQ7$gPc#*AlS{RP;*qB`{5c~`a#ZcRkI_5`2yy*ey%ax z8sFi~Mxy6Zcwv=^v$}#-EIT=Ti6x!pD11{c^>rQ-PD6Ip;goQXlT#m_EBZ8|%bjG+ z->6&Lp@qhB0KL^A zh(B3#X#9hBA>e9`!$$2GsnJBbH=GJhy1ft$VyT-+-V5?EGI0A0z_F3+ zwIPtE%oG-}favd^MH8&D0EQOjv0MB(` z9s*cqNKUCr!fvOCTHI^a0SyQcn<3ew%Ib<}yY5Bh!`Ict^j0hKRB-IRvY|ovMu(j= ziO7L4I%WW{F|bxGj7E`HFi}WtS=<}v&`E^3_zzCiKdiV+d8$r)JDgo6jNd+Y5E^yd Jug-^>^%wglfd2ph literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_60.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_60.png new file mode 100755 index 0000000000000000000000000000000000000000..593bebdfe2da1581cf3932d6bc61053f19208e3c GIT binary patch literal 2719 zcmeH|`8N~{7sqGpW5`nWErqd6BtnsWHFN<$hNpI zkar#{XE(@xVuA%Xt4cB6L#Oe=PlHh}JzZg{)!F5adBs1ZdoDO9zK_*w?YGvp7ic+` zzWVm@2#IzTJXrGEdvgz?f$qu~002jgm8lUtg0`N|aFMj)|G@bW#N#D$g+6=D(lVY619^Y0 zkKLH=ifxZp6=~mNgosRrhKGlD9%-EFvm4^UqwTc^QX)IIU;)gaoT9qw4gX|y)Tb;Z zrwUl^C6slJb&-~waBAMNk0})JNL4}*9KR=!Oko*MLYq@qy6)m-8vw{PPfO@rZlU{0 z#E~d|5$qM9iDHlToa(UD#6Fg&Z`=(yZ6Ui(_zlUaA^%tWU^EJJrm5WJpqh&+O zs(f`OQEA%mpxv%l6dwL;S8fZMbAxO}XrG#bn_RX$R?Ji#M{h;wrZ=pJC072e^a*&; zPP1s!+u6kP*|Fk!QU@&S%#@1eg3IV(RZ4z9_m-oDpCxO|ju*yO=}I-T8z=)t4B4$h zXyvwcOD>%XX6U|~8DMxdWRU2c%h(yTZzs-oXVp|!V*Y*+;>V~%{NnuFGdbaW_tuLp%z=HUas}2(!tnQ-QV3<4NR>W!Du-cC z?v$Oku}nT9V24AuT#xRs+{msg+MVlA^X{)LPM_840{gmnGE+{$S@zJ|phkkzx5u+6 z-mbG7mKDPvOEN7H=>J=!bz#oKtcyTH1e|wi_EfJaMO_r0kVf*+;BiyE3Eof_9v{En zZfoR5a4;Nw(8T83>zN)(yyO1)&#c(B8I2{OvsIe-o@yHHsIp9e`E!`*cCN&q53(eS99~%|C&8VNl>}xR!6}06@qXp|OzGbFgB`r?h z<6Z1VvEIAkM4^40K4sKHn_?1B_g;B)aMmC-NxZYgprGK&L?IC0^hmwr@gZh9tX@!O zMpToOo&FS2oNvskf+xp_@UC8z^fD7>CrP%JCMIVqP4&zoEF{51EB011`KJZRVx)p=u&*#SGFQcMmwxmxVq>QUN8P-GqCg-49qgG;TcqR#3~ zX851%S1!H7zxEw&;ei{<_PC{e4kV}{@rh`dkz8Ub_lM`V%K|JIKJm>uK_NL)j z9HFft&}7t}zrihYv*}e#JRYGMNVn~-b6ZkkVo?XOp1`3_w*39rkpk3t0TVz2wQGT#;n6FE#0fnB%gh8-LOxec7tEPi=19MYwt15xYGRM)a zUCUX+wzHgBQaccmE|1G@bZhUS{;(Q5yX&N1c-GnQagm$q^_E*%X52M9>7QMK)t+o{ zFH8`+#J6iUz^){nJ513}E7Uv#HKJ_E?S@I5R9n3JA~pKjc-ab* zooM^?G65)uGn}rITy8%0A6K+i8bS1K&zG4-WRVr+wfJ7P)$G7_TjZj<%V)lpXo8T3 zDi&9#X4Q;|L)EirUsgY}y95ddHzwM6UJ1H@T2>6RFA*l)2SIJXgAxto9KSCAwa2K! z=8RI6O>#Bzaz{N$en?}NQM^gQH{ZddWuO0)u`Mi(Ft8qT&J%vWTRhbw7ug6NF!c9e z!0vpctLBUOcFecAdxaznjq^h)e}xreKw@C}6S03Z@{dohPaM}DEZLABr7oPP8enB+ KXIf|Mj`=U>l!I3Q literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_61.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_61.png new file mode 100755 index 0000000000000000000000000000000000000000..73a955b984ff45a66eadb49ce741a4396d9778e0 GIT binary patch literal 3018 zcmeH}={FP%8^(w18M00oTheuR{G9k60AL+(uyHZB2)FtBul`No|2%=s*)g``%VykhvU3I;9-KYW&sApmW3>N; z^>Y?CC!68k((g>YdA=>!+(|lS`=yBGMU%}|1t5HkFfq`|*snW>W%JjSy3|z931o^!v7-B zszWsb-Gn_SmoJY5Q!+vld*N`%g2>FfV`im|cFdr5vYnBMKGwuz=I4yYI!Au4ww7NXj?)<31E}a)ZatAV z(9hi&AaizdSv@qPPf?40LLo*jEfiX7AQ6{{jMF8CKIKr;Vi9Z;#!{tK+SpEoTz-_( z=`d5nqGC%GQkh*eXJ4wX*MR@3PEu(Quaqlzq8I#Z4?CuI5EY9q?$=iSNSKc?sOvld zj=AZvtiev!I^X)j+TG_kyh)#wB#R?DZXy z!&3@#WI7%Z=YGxeDa+X?!{;KWk#p6 zyspGvb}`RSP;)Yg?a+11Xg<2$Td%U0Ij&BhbE>iQ-WZM5_9imQ6_AGVyGQe3{_K)<08!@3&z?KVKg+-nC3O^D`6ln z$=Q(Vq-Uxvc-dN5i&as#+VqIfkB;I6H)tsnB7L?83IHXXFar#8=uMRTWAsgAMWD9ER)6p) z4;I^V7yTalM|}o_(97F>HU;k9 zW71UmgqqxdfdnHE?s|H-4=5*PZi5gmN@(}7O=2^jwa6;oPY@*)#ur1~8%|Dy4phdn z8y(`O*qgi55#(9zIKKmVQwQ@NkfUgX;ECbFXCv#m^T$4!&8NX%zYvMHZ351GvIxd@ z+eT?ZW^%6Sm~Tqz^^wZYR^)jXK{I7~r*Dx$rw02o7@#N70zae-G=j>zX>q2huqXT_ zXG9+Imnrbs{LR(*wajr6?uSrI`ni$LXsf{rZ>ByZc?!HPfi^s|jlm7s7mdyY_gnC7 zEoDkU&px()T`PCn^x}L|L^jjW)-}AAAsXmqlX`bbJ(HUvwSPS&c2=%_z(V#5TDL_< z(y97WR}oBm#0u%e4ZM^|vUDv}jWbJ>NNO0u2lqAiu&y$iudJ3KAZ~5&bE>_p-uF&s z{EkP@?glvF2J_}F;oFMMo}L=krAJYc7L|U+Xr3)HZ#Vqdc&XR0@H)%6;g;Talq#i3 zOpaYv!RouimQa-I10R;{XJq?7I;vOyQtFL)>e$y&-|)D#dDnZXDX@Qp_DNhJcn8>n zTEY985P-qTXc*|GjC}(i@@X{&NsZwTqU!m$_l7gwlyxRJi>-q|;(F zC9;^xj5+un%{~Bq6M|tk8dRjD5~qhB@$ouCxQz6IGuS;d2eWkzGo{BEDDiZz?7IOm z!5RLxp1)v%7k0kga2e#AF$_YpzI2^Nvfv9BN{f;#k|LVm4%z1)`!)Bkw%MbT*ZPxd zU8n49K|li1gIcyEXkNenz{3}|?zAsDn^qakZlW8MNZrj|1+^n0I#w@byJo`37fZ*D zqAFItqwDaCk-$87)t3c`Iw z;{2^_W^OS32KTDW2H@5vk6MICcz}HiHpo6y1uSqMyN-PHYogfN4U2unTPi?bEurb) nBGH=}eUWee_g-a9b=U5NoJ1>7u-cg8CIhfCw=;Wb;*<0rrUxme literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_62.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_62.png new file mode 100755 index 0000000000000000000000000000000000000000..00f3dba4a4d3faf0c8a43c0be6e51d46a5c701c1 GIT binary patch literal 3083 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 literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_63.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_63.png new file mode 100755 index 0000000000000000000000000000000000000000..6f512f3285f80222701a19ee26acdf89f4969da2 GIT binary patch literal 2829 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 literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_65.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_65.png new file mode 100755 index 0000000000000000000000000000000000000000..a2959b451aba09430740c64c660053ea164e78d8 GIT binary patch literal 3155 zcmeH}`8N~_8^;Y|7<6R~MJ8L8m}thxK4Y$ZA0zu@&yuo_ePk=HWrps^-Y}SCh_WYJ z8G|epqR=2&D%qpgJ?A~|AMu|1ob!CX=X`$rp67=r-O2*R%Pq#u!otF9{3pWZB=i4S zAlnH+9}`DeSXdXV%m=(j^{ENod=ne#`7nSkS8>>u~` zx8}I?K>56NGT_sEx)KLhcc01M=GQXFoBcd`Mszvg-jD1LRh#+^=YI+rTJUhMeJ|YB z;8geMNXNj$zV;3TRi9E=Hy?lc$%vZ z$KPu2-vl=O@mD!b^4di=m6w8lx_dbEIanbU7NDXrLf28zsoY(e@im zp%z$coN3#HQb@+t>lrMqX+C8c!&Kx>$GBM{s z9~k20JUy#@m$&UX=v^}EQ|1jhexv<*0LCEieBL(m``x71TkgIP>mS}g9|NVP=kskM z8w~t} z;!;&mVrX^=AFyNfy5fVFWnM7{SvydEvIgf8ehyJ2qgDU9jLmBm_YB+gGq)a2DCD^h zt_iqq_Ue&a#rqDfF1z$Q$98tHQQiP+k25sUvEnoHdgQrWI$t_mH3Oq6{%H`PcKbI# zfk5^gxs+M3QIHxGU$93_$V)g{qO(00;Rk zvsqTVysP(*?e%D)tT)86y2zEJFfBU9erOC~`#kL5Zu>dtYfq36+7^yxMc{AQE)w}) z21Y6-;b&F`u018WaiXhd>pk+icyqS6-gr6Q4*i7+qasHS(p295 zN^2DX^=`qJ)zi?o5>Ls5U}j_%VxTk)PS;!! znChRT{SLJRde^_b05RYPIXW!Y1l%prM_oB7pE4`f_&UWuw4USrAR&4Yz|x~uiYzS<(I zz3DwQ-I}jP_hZP2JE(&|zZfMI`9+Au(`Ca@ zY1$k(xSO`=&YjgXznOs?&~bb1_X$Bk{*oU+-QH=<2)9(4$qVBr96GgW65*ekNwyQa zX4o*3J}hrlzmnE_(t&XU-!l&9XG;*?eCxnR7$t4({4ttOO5DXvK{iQH0=-foh^;-k z!RF^=^|8AAq6MrYpW0I!`E5h@L2FSR^>FzzMcpy9foOqWc)MRXy%>re6g8z@@7ncq z=uhxxE__5jFipM$0fA;V`jya)0---WUBs?;6!ukBo?@ps=F|KKb;1SENXvOQ z{sr3A8)Z8E4%Aw17}NM&Tz(gCTu*lPt5j^M!E00mK=a@$*m+GdVC!sJ+gE&FuFdpI zXJY8L0_VpstQomjN>#REZf28RMj04pT1)8lkFb6z)6b9j=t_}7Kc;tFm>y*lG+t*q zkBC-Z6lQVslIA@MT#bwY^dLf3RT+YPtXb9zb?~k<$-i`KP9tFN;4@JQ8TN(G*QPJN zv~n3P-cB9zW6p9_4;EE^DE8OU>_>`TbieyF>jr@!OUrj%UJ)Gw4Yxwy;U=RU6$ioNYzI$rVx@1-UPg@)=>B>id`YmG1%q+u+o3L&e1 zzIZ5gv%WzM)7q-5ZHs5i%iz`DBJiczN{Py^vb*M2M^nU@(} i>TeJN=Klkc8E?*Iq9s-wXLa&7u^1yQ5OoIbN&f+h+HQaV literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_66.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_66.png new file mode 100755 index 0000000000000000000000000000000000000000..e4d37df07f204a09fe5b56dd0fa2aca212c06145 GIT binary patch literal 2904 zcmeHJ`8N~{8y(9~G+JbYke!SaMa@W-(bzM#nGj|uG=ym^$vVk2h-@=s7wQ!wGxqFS zjHQt5CPJ1hBg=%|%Io{i_g8%9ea?CAbIv{Yr+e->_aWO@BS1ouLI3~&WM&Gt-M^Io z>;b-g6rPId2LO2cZ7l6g5CN8Z|IWV-{J%Kx*FtOje#F-Zw$^rlU%&s>{iFK&A4=C?);6{_FYv2Aq3krluPe=D3BH6?kf-Dg z<8WXrui&`v&Xgqr0{0aM1ZomIAjrEwfSlKRMP1$MlBcz=|xu<_I6)SJ~TA6+@ zaZf%V^X9wLouh`XjSLn2hL0FX)RNCBPLI?`JuxS?FVU=^^x2t=(WHRl{B}3JYqj7= zhpR7|Y|dHUbDXigF1jrLfIbcl8Vhc@T%{cvNSL6B=PGxo-yMp8e|s*_oieED*BU;% z80U2y^(xB+`6J9(x@g`a9@qKhelJhMdM*GUXle#Gv=1F$&0cUjjyS=hzA>iYPrfsT z4)7lZW+=P!A^A-VSDJAvH;M|0&8$0#9iz^^%&VeSYt7q}X}jWhd05r`_ms@s%ba(A zT&KPABjy_yRIW@DB{sE({jMUd+a}IW3+*icb({2%A$XnqI?_Qp8XWN|Iz(!)gv(=4HMzJfQ=+d8iH5rd8YhzCy9M4h zI4=4_2A7!8=CTq8#XN+Ii9%-y8u1%N#8R1-P6O5ZnrzFp9FFr2XQ`0v@wEVQe?n^4 zj*FY{d<#NY*Pzhhl3SU~X-p)Fx*o?p^aJH8nhPE59o7BLs3SBrq=*bXlO*h(A48We z53J|azc2GT5>v|pxdQH+bqF`U#+mw>%V7 z-z9iy6}P5OUQgRm>16z)jbszjTq`K` ztzlj0#ZKninWO_?H=EvF(d(eqOb=fsvA|3yXads!^!@IY@Q!p)xoUCNZK|ds(3e@S z#&|R!O4BZ3a5@n^zyMO;lfv2vVbpKI7vn9bqo%Ol4qqt(TYTwa3#Z50C+|IhmBhWS zy)88tLPs+!?(#WIf_FS#Z29{UZzM@EIL4*TrzutZZzenJcH5w5UCPG<_?D(RJRZK5 z#T73p9*0aROUdtc7}%D6da^XDcVWURJ*J08XGF9&gciih9o}$guT~#BWt>w-{|v_? z-eyk+u6bJAbja|HBTnE@qbIsd z%0D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 literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_68.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_68.png new file mode 100755 index 0000000000000000000000000000000000000000..cbceda1b6451c4e1aa6d0238ebd86962acdadcd8 GIT binary patch literal 3146 zcmeH}={FP%8^%XwWY=WPnqDp9GGr~rPAbfZNo5kLAvjO>m#{y)Rc zdhA?`gfRf%#3bC(!Pqp!^5|dvo525F0u#Aw$;Vy)8E$875BU0kQKxjrcu5GnxID4I&^ z@w}kkU20|&dyRIZP{PE*HDfN~*^qDzoE-pQS2Z)zceqPmA#588IE%NZCS!!X6m3hy z6!i_vOTb{DfCJF@lmmP@8`3>^RLIjxTDrvS77aKXbw)W+gG>C!DHz zpHqo2(WCW*c7gXr@BB4hPg`ZT-`ooe8PwaWfU`oq1wVSmD;%9~cg0uu%czZ~D4&H@ z4stA%)_{Qv3TWk@ji-P(jV@CYg+Zw01s!$LtzkZ~u+rgP{c^tu+~!;6RQIi(B0eg{ zmjh~b(cNPQPMt!wN$Oh%(R{qI2TxVj`0vsRp^SBB)u+Xx;ek2ec^vX+r1De8jSTU5Oqp*q}|b_~r7~QYlOuQkS2i=MI&lZQ-(+08A$? zczV*mhg%qhdzDPzc|{bxY1|JYzRyKrGU#v8H`%H;cPl3r}MBeXCd3)%I$19zKXZo zK637jnOmdNi)kwK$fm0=CPoBj&ZSh%j+l@KHQdh&bvH{1{RY2$T*24v%*=v%743q+ zDa2PzWuc&-E2p>kiEytoay=t3fs?v9os&SlUXoxfQ`o#-1eT6v8_j%eXFG3|&vs!z zqEK9k22-pHec(>UpuKe`gk5`nhiVmk*Uybg#7ety$RG$}zV#1b#?54n<%wF9uv-Nm z$Xl?(=9fk$m0}*f-}qF=FfAdY5hypnTN>+ZLCPBFgg2;>hGiGSlDw{Uq*IZYWy2>K zRg^ttRHJ@9Kp*keOJ^~0qM+ZcI@>3+W(B5#JFCpFie`$AWb1u`Ey8~3IE+ z4;oV8il%ID%+i$bEn1T9Vo6dQG2a_5A~B}y8dcGT+rt3|eW&gG?sFqzP6@ps`h2ao zJb($7^DD7ZRkmowvo5Z6P3*yH(-v%`=&hh)`!jhW?=z-~Q3LnuLF!HDEt$mU>+erl zChiX3@`Pl$F2xxE2!=Pb$=$luGCQ2%ZmLLzmbI+FRJ-p*X@b?pZ$;W;KNxQIpz7BZ z?(*ru;+tlZsHm5bWupoR;cA(8?MiqlYH^RoV@GjA^jVH*5fs%9RgtHMvw3_V%3&Z35MP!x9Ay4__HTt_Y1@{T!sUU9e8vAi+!YrC#Cg>w7*O6xH`$tBi;x+I${=)O+i+%|ja zHN2L}wmO~GMMzzUR?;PTibSw|@u_dE`B9sF5V_3A`!WulwDIMkw@B{m+%1m5c7ofCk1mwo$&;t@40Yj5AQ=cA z?v=8aCF#5%3{*I~EmqAQ>5}s!9`Vvl_db;I`Xy~Ki2;9bOFG;R_|QuFQc{9lsqMX-=*AO&7CuS6Ed(=9 z`1I2K+C!L=1QGs`*~=hq7ECOV)d3j)W0lY!#qgj^xT$8NwB<+BWJ~J1LmVjQ%tLAu z)0HgJiZ8PnW@_4b4}-lIm2+Q#?7WTtEOs%*R81Jr8wSb%agz{7eN!1e2<{rux)niOx4r25PpYX96DB3-dSP8uJBds6FG z7l=X1msdrsg7<``xm=)*bFv_(wO*pw%tfdk4-r@&p)d;PPoR0y> zGoQ9lc%PNc$wSD;JJ*7ruac!PhuKV|%I-<*f{tANBmMY~x9JdRf=D%~XIpk2+&D2? zicG$UEZ>}um5G48;y`>gLC`&>IHJ0LY0EpMvEU;%%90K!)ngeFZ?m%n#q{d3NJV}7 z@d7Id{~UgD7;#DJp?s#Si+zJ>K2zjQGn`oO8|XaRR27!$J3^&Co)I6oaen7%uAu@k g?OewHENt*7AxD^DT6W6g_-_K38Cx4w8Xyz@0Ry^eg#Z8m literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_69.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_69.png new file mode 100755 index 0000000000000000000000000000000000000000..72cb98cefd1d1c8de9162a6b21ca28d52d9ffddc GIT binary patch literal 3173 zcmeH}`8N~_8^_01Gj_^o#*i%8MGV6vjU_uXh(S!&Vu%otHTx**psaVSrQwe464_=@ zwjr{25k^W4rc_8?_nh~SFxP_Qm^D$#_WlXNaS03vV>j;v5>xhii-zEqea~JCWQ@P;{~Fv0-mMb&!Q2 z?!FpLX!X~Ruf42n8#r~(MXcJg+jS#IHP7*Maak>99j{$+>8kh0X2SWoF1^r&2&E}p zPruPe&mpsbY@Mjpo5_FBXRpshelIn-FQExv004kyW=1Icd-Gq4b`4Kkz@mjwMWtDP2RM!E<;@5uDKKC^=6Jqhgir5d&*ixPk7I3o?DSj~ zJ9hpW{GuYn6L%S@EX)(~WzdYYDtf6>*j{A}0vQ3oyiZIES0;k=~@> z8UTjXnS-XEaKWJY2?J6%ISjg`sa*-k$g_6-7)@oj>mE_DCcJ+z@q6BE&}6DbWHaOb zR`DkmQUgM~Mdpx=JcaZa@#Mh>i8 zpK6q$W}zqKVSq`V5yoV8ME>3KOlp=|rhnKEyn{tSYhHw_u zvoPWVfj>)|_C7a<U=9mO^Wz|w~h7CY=qks zR?#;^>G@rfRCF`(yH@>`F4yE313^V)TIDPxd1d)zFhWdp<1yUU;m|fa{rz-%TTetb zoTmeV+fFz!WAW4$v*z8Y`(a)Sq%!T?ktz~93aiNam6c3R_N9}Q~N_vvyT_AsG2Y9JN0+$`kT}-y@$0}-c4Zj;r*l8x!Y^67@)io<5qD8e6Jgp)-0_DOw4;k zPP+O={n;JJ1wd z@;d|5=Dzj>58~fVWMPZ4xGgB?qZOIyR?^)v?vCe2zwh;8and4T)76A+3ACq?u4;Hz zkf}WQ`-FRhoZ`?VMGIuvm*_73w5&1Yp&A)cS(teuGE0$GMtPx@#Wqdh3`<6!LEd6h7f2flDAbCG;JSQmZ*E=rSWV*rY+Ld=TkAZQB*YF6+8nYL%%+FgEWzMs2r?NxXT8^+Se<+ zBK8?lNIxO=``rB(A78#$p|a9b?l2!R3R!HX)g_qN)N-CJVQFwx=|m=O`eN)M2NCcV zAiPLGix+F+m%mN)w?iitTXdmnyVVQT_Hi3O=)2XSL3_SQvFUW3F0!s55`9qn< zsc%o1vl&MwhT~zqTJNWPp(o#-)^)UMjBm`->)cJ)=FL3Vukq~=3r7c?%6;D*mFO8D zZ4e+h({R4bzEFXR=44Ye_%@A0lUCVR-Gj%av|4g;cQNnJLh)3Zbp_u}l8t{KvU=(w%)FV}|F+Saz>|c85J` zhHm%ZS)1DOF@rIwP1s?1mW@6b%- z*oTpNr8#!aqLfbh7b&V9KXaCz<}LQlZ2eGf2(R{WSUKeo|EKas)NnL0_DHbksmfSu z#I2s&{K^Ll8uDCgcSO1a4Z?&P$lBpmM4=B2-=iowAng2IH~45Y(A&_X(j3xOF=zV`4$w_Qc-aP+GbFc!G3T4IO`gRDG#{89nTjIE98 I4Q@R64@lft!TeO1LCMAXkDT;H?e%YU}ANoAc`+mPaf1dYwGjLcBT`i~<007YS z@)Rg zSu@zQ+$v0uQBU&}gF1E*RR8+(<(DSYAXuATbKEC~)%fq+t2I;>P{7!euLnkE7q99= zPaV8ve^IUPG1~3tcK_ibCy$gZ*UYEsy_7vNCilZP`*1flhxK5y`(57LrzU3AN|uK5 z<%YlPHWvIqE@vI{o2vJz-0AxMbk+GMXLFJ=APtUh?IIgr@P7;4e&yXm{O#XMM|W6w zOMes{-OI5;p3&6JwVt$z>YQg=f_cu{o?7mpq3bhSU%pl50|08vUMOV1#gR{=@&rS)k;dGy*&H9w9ak6B!mqn(?gOTwa+o+b zSBBq1IUJ*gqD!}LZykR$VsaeW3KxU>mq~f3xA~Vy<70(IcFsLNU3MD3B+q3RjukfE zWYlv0OK-kH5)XsUV6K0joGs!-q7{2-Fqd2E77jJFAYKQTwpsgV*B{+^Pl_K@7`tTp zTeSxqpc>zqaw$V%Muce@1W}4BzBaAHZ{|R?rF{RT{eS6JKxZRw>-<0tSe!hrb1Mj= z6s%0{jg~Q9af-vgn76Y0FekAx3d0!RO3Vt5zE`+h@h$cCXN!Qob9ZWkFQ`_AX5p=8 zv)Z{!_9RaFl1IqE9-(^X+RCXk0__!kWv(nCCfDPs<5pq^=wr#fOk2q9S7ju4QA0vr z6D{^)jrV%)uUH#p$%uGx4>cB&A}L}9avY83$*eOkTS2*HfJmB;_Do&F%u+gQb}!?S zMrEf`8pPE6EffxnT3C2i&|@ZQVRbr&#aC>?=|b3mr-pcmY=1q;PHEVVsZSbnHnj7D6YB!RYq#w3 z^!#o|al0rc11iGLe~_5$;uaQBf}D2U$CKZ>4i&uK7JYv!-bs$5HqY?GYrKp@g11o< zsLDGlI|z+D_903_&^1Wp`jrMyUo$;@)UnW?P^UJ2ZHu6q>DMwPy<(|@6O zcf?{}6H8~od6TZ#`nVu}MoipHFH8AWaEoJL%MRSsSk`jbT+wSCq-te6J*KJmvG!$d^?xQL>dRQ3mNJ3?&b$ugYrm<762U{Rq6qw3F9VtY=Bf zvBWGZ?vh(oW5Y~6)wh0&Mm}LNOghw@$))Hyh*cs6b=h)`=nsAb_h9U9ZhUFasEfA9 zURoKcd?EFoghl`XeI(lq8_(V)jxT!Bi$Wms^0#c&5dmbbscPOKs%E*wPTjemM5Z>b3H%aNjbwZH@(MG~phG^`5ErZo+)5b@8__{eNqwX=7> zH~V0cbi%+>@~9nZ^(9;3?V+Fp>V%%rQ%caES)7_SL`Kpo!W?d=UfDMdum2HIdt zT!VeVo(UEL-E=003kR{YIteZYZ0B6=B#6CbB2>Xlrs2C+3X*NzyB*w`%H12^_7|qn2B~`Vt9iXJHvnAHCiqpg5 de_4%{LC}pvNK0lJf8*B!ywF%wwOiPgzX1*0n(6=m literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/ic_8.png b/libraries/map-amap/src/main/res/drawable-xhdpi/ic_8.png new file mode 100755 index 0000000000000000000000000000000000000000..aadc8dacefc9bf105f69eb54917bffa3745924f3 GIT binary patch literal 2348 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 literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/tc_10.png b/libraries/map-amap/src/main/res/drawable-xhdpi/tc_10.png new file mode 100755 index 0000000000000000000000000000000000000000..957cf4e0f9561347646321a77d42013e693117ef GIT binary patch literal 2276 zcmeH|=~ohn0>vqF!?4s`#xiot7n)9~Svun63g!YL3R-SsImO>0pNf96cmtb5LM=;sDqj zX#9)pWore{mH!Bfe%-rfwY`1;{>>~Dddz4;`#kp?`=glD+3??qM@~AcN?z*KSPsya zlX*Tj@mdK#6I|-^n*nO<$%B>bt$YU&2t_@4TH+Bu=ZlVEQpzW3Qv3X`_K~`#-mkiq zE9>6*2JU*UMzxNlU93NRd{{;8v>oQmZEP&vWUB0sj#K2p#b}qJxHs05`8QIiBOG*4?XF>z#PkMj1b@wXAFdFU9EV{~y~rKGS&Q z+b2`_5?|)!$aZJe6rpW~>*GEDgkXE}3Juz8c_rsLauC=D8LKb{#`C+WC`zlAsxVQb zUXRw($bRe7Q=NU45^`93!5GMD*dkbX$6CMnFgiNV@CvGVFx3T4+C^aaeo5OtxiX0n zhDf>nXJ=o4-Cp?JoBqdFrNgY9%oZUNY6QLb6V@Un04TwEk2;Kj;EvRLX$$JYP23} zo_T{{*pmeoP_K-3c+X=26c({B;`E8w{0@J$3CIzHZIerQkwTuGDE%l-d)QFy_F@gL zBTx=W4k-aexi&7=NL+mKBJHm4OOVGkF5AC&l1~ms^wHRtWA-eax?M6M&K;-vK_%kG zU++(rpK!`gy)l6%xAj5eXd#XPdFie+`u&fV0qv2Q%-1mS0O^o|&o}(|<77(+^15&W zYU0{Vq}%7QikkEyF%o#R=Jn}91_YstGDyTm;6i(9LL57A{utHqX-*18(^)tj2r zqr4g;|AItlqbOsmLXi8%tJPyUN5DrNrC(W}40vkF2{w#wiiL-(e%VyAr#eluVO(ve zjN3LL31s6os+pQm@j~L0OLw@}C9iBs%4=q=ViWxqHzhlvH;OCh*!;nVmI}!gA4NIM zn2TMbltWDoxs@@;_(whS5~xdVMhlUT8KC~1wP>S-vuYg8Dn@TbBS6dCt6VyG*#-Nt z*{<#cIK|G}ghrP0Xig8U;znfQaJNkO=f=;i`G<2$vN{dbu6AqdHFqjT6>E*ITED#j z(ki{Td$&owJ{3HbxlfuRzMH~Ayz>pZHltV#Xpp)o_jvu>S_|*9>^Zq*TUN)!J_%aQ z7g~jB3mY5J*Q;9A)k=HqEwI~l#J~@v>6TgfejGC_KMkv~ivp?&{ZYMd2_5D zexC>%HH4OwsuOinuDom2V`lF1aah~;#K{(!d%kbAz~>trVvZ;aGvvkuw$4T9dn{%S zUML8ZQ8Qa;lH83!nbmsz1qr0O_;X_rF zn8(D|q4E#N@SFiR)7AKsYgKzC-BMv< z!8lhMO6JOO4sw($#hD8gJyWmy>HdWK<-VWKd++!6d7sa_>+T8%0hNFN0089VXz%$w zN&iSn?7ROkmevCRh-SGvdpp2mocI6d{|5f+1~dfVwC~gWi1l>!0!SYa6A|5WQE^s3 zW3Ol<2UNHqj?k41{I&^#Z?Bnc-8gF}E3h^+G4AR+o*8SPbL8-kJ|ET2J9S$!q>jog zosOuTn|!P4TgZ>1Kxf{0RhrWtfR}|t&p62VU9FLm5wd5%C_Okyyn4a zx6-1kk(W|KcM__H58ZoZq3k+zO#6f${ubxlR6$6y#?6YV$9_SL$%`df4q?oJjP;Zi zR zOU(cPaU&;t8}EeSuOmW#S-67a3b8H(y7Y?})Z&0>?}1|qHtrtM()Rt=?!$77<8rja z7wh9)mg{w%jN+H;KW@iQs;X3B+Us(;cp*0_C4@Y)1?4V%u!i986utNtG3T$pBEv$h z1Tm0eoxYBT_zA9aqH$kuYyayK`h(39{Xl0gzUxKDd~)7lZMT(sGo@NJui(V4w|T?) zPcQcku{(5+w|Isr?b)hgN-Quh#p@DBi{9LK%h4+lwt-K!Hpo6U(JrSypA5KneGO$) zOTHj5H4Km3#mVM5WWB6gzL_B^I6~6cOZ7g?NS(kkqmfhn z3GWI|EsP~~I4VRifk<771*EYfymtDe^ulcf94R3M@gMB0vdhl$0Fn$N<@D4Vqk`76 z3fRJ4w7=k3ZLn3=nJHu)(|R1Ys2C6t<~(U+9CaXe%Bi3-jE1htz8P04%VHDa z<1t!~D!#4OFS?A7g3k}_iDt^FESB$VQ@x_o)mQ-G7{(?0!NBAOS`;98zM~PbO!t346sWx)4BCJ;hk`~O z#e;MVRXtkTj}e#=>Or^{bCBoV>p_&_pS>QM_bb1jc)G>N+P1s+%{2LIbVkSg>2zzz zQU(si=+Et@1Om}t5*TY0&wfte>={E4y1R&JUMs9{0p1W!iA}>YC~BT1-wP0NBTXq&jJ?QQ35ZSILq|yLbh)&(XS7`Amh3ln!;_;&UaAMn^(F z8=T>_*<4j*_OZ|=1CEi%q(=+!igaZv(xvs_+}!dBEb7(k{@TZ&S%wm)ETj6lnStDX zKI`hU$}VuP4yFtiO4Y7k^Fdv-4W(+%Ol3|<_Ml5z4?UD04v4l}Z$(pQ8FN#=6|fbl zxB~AsvZ5G6g5D8fRP~@oCsMB{SpAC~abHB@ X{weS-aCqqZI{=&R$H#h5why*n5ZS>Smun1W^+@FAt{WJ zFyZ4^p_xt<2_wKpE?SurR1pokmkb}Lo+kumQlaKpA1*hZR z0RTXdE6m--E)@3b5B?@EEr24uW9054K(I;+a@67eJF<3Qb^6~!ePl2;Q z5w{Uf{@0m2%NPF9dz z>o-t1LR!ms_SxYOD^ToK+i5dC#|+vJrwU(mt>xWI%Drm0KFZvdGhC0C6#b+?C@XP^ zcrM3{1B&m~H(!A z?)$}k=;v(>?h&}ULEJ!%xLV2sNt_arFG3O{iwv2AsOhqy<>F?gJz8(1%cXjA?0Ru1 z3xnRbEwwCNUvT3c=Rl{&OSBzW*$$4H@p==*>6tHoKd(DEUrMGh?J@Zox_yW@ojO;; zbZ`_mSy;N_2*l$gh!l_t%@I4Crw2i(>m>z@ro-;Ymvkjvf^LYK>Oc_j$&1=J?L|@9 zjw1`wB|}e$@2qsQBkpRhd5pXeno%G#tJKURk=tU%5X9{-@>mL5wKd`Mi-3a?YBTku`s#8VK&CMn2gnaW&3 z%EB?fQ11*YoNj9un2|~p$U)~?lBr+=2twm@;Y}>8MggCl zLZ*^ORQzHp%BXGUQLrx=w%en$4|T9RnB(&1ezGV-}36qMY%*1&;$&-6Hn*wqpRSs zsT6uU6x)zv&{`-=K*lrry7A*c+z#lGs$qm&#jS*F<0#6#zw1eeYtkvTUml}-hO5AJMH>Z4?8WlD(hnBF-(OteV==Ae=2D|c zI4pH{hSsd#%Qc;%$^_d0mjaI6G!}59&1!Qf T@vnq~R|GiNz^yAS{Sy8KE#8>> literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/tc_13.png b/libraries/map-amap/src/main/res/drawable-xhdpi/tc_13.png new file mode 100755 index 0000000000000000000000000000000000000000..7e1f7441b465dde8dcf7a3e5a682fe8c80b74e4c GIT binary patch literal 1861 zcmeH{jW^Q^7{}L8EHAk!S$fe%jgY#VLSBYu-i_JTLfD8UVie`A8z!B&L?`7Xv9$fv zHZK_#m(;ur)!h=UyxiLEQl?xNNq6_0d+xn|M4xk>=X=icob#OLe9v>9e1Bhz4g?AT zfj~M~4>z1j%l-~cHC0~!CVK<~0&n#94sypNcz^rOcL)CG0GeDyS6vB*j`Ix!ZJi%9 zz9<4zaSuv;3IlC!rGpaMTM5yeuq%;=3PH~*TzifTW0*0yX6X#pE4;@ zkNuZiKU*-#^fFy8Lj~=!?4oa`*9V zF4v#>j|&rYug(NVy)iA~VyX3!j&mT8x((LNCFtzfhjA*|AONH>aVsT7Un`u8&{)&! z91w&K>i+l-j!prF^p|3O((FC^=yyGbJ15c?jIPLD8|k=W{w1%JpCqXF9O%P-u4Iux zn)J`*=E#km#n%;<`1`L<_|1k^Mo_2E@C3DrO9^dh7%_}pQY!ATU`9z$HovON7ZP;8Xh$6jGp_Ocq=BTq=D!9D>J&5t;G%H&{HdCeHs|CF@+K z=JU>WGOLC@3Ks}XgLjNF3+-7}MYRR?Fw*11NVmKryuB;>Qk!CGc%j@0M%w&|F_atO z0ZSu>#>{(^<=E87hJO^*B?qWlGR%DY<^xxoO#2unx`pyrQ=d{w`O9h%mr7u5&9T&V z{SHe|o5x)JknyH@+y0w&MmEuW7|iZ0N~A4=PBGMAW1UI3-TlB2Bd>H(U#fHfQzd}& zF|3l|E7+R9-*)YWXoxPn7zy(fC&8zD(HQzZYjiTjU=^md?I~YB^CCeRhLtm{EN$Im zbfJ$OvwxXO8a6W-0QO%-tzq}gy-dK)jM2^;a>}~WT(o4jB-tZfI}V~9 z#a$68;vmMirQ4A!15g-6Iw6gHi+F%g=01TkUopF!djwUqY*Ds2VODlDDrw{{tWCmd zLF~&BwpEWYyBv10g?C1oU6G1`f<0x@ibnxvY|gO;pX`BO4K)hHV+Qrryj{_X6ZR6A zxy6>b5xo|{NDc3@c{8dv)r#i7o7VCHdCKBNv(+Fp{G2FwnA)5}TDVqLzz3E*;~*VV zyp<*MI7m<;Y4TiM;R2!cPa*I@Rp{8+2*r;X5dETzyzGc-GbGt4UXuKOs^xX(^6yC&dAPSu* d^8aWpuL{+2l~#y=+p5P0!n*sq-9sP0@E7!3mEQmW literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/tc_14.png b/libraries/map-amap/src/main/res/drawable-xhdpi/tc_14.png new file mode 100755 index 0000000000000000000000000000000000000000..68ed73eb62aaf1bfc32a0502e1aa7eebc2ecb038 GIT binary patch literal 2027 zcmeHH`#01H9Q`)2UQG;NM9L$p8DlkKyu~nH<82rkA~uhj^&GEdmNkV?7BQW?Vi;l! zX_29@74oJ$Lf&~bSw&tEJDsy<|AhUid(P)`@8_KR(>%;H(p1}W-fX?F38}9%0g*n>d0R!AAL9GKD$)n05 zir5{V{av*U6m@ImZ~IFTb7ul`LtH97`}wadOfR}kq}r}qf_EE#!J9ZzTAD7*bmx7& ze8X2y^KoA~bkk0FZ<{^pb>g$`QpV2@k0eJvb9R6J)K%$yF{HX7N}Jhr^J2+whVP2d zNu>cpb>|X#$27!gQ#$kUFBsmkg}kd3eyWI0(b}+V;v0c{nZIJo=zPWlWZ2aQAIud# zs#pa*(jP1!-BXXbe_HCbSQfnMIN^_1J-3G?LLEAgHRG*v(&ce&e-19hyZ`_mPfIMu zDQbK*XVV45$h7kD_TjGzr-|_Jl;9s?1WrB_v9D?R7j8>I>-^$@etyl{1snM>&Aa;z zLDLicdbF<}dLjh|{WYX-n-z2EP{+;@GU-5)Vld2!P5A`=@R_F@IQA}rkP0*GBsSNc zKCFBct5ha)+5gwBx|HHLDUmy39lB+*CY)M#R_OSR)X3i|6UhWrE%D`Wv~|9eqvLW| zpGzWv%qHGJT)#4r*1kmX^0z#gHn1B5*K|HF<*6NG(L(F!g*6cL?fiA_tLv zoSZ0c76Rj)|EjAlfK1^$K<>0q&~ywl+liGhWJ+NM@H^zKR!G>yri!%5NiwMC@i6-G z(rRW_WUoaQ{6bh~1xefyoM@C2r=UP&%Hvr=@%krv6ht{2C8nOjZcQ4#gD8O7+aKH0$Sjz>9~eZc%zx z{r0{oD&BH#qJ%J(`dhUS&n)496Srooe3r_S>DT!SMvkH#!h&f{h7CrRV1nM37^il8 zjs#t_bE9WtGtwJ?s!<%;0bJcuVkRrd&+qJA%D~a#`|#xo6J{}lMxH2?8tRPAu$HtDX=dJ3SW$TO zrCc%P*;0E8mwhc67rSE4cTgeR_?1PBXNL&$-!{98K| zrFMu#0Lx>CxB{?TDXcVr6|61LL;*`vTWpo_W$Hil CFZi|q literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/tc_15.png b/libraries/map-amap/src/main/res/drawable-xhdpi/tc_15.png new file mode 100755 index 0000000000000000000000000000000000000000..c6edbba61cce9a9af64d70dc9a9fd532fc901d86 GIT binary patch literal 2033 zcmeH{`#Tc~7{|Av#1Rc6*PdoB8?hASn#gSCHa2_0Y0RaP7;-sI?$S`AQG{HQ#*(>T zGaVz0l1mci(%Ny&Awn)kzx15H;QZ9*dEWQ^KHnd|&-Zz$_O>W75jhb603e38vcT=% z%pW5xu)jsQF>e6?ke@x)=>jSMyZ4J<3H&b!oc%mFvfsbHV4STZz!;+_qQ7e+BLJ6B zvDgsY-i$@A>a5Q$*}H{IL$5!&zEup>NdM7Ml0GF01)&-TbMb8 zjV@+;g?`kLx;1c}{=h8UCETwrqrt6{^B=Zsf~pu@V3)?td}l+SKTHjVXM>zvQp?K~ z4=es8H%bk;sl9jhX*Q}6S&Lm!rs{xZDqCClLu>9FtXmfmuT_ybGWM~?8Ljd?H=v7H zqE*p&ar_}ZZz3W5K1`-8TWI)Qbdzh%((fKo#U-u`ID~j>BS7^!;RBH7kiuJdtjY;)AQnVoiwEXTV%7yR&V&)nEjb1>aFu9ZJTef1 zW|vO6%k6IARYX;N0hkmeNM9`Hd^DKL6S8J|Luo`O33(NQrX>|>nIM!P4FTdjR#nX? z#uggLT~h9`igXHQ0hxZcMxNfDb<~NGYz33^I(XZfc(fkF$-%rD1(buuigdjs`vLhD ztu$>2dHkR=)muckY6$2G%SM>6Ef8(^LidzHqm`X~(Vyel=?!LHb+Km;j1iSxVe7?O zC1Omx2fY71Wdu%*G|zM8V_b3Z%*W< zk%Vojev4{8w`cmMT2IL8z@CmMSMjiV%51Zj^HCrymA|Nl7&6XR?~5pwDsI0VQF=EI zKldu7+uFtqb1ls?6~B2*F=~a6GqIwkF3>M-{f1d?e!ixIQBd+py}=G0(cq@3#_MHDlC~O^=O-P4;3m98zo&)S0cu_>Q~L1&-+>sCaM$C0n3Qs{>+tZ+P}A z-ornl^h5$7t`jS$&J^dL`}RygUKtiLy+G27VK!qppRj~mqA5JQ$047}12ObwjKWxM zoOE1AAUGrnH*fY5EEy)&%MW0fV#d15R6etqMwmZ44E0B2BgGLJuZ@GP674ckRIPfg zNyz}sRB&QI@*w4hs9SxOKIx*MF`bZrGDE|?lrh*-l=%5 zvhK;(%l>0A;u8i?YfA^LI9S zYUSayhtPIhLA%hj9l-#>fst*hB41 zf|6=F$!kzjFPnTrjr80;;BQN-cyrWG_@=$ux^*<{MEM4N|CIvJ7i=xc&y!;R1wZHc A@Bjb+ literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/tc_16.png b/libraries/map-amap/src/main/res/drawable-xhdpi/tc_16.png new file mode 100755 index 0000000000000000000000000000000000000000..981cf490f9d3f2a19f4369e4a43d095ed72a8ad2 GIT binary patch literal 1576 zcmeAS@N?(olHy`uVBq!ia0vp^(?FPm8Ax*9Z@j?3z$6gh6XNP#;PZbJjD`R#1iEHD zm;p>8>q~#I=`ttg`PVJ(~BTjn2In_nGLuw{I%!rJ)j@r{-81uw1% zKdAV9oaG7o&ewhuKf6uJycu!je*1;mJRW7k!gpVFzX-j_IF;Musj9z0z;fF3TOn7u zr8n*tTNrnAS@Ie+FKyRF@iKM`mL{d2Y&%kyGvTt{ClBMPv+n+BIK1lRovuC(oqQ$U zXBW>rTrp2}uS9G1j8O4CX4?a@t{Z*4v~I~}^RQCBSSfF73-`wcLg5Sy%o3h1jv*Dd z-rl|%EaNC};Gtcg>h#Ba<>l%s9vm#{j*s3!K;B>dWkD*U32Ei;u3FrSlRWdaKWmh zJt2)ue=c8^F2~qAy9#IfY*l1@tF0?tQ!-_lV9?Tj$K_?E6E;lq zcX)p6nBazWG48?Uw(B-$y<4zzao%R3WWy;%v1zi0FWh>rm0jMU)ss~;@oKN4_{YPh z*PgGq5P9SGUDa#XZFrXdTcEurf3o48Ps*_gUwsZ0Xmj+~yzb7=u+@5eXM^%SJM;Lf z%uiRWx%f)+dgN7`$WEI`xy05$HGeSAoI>LmU>yry3!LXc~9FZ1iEhq4|X z&fouZS!>h6TkN5h=Na<<9ti@M!hqT^9^qphO2vuCU7vBa3%(5=E76Ba(* zVLxfxV|Y_x`;rL_ ztomoyMKFn#q)Nu-b4E;v%Swv;%^4x^|HclcaGwKA{#}`}dao53xgUH8ZPuRI!uoMG zkMy*=Dmo2c&uO1u-x)C>_|1-W;f_a`IIL@{yIyQOg!O5i))U(z6!?tWVv@_w+$xk0sVxOG!VgaS)Nh&YP?HS*5m%Z7vd(T&3 P_Ga*O^>bP0l+XkK(4F}@ literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/tc_17.png b/libraries/map-amap/src/main/res/drawable-xhdpi/tc_17.png new file mode 100755 index 0000000000000000000000000000000000000000..8632e6f02f69823d7775e12434bbd6f0e4086418 GIT binary patch literal 1624 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 literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/tc_21.png b/libraries/map-amap/src/main/res/drawable-xhdpi/tc_21.png new file mode 100755 index 0000000000000000000000000000000000000000..c792321a02159650be37d16a2dccf08c0ca829af GIT binary patch literal 2489 zcmeHIYc$k}8y?i;8fM0I7@;VJnyInllFI#l8>XLY%$TfoEsd0vrpQRDv8D(^8g2T~ zP_x2Vm&v7+kR{f=jK(cP$ZWFq+y8&ge%bH)p7XxXInQ}MJm)#@d0)Dhhoge5rYr;k zQE+y$^Vve?-z_b*HRZ-GcS9hOfnILD_M87yj`42)ME}SAm%zVBpjg_~c5B-@&iHr` z+@0MJJ7n!33KEj8dQMhSj!<>&U0C$SqO>heXU`A&zN;b)zwrMoPWO3TA$M-SqP^#c zyrup&laCho10k@lYD)0!2MbTKFpTmr~X0Wx^yvsM!y{JMPv!)~GuRT5b zAy?x~Y<>7C@Gv8uI~e9Iv+k>WaxA5w>{Zs|)6AQ|*|f&X9jjf}pFHTTO?*)~u!5;M z^M~J5Tjb{(4~tF=2MVq>P<|m&OZ%ILl0>&hmnK=iJqqovz9S@GNS?my@iHQnGmUaMWh?bxW3=3`!hq6@$0iRrq7T27QDcPg@we8)w=q>tBXbb zFc{r6*Wt2cb++-u!DN9uHevN%0<`wJPe)sIRWuse`M)sBad5~~etcn~WoeRM{;2JF zUDqyghB8I4D!kFv~mlB&vw$i1dnD!`s9ByXvC5t0YUqWW!7o#pj3W%KEhz= zslUonypAE!6ZwjuvZZ^K|Ec`j-I&8#0OhIj12V_CY+ua%o0pG8+`*9FNJ#B!+;%TK zpJ5QN#P^=&Y|=Z&r6b5uzSdW2sRrMN{qX{9Hg`&<2~#G$<>M~Bh^7yRUv zMHpvixcmYN@4!awZ^xaS|hfl(fRGRO&+~;_L!@rTSrN> zPT>OSPD$>`bEK`=k(Jj-TN&vQ0T?!xItB`cIKix7?p2mUdn+k6E>9HLB}Q7w_=ToUwE0(*AoY( zgGui1z0l6{xVY|0^Q`g>FkF_I4B+0T3;}_D{A=zrhIPKn!)}k^7G&a_u|AVl@p8%Cj(OSU^6U zQ!ulX2n8+eeR%3by!r2)Xp6xq1v?9HO_*5TT|hm5dBi z&`Cb3Kty^oCT)*yVHAFX&8Dy}-6H%dZOqiYNNE+@?mi+-+TQI60-N_!DS+)KMJmQh>^wIe_&X&7WDnt3CS;)yWYbiD(y>k73cZyV+O;c6$diEYI}+4?J@A5`9Hy YvrepDfA+@o){}%d+k4nm+Jw^n0tVOXE&u=k literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/tc_22.png b/libraries/map-amap/src/main/res/drawable-xhdpi/tc_22.png new file mode 100755 index 0000000000000000000000000000000000000000..3ff00967ab2dd693a6d5ac3e4dcac74eb39bc0f6 GIT binary patch literal 2495 zcmeHIYdjN*8=i7q?hRo|aye#^5j7%gnESBV(gh)rOKee;E)=GY)0o>?j-<6q&KMG9 zI4-dal}&b7j0hzmmQMcu-_D2g@q9e*@AtgV^FAM+-}`&t+yFlh6`&pv005|?ZCp;F1{iJ`UUxJ-v#vf zAqxP@*l$xrKvABWpufC5jJ_YTnRYNZ@yXCndlijSkl(?zwlgsoBM*{vKe$QF92s*N zrF)c8=0!WB3-%xFQ9BY8zFWuLYWdya4ds1_E?4z`OZaIo{hLbV=#<8RSIk@2@4z85 z_nzo=O6qFPeYO0O8@P6%D8%*km4I6Rc2)HTEhm0ci*t70aCtK(X0q)vet`WZ^{wp+ zflR$f>%QStwb;RW|9R;4wd&cM5$keie(xPQKbBr`T*!f8`=946JurUsGPW_kEG{jR zIHLRj0Fd8@LbwE{jeZoZo!W^40Y0lJDVGmwx+=)YAwaUSj)w~%z6h72E}%}%_}hW; z^tE%s^u_0E;~PJa9zc2`t#iTKsY0|S;b*|a0}Bh~b^5u8C{MWenGaBEHHSdqzrt?~ z6Fm!gW9Xi5)9b>#F9TK9tH}@P~XqW;tN$F^-5vBK3ZS%m+S5T>n7drj@|w! z#|zm8UF>@{Te%^{DP-X&E4GPoqDs9F0H%nRv1)&uwI+v4PPm^KXU@3_50w#sxq7rT zZHM1vkHd3rxx2Qas;Cov&z-MRlca6uc!D;itd@#pKOUunS zBW~7IJfJtq4fIB)B|9~l@?pjuHPZ7TSDB{dTSAy8)s z9`~?sDxD4~+^Ns$G%&Fp<}gHSnXcihqKlYCbc$O`o09H8ZKwrpE_`k&(oD&Q`BUl7 ztJ{4WNLl5`_eu1dG5+C+3G4V+REJe-RVy*paN^7_3916SGDaIL%w+C|f$c^*%T0U|gS(Kcm(Xjj>XX$J=QQCqascL8rCR zDEf-p?mp#XoOi4Jq7@FaCs)9djTxND^us*P9r_jdTd}3{D~I{h_mAutDW^t&Q@j?L=9*TR%onJ_seaKFj$a*vSi5!=FWr)5dg>D|1Hnb4eW*q2Wh;6-{eit>yyo zpS1p3erZ4WWJ`7RxA-NL>oz&VlT|_jvoZ)+7hMIW0yRn^ zbr2ZBd40>Y=3@lGTPIblIo$isOwJ*Kw(IQQ5BCSwrpdhX?=%G!zFLXm)-wd4kba07 I*RbpV16_^+`Tzg` literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/tc_23.png b/libraries/map-amap/src/main/res/drawable-xhdpi/tc_23.png new file mode 100755 index 0000000000000000000000000000000000000000..78515625ae689e293abab1cc6ca472e01c00dad5 GIT binary patch literal 2240 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 literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/tc_25.png b/libraries/map-amap/src/main/res/drawable-xhdpi/tc_25.png new file mode 100755 index 0000000000000000000000000000000000000000..1e3546189003d4e4668cbaeb1f98b7c414b0e668 GIT binary patch literal 2615 zcmeHIX*iS%8=iyCxQP%0&UZV)xWNGBFxFo`8-xc zYn!bU;;zYdK-6mQ=7t~Xai!!?8PV>=g}PoMZUOuIhMe>Z6{ccxawu3K8i%oGyr^N}pe_*|qsvK~pe z_iQz4w(4=j&uLix}` z0ToG%OF_%Qp7uFeUg3jjuL76C+}_5%%=hcKjA>8wo%zD6M26f?P#;L9)+rP>-O#&J zUjQ~9XesUIzM1&w{wZZ8Ub}fx27wUw#haaTi5&SnvK%*Hp@8^$D=)P$;WLtKbV&V> zJa^nLMOsWwLIc0Yn}*Yfp7-chxv6KZTpm5&xIAtXXMG@RsFv5j>{-p>F{6yTKP<1t z+VzhOiI= z!8D%qnaE+Bb^D$%o75AfL+X5na=LvYYDWfDaqSc1!|}u9b-g|C%II|I5g8>?N#O}0 zQIJvex%M#m({!g^o%_~xO=u<^a3_wXl|CHzINahZr9|7PuF#TMG)zlYA;Bsa|KvaF zyi-F9eKvDJ2-Gx9MxfouFCi&x^@RrgX$Jh8d)`2IN<6HzQoSJXY#|z91JBA9$MaX2 z5L+?Dw<8HT6uBs^^73m1rk@(pd9{%FugG3V@O8>=%|LUHmtqo?yxLnGM#uqY5cqOAui^8XWMO<=okq$2>-0nsHJS2aK-O_-cHfq$FmNr?C54KoWy+#>$)um z!e=7+r5?NQP^oCU)+cHihH zsAS6XyGl$U5O592XS=LYC#fBq3K_*q2R9M`%o&L)mssF|!Rk!SgT?(9dnrJ&tM(c( zcKD5T&ZQ$yvpl`pue@Z9#8L_7I*az4-lf)~AWYN}R;>HPYUuKU$;?<;3@B$uMLl#2 zY*n9|6R!KSeE=VqT)|uDE{k12-;!;An@&7s8$5z~AxMo*IvaC>2n>D}ogohX~h*L-h3)YU!ml+&w9MrHn_o|${s>sZe^Nc%W z?uh5Hmi&jU=Dat8os}`proHsp-W*dptW~DlUjdCzeaGZnappMjv);hUMGC_KczBJ< z%BIov#fj)!Q#p+kX!;U#%09W!7Y~b42o>2hV7g0}GSu+X!B9&1C^YtE%XmeX&G2f<*A!#FjBb)t`GVrboo?mx7AV@^wKol--TVTG$TIJq!oE4-IzeCC~=8y9YS7m}& zT-fghVqPj#okdJSUIC9Z$Y4{1>L{k8guaca#$~f_((jCPaT10-j`x0u5F=thhYVyC zZQI7qm8n3AD{xI7Thrf%YW8cK9utuk*$s;M87n-=4hVe=hitzdyp>}a4ol+gO)nS86j8iLMkwjz!$p_7dlw6xkB6wLm|T@xPT{ eUb~qGZy}6U*iYpMA;Z63D*|tBXI72#O8g7wZBZ%! literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/tc_26.png b/libraries/map-amap/src/main/res/drawable-xhdpi/tc_26.png new file mode 100755 index 0000000000000000000000000000000000000000..2a3b2f284284ce6a4e927fa392fd6d55ff04d2c7 GIT binary patch literal 2478 zcmeH|Yd8~%AIC?E2w^C92?x`SibT0@uEWgGTvC)2#)=8YB-b=!E@Q4orp;{&$E`xf zTuRDzQi|o0t#WJYVCpz8|Ic&&FVDO4eSVkc`Mmr--{<$sgt|FOOR7i$003zS*v@lj z7yjK6yLP73hm>&uKr{pD0<-`5PjZZM`6v7z`_F-Y%K_do?(LmuvSU5nyj)!lI*I%c z18f~}RM@jiNkY`ZdcWfKzN1#ozeuZ}__kNxPE!^1{iLoM{l$50{+}CQv))6d=AXqk z>ugkH3gK6IM%nsR1?Q47ge?1e@S+HM+>2RbZALM-XJu?;9t~bZ+ zv#q3s?LKS}RU;csTzzFZrV)JhSlovIt;}cj5f@_8-EKAxb%iuv&wGRDy!HMG@?*+m zydSAsnK9y?JNoht+1R74_M%to-LyxZe{>{FSM+~cM3=lvE*}gZFB&~zk3d3Ip1#^uX!IZ zAMW#n(pAy*w?>2(MR)d}Drq+{%8y7c{;sn%w3T#I2@EO(gX+QycoJ zs6Efz_mZzR{Q4L+Nq92P@|rgEm1WF^48r>$aW?t9L}F2I*`zoSd9ahXTb4S-gfbL0 zrApYq6QO)tZ(9?%?%8+tQZx@>#_C{cF|D$G!XmLn;)mqG@@OzHM{buh+zNL3Pf5Xn z^OJj4RX5cn2mEV4BW7kwRK{}&D;D}b!k^boK(J{7BZD9Tzkⅅy80<4(A%XHwVvS z3A@yNwW(Qg_m{0_SDD9^sEI*We>(Lr_XMCEM@a$+C2o099f=^u5;RFOW;&|$Q9UfR zC7XNe3azx^r<|Kiw5^%Or-ryxzf;G^ifPZk{jwqNyhPq&jZWm)%y(olST-u$ zG2MO8Ppr7h?iV!=qL(%r_Cc@YL1w$X9bwaLdAo;&9UNb)RMUwOFJCgXwBX6@wOVhI z6ryrGA~nkgT?Tx3onDd|PI4ZQJmi6bH3VU8{IgzD+fll(KvTNMw0~tdnkZVW*VbZP z6=um*8Vg$AWEADV*b}g}1JHF$FfNaKIeqH6_>}-nW4PbrP34srUziWK?7HK7>in5y zu?t%i8h`!1zKX&ivg2uCl!lmu`?~|5Dz8wcd;A1iPKRLPbM>Q&q^0Wi<#=HN zY5dVij%Q5M4UJqgl6uyt*&o%{bqu=Wkw%M?7b2hDMPclQ>&#W!r~8QPCTi^KZE2|O z{_^#i8~3_Wg2#B%^m=k_z)A?G|La<|LqkFxXMukht)4&C>dc8zvG;vDr;+4Dr-j0r zj@0IUb7H=TkI>^Cc{9kymM!p+L~g6blB8@Jt-K)luKv)K0Ogl3XYi8&GYb+rk2&i^ zj_=85q0w^58LR$LD__E57EGqQtsGSm%Qz#UIyl_w#iu(Fo$=entVB;k;i5aSwQRB% zxuS*%llE;b5vW!?5jrZPM{~_n$9UQ_t{7S`e8pAsXR`(HIc^>3r%G0YS0&RAmV1j6 z*=-Idc(#}{D#b8KN*h-S0#M+3XU&9ps3 zRF6c2pkj#Xy4fsgkf5E-4_4Qu$Pm8;t83HCTR!z;GDpu;Dr8UitFbfDgi*gH1)k0c zimg8D402H%qBI{hSR-rH!Enk!o|!f#rT*_#=51#F6v3wz)}HeVIJEQZ01$gOyGENJ F>|YLo6ZZfB literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/tc_27.png b/libraries/map-amap/src/main/res/drawable-xhdpi/tc_27.png new file mode 100755 index 0000000000000000000000000000000000000000..4425324bdd7a534c916ba3abafbbd07db639ae79 GIT binary patch literal 2611 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 literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/tc_31.png b/libraries/map-amap/src/main/res/drawable-xhdpi/tc_31.png new file mode 100755 index 0000000000000000000000000000000000000000..b4ef20fc3202050743344e84beb549e319876150 GIT binary patch literal 1968 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 literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/tc_34.png b/libraries/map-amap/src/main/res/drawable-xhdpi/tc_34.png new file mode 100755 index 0000000000000000000000000000000000000000..e98239a7b90a935d5f4098b6f886162063bae214 GIT binary patch literal 1949 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 Cjje+K literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/tc_37.png b/libraries/map-amap/src/main/res/drawable-xhdpi/tc_37.png new file mode 100755 index 0000000000000000000000000000000000000000..09d784ddb33ee9b3ac302d7c93cf6f1d2798e8d0 GIT binary patch literal 2481 zcmeH|Yd8}O8^>2(r6H9FDGxb3PYzExGL!lOPijoMM zIYo0yBIijS+ni>_kXU2W-P^yPT?#rPfaCsZSaERCG2q zPrVa=)iqd=Upy>nI~}A4`6E6lIHr^^F1Yer_B|W*j;`>WAg?v)k zn(~>?Dc4pz-2sLEy|xfbuUgzKsAVI&*w&) z0#{d}g)OU-F~XLC$KhvwyApYsmorM9X>aEB_lK^cuS@dF`8ipdyC|q%z>f7_YfkCT z({Ry0=a_cF$>&x0TZK#@<%Q{2S^_6j-^&6A^fF}`%tc6g#@F@9H<|7>^#0)*kYIUy z>>(nenw**E$Q}xsdSz)-_1>v4qna=(+K@120(=GOP8xmQr9qrg(U6)$*aCSaE`B6c zmao*PU7=C*Oe}8KGN8JrWR~O&^pca%4~vrl64Qf_z%_g~{pjc%1E9||X~9VgFy6yC zrQ~EKBh$@DY+aMvamaO|-_ROECp_;n+%X>v8<`~@E1hXE(e%Q%6cJ<=>{omTh zyF2lhf5%f_fy+j;y*_YQK}lp?<$j7e8VsAQ>P*wR6QA=v%lg1oU(J)%YY_hYU{ zA#c{o2A{jMGjJr{Ikh0&Qw-71P22l6cA6{Gzgk&kBr3IbU1-xW_wQ<=o#om3`Wx_!@ zzkpaGxk#^}`TipCf#Rul1P0Bj#Cnvv8Z;1_lDcbLic0}Mif7ec18MLQyTY%~85H4> zP6Ib7+-0(Ms(x4()+=NkxPj0nIwloFR;UCy=5?mVh{eu74Ju1HdO z{2}75XRH0rLM;9>swG^mtYa@opj(5*hm53cslD&-og{epXSnhTb3K-mchog``Gf0c zsno$1YiK;Y;*mJ9C!N}E(#B(W_^h5xDRqlqy8E4JI~q%Q)O=+x2*ezGQx3o7GyOWH zt?PEV)M}JSdxhKVBV?7q!MK7P>7 zH9QKd^VUlJXeGW_;z-xClTx6Hl4R$TX1Z=-0z8+idTs2jrbp&jSB!SPbCNs6UI6v6 zD==sQ^aSbkU?%jST?I8f2I|$x~)kV za$jji7+e2b^<#*7!q}^eXT7;CDykw~(zYx_yUbIG(OD$jJJ%CtYdBpY$tN-fK`dno zJvba5)q0%H-OwJ}uFrX5xmk1E=tUvr^tEjl?xi5)@P{TKeo7(vYZ-DXe0ZF-aB#;X zy~c&^IA5F9q&bJ=P)&j{^^1bFzz1@pruR_Vfk z0aO!1^hZQ6Uw1P#pZs+}GO1jDc-X8Q!}f5$N2)zR6mG~;ad|d0T ze3dVo%QUVw5C-xXmtpe#@fK_AnRl#M2S3qYH02y<$Yw+JU+R2k@kiTcpU;aYQfa{j zI0tjF^O`ycm&K@jWHq#QBA98nx;<*Cr~%6>g<}=!1fek`9Q9trMVlq$)R00M2grql zU9|4{Y>WvD@Sf^Dqtj((%0WO7?&>i%8-ck4!ViV1He*PE6lIbWNLn0TpO@X*#aSm$ zSw*ASGp0e)Uj}q8a89|Df%CR(Ec!&Mb<8!+FtJl3!!hkS%Ik;uN*s8=`Qt>-ephEE z{^c9G;)=<=<`|ar%_HmVShIljahFq@oh`K*)?I(O)@oc9;7XWr-xSpCe8{1)i&l2y zCdcM8t{R>^f!yrakHz)E4m;LsJc0D|``u7@?J#9J;hh&b+_*a)dHOY}(%D~Wk%-`^ zSX?j_qShCdrq!g=@i|@5l$tl;ULr)B$hAJ$$o8y^B8-Y+w+=#y$+Tk=CPtOgv#iTM z-en&6&=sL-f%VtDD^lK)qPQ?IW^J@(SxqOO0?m=HE@fu4z1b1h-l(x7vm-jO^3=OE z?n7w#KFi%roiy|f-#f55L%%}=*oJ{0jsO!PI>uyb2Vfl`L|7=IBcy0i8rG5GR!=bS pvmAQeeI4FDq)yQB`5$(4ZVmOC#??Vxa6g|QzyS=kqk~X{e*omU9U=e# literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/tc_38.png b/libraries/map-amap/src/main/res/drawable-xhdpi/tc_38.png new file mode 100755 index 0000000000000000000000000000000000000000..b78739dcd8301fdcdd66282bb9712ff92089047c GIT binary patch literal 1873 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 G(SHH)H{OT< literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/tc_40.png b/libraries/map-amap/src/main/res/drawable-xhdpi/tc_40.png new file mode 100755 index 0000000000000000000000000000000000000000..844ba9455818808ee3f033c73a365531b97d7e4a GIT binary patch literal 2294 zcmeHI_dnYS08OY}dmU;Q6;Vagr7Biq9U(~*QKO5ZsBv1mMkS)fHCC-CO2pSVX;E5j zqGr@;MH{0P)HOY#D9$+7`{n+H`{mx}^WOXYectE245TYUQe0IW1OiDqI@o#q@ce%$ zD)>VsJ|>TVKmvD>E@*qiO_%-u@qYsUX#xiWtkZw=k{#vYiUKuCXqpK~nS%xQWdDLd zg)u?~Vn=^cRIidTd~8}FizVg)wg+1raR*-FLfc>NE;V&Pd@Z|;Sx*NcKRcN`032qixvfh>!D#3{W~C# zkdvdGHTpJZX>t>*>Zu^IBAcv|a)&BjesTS7pl_)^;*rZaMakrm}Q`w$?tfuu2&#@!8CQ4xIsK z!!e1dzALAjI)S9nU%T3smogWFuQqkU4_)zRcs6QpcrqWTAlcw|Ls8wOaJJ->>&%A6 zy{8f}E2ht-c#C27nl;&yV4TIuqV(H=K7ejmIDwndZ;r0HD&AI0e8nji&%3k~aDd&S zKyCNY>3m(kMH8a;Q+BVsr^Y1YB(m-TPD$W*ti@RxJ}gD@oVh#3@)n4|GcMd?3a`Wm zOL0?NdX6Jgu`Lj?Y2b-+$&qn0w0RS{x?>(1Ps%}ao;BxZM24eJx)q>rpQ92xZ)#@o zs8uw#-fOV)-hnpmj@fVWm@Aga8-32%I@F6}VJr7!maU3(8(_M-!jB1zC!@_TZmH_zcEONjJ(HUq{jdM8wFyM3xYM?bwb9VBv~Kxkj+TtYRq9+eYce zm%-V&-s++t^GBgOWK*s`#nf+XHKUTl^nFPf!C~g;Dqi^thCk8qK!7Msl|>AEHAt?+ z1R75kfopZWLQ>B{7iiSxVo@4zcE7XJnPrP=6#sfGFnpVkW6{TQXjg^s?NfNzI4Kh& zTCT8_HjHiZeDJ!^0`0}&@zIa-&0E6V5MPT7m~RV-j~t9mtHQ5W#^-y7@4EtreaVen zdTukXPp#0gsTzVlT|-7Iw(2ps!=s@9xu1GlccDkl%8djoCw^CVAAgWb;-inF^eGW- zWrvIqVqXQGrNxV<;7TS`jzCZFU~A9|6j$V#b*KUDf-JmYZ(}MV@7A%F2WrkipTc88 z76fV%SNnnGH1*F<1XQbL2em0`Ui;Tl7>{icA?gV!Q@9=OP_@6u^y9e9!R_N&1Cwz1 z?uTFtmty_$*wWl!Z9+e-LaghFH^Q^~X^to1@=mDbo}}$7i(Sa)&BaRJVVYnQtpb}Q zkf12?K{H9q14DG*trIEPQX`=)Gd;-9HAiqE??Z%CrR`e>FhcMR5KgT(DODf~q8>pi z54h3pXB`AIY6D^8p1pkzdT`i+;k|9g)sVqZ)`^%{zgd!F5Bhl3o_5h z9g2=3Lgjz=o3?=k(IcAWUgOK1lD*HHSpzQf(q)t2YafuF!H|M43jM|)Sh1{=SWzX4gBp}7D6 literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/tc_41.png b/libraries/map-amap/src/main/res/drawable-xhdpi/tc_41.png new file mode 100755 index 0000000000000000000000000000000000000000..e8bb0199f4fe1d05906b5e9f9295a7cbd12211b0 GIT binary patch literal 1650 zcmeAS@N?(olHy`uVBq!ia0vp^(?FPm8Ax*9Z@j?3z<4phC&cwXHsD_1gH3o;YzTxv z=kxU+fN?y#B*-uLH!sUGW+Qe6W07A!WRE*BN}Zp zl-O}sviv)beo1ntil){*`8T@4s>($Q?Q68T_VNck?2wz4a9Ys%xl4e}2Q|Bpyp&^; zGJjs3KIc}HgUp@>%?G!K3YoRqFI*<=x!Uha?E>eeCp}n`*86Vxlyf7zy5aDnP3F-v zQ(M$I`uH|;_D@NBy<9Q){<^~wvkDj(n74YmIEGZ*dVA}7ys)DH`v+B(H0CTJW|t{S zu2q5p6PJC_a^3L#UiJIE-|zj4stwsQbNAje_ud>nSA3(!US<3KyE8jhOjOl5y$J`iXn zz0{;XbYGm*iB&xw%#oa$yeVrZt8H>y+PS91WTGgL`ODiUW$CXaoonJUl~xDNI?=V> zbW*6AZ_3e$HGNyAO>KXq6V6j{`qX;vzh8Hyb~B|mKHqog!hUc4NErof?q7daiRpuq*)@LdVKceCm*l@pom-qT zb@#@WfNrJGYvt}?C+02{b6vG2%suQ5v$tkfNM!N7^FiE^T7fEma-u(<4HXW~To^ZR zvB%V}&-eU!JY9Zbl!)f$wEa)JcupmYtlX4V*LCJpw20=WW#-*Ir@cj1ZhUsRX@QN) zM4{|;&J#i&N_ky7zGQ*cc8#FKtsJ|GI+a+%>X;Qzt9FS*m^N)G3ZJlnkK>ir38jQu zh4jwenVauDk@$Ik)dIJPHQR#@AJLknUMRe=E91V@!qB}cx1LU(qOr-RC(y3_ZHjt_ zq?72w%GainTItLWUw)C8x+VAq4GPvy+(BDOPLYj6+SJ@4MjvWBT& zj$OK%xsElWeeZ@nM|A8bPI&Fu$YtVp!moLa-JGQY z=5`VMj@NWfU9zdY%e6@_$@}%Z(D_V}k59yB&VTcsHPSZF_GxFSc#7=96yJt5=jW_h zuJBq%S(~q1JzFAj>IdIvR?4d-(%vSg_#R%v=XQDL%Yr#TXpzX#{3%*suHicq+hcgt2%Z}>Uf0z zjfk%j+2+!(WvyN$CC46);LTa%oU#0`t@vx9Q?H&T)w)Ki`mAyNvEzxBaJERgY&t)Yh*&d2a_E{raSFgT!dT7IDwiyxbg<+FAzcQrr8gGoL%bfM> lH5*&}wA4rhTDrZC+3mIG+3W{78-e8vgQu&X%Q~loCIINr=NbS2 literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/tc_42.png b/libraries/map-amap/src/main/res/drawable-xhdpi/tc_42.png new file mode 100755 index 0000000000000000000000000000000000000000..94847a4e328112b966d297d6f0847de26cbd4726 GIT binary patch literal 2490 zcmeHIdpOgJA09=H<(5Lr{gS!uAet%H+-a^`8@X>tIElGNXV|1kE=?vQ$|d{KjD?hg z<~DTGR&IyFaZ5xhTKV<6{CWQU{deByc|Y&-ynnvW`@EkV52T}nI7A!-0!cVK*?Ilc z;(t?Y&(8~~=vC9|Ks|2RSp(^Pk@>Lk&vWs~CB8FT zf!3LQIKYLqlGpG8Ul&BWZ5uuqm47PXP4$!ae(;p4EA|0tb{}Fr+p-)YT_2gh8oTw3 zI$YzQSd>8ofkY*p?QDFK##bliQzsl0_gz3d(4f7$tri=VJ$m8E8`rlybetDX2UwFDF))8DQ!PI_)EZZ0DG4{)+_^Kn{OXLKPIrzNMi)~k`z zzd`pWDiigmnT3d8Tz)3ksn>aw! zk~n*ipOc^yqv_vxB^b>aR;fDH|GlYmEII`Q#%qu=`7WtQg}U)S@LF^CA2f zXqK1jr=Vm>a~Z_idN?o2-Tq>7DV))nCOz1n|CEaI^`z8o7&@Z+ufJC10<(SMiXCz< zYD?u;T4(RYG6NRQT-iR=@Cw+MgihWhv5_vXg*sRH8?{L9rqAm!^QTAXuw;Jvv0cli z1&S-qKXBP7!|AYDlxlP1%X11zIy7E*>*2W5lUR|9-#wZgr3I+tPl2#@E>FizD^w;Xbf#73C=50;n`CE;C;n<97C`p!KTTb2iv&@yLo1{Z!TK=vI z?hEZ8UHQt;T*X?s9KLqcyp zV_Y?RlykmIRBf{CNVt;K_cX|NM6I}sB4%bW_|o!Kc-0#&5;^>%1pn@N*>MZWrl;ga zoZnukM1pdIATEdpIn>)C>Ve1hRJ%{^M>km8^nMh-J#LL6 z)8x;?2h4?AF+wr2#upq#lti%YlQs7ZW_(}v89Pz6VnYo?RQMA?GIE=@-meK^C)CiD z1J~J-IRAZ*NypOx`}NWZ0}w+*`2rk&GX*?qVUy_KmpL6-;1k@9VjS@>g?)9u^<-gn zkOdPQYt{t<^4SWDU=4D5;T@AHiNrbEtGa+uzNt)VhXCtk^Z14COwm2jAX7O^?W3;6Z%nf$O&biL+47a){>~ z=b?({A2|-6z45Q~&o+}1`f{J~zKZ1(ZwcqIi3xetB6_l^ozWF3l#d^qKXA%x#$>8} zVHfd)U@YTKWC!Qw7POdf1~=68EwsTDgXZY$cO?$ccock^@w0mQJM#f3_sjkjFKp9(j$lR(UwxF*9m1|XospLA)jnNwATUX?yD1~hCXFDF5 zrS?PWiXrI%VP70v`En;$43jHey!q1QrZsbd8W$kp(s6?415-g z@V%j?wUW{kyhgce5gv`b`&$Goi+s5Xrl0c(KXG~a+RQ9&+e!Pg_F+kOQ&X-cKe?w} zC>rapiSC$@-wLJ{VRprB=$P7p3J7nJV{RAnJ##viU&3<@p+BhzdtO4w=hUMJTv;iK zU}~D_ugy0rK*hYw)>@?pTsKiT3%fZ=gShznBcYj@R4SES8y}K$`ZO(}!ve2+uCm0| sC_4mfU#RK)DyP@#zf1kU!8TdBJe!PqOCk)ifBrs@vpv$T(KaaKUop1<<^TWy literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/tc_43.png b/libraries/map-amap/src/main/res/drawable-xhdpi/tc_43.png new file mode 100755 index 0000000000000000000000000000000000000000..66cbb08569cfea93c661f2815097d35483d52328 GIT binary patch literal 1878 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 n1T47w{BBz(1ZyaxgCzV#!F6 z>OQAdrRB3P9W#r4;f{Dn=>4Nc`|{NS>yCIG$0un?uKBbXkzZPvcb8<8yKEfj`1?}M zrek43jU}J^;_Cg)f2%q_bW6`IVm#BO%{vFGIr#QO_`-F2(ZaxF-8;FQFYiN&M=r`n zc~ObzfXI{0A8h9+H%5O?ueogt0Eqh8BhF#M$5x(gTYo~zwhMJt0=3GwCX+$^1<2QV zcHn$_seCaFD|s589fhTG=6$hC&;$?^S@>JHGus-rm_z8#V~KZKvvSJNhPvbN{C zfi`s40*5r1TQP?2YU5rMnTF(=wI9+rx|AXS;D)H}3FMlU&1Bo0C3|t-0yL5|eGdaV zIU9);qT;h23KB6JHIp@<1NDOI9GqD0iyUPBJ}7)v`ZE!K(ZR|sY-GzNENw&pyaOpQi{QR!m6?$mx zGI<_)ER)gZMkt>%0akptiT|nRcefB6x!H0#qRZ$LHyp8vic$3&y-3j&sgdK)OY%{* zRAW#6I_+no@$k1#VO=>!3naGuDD$eN_#r6g?Ev4Cz4SYJLl=J>K2*4Qc!JzsbDRCP zNqG-hDj)GAh#@qeu6q8ybi~QT7sF9|pu;W(MyM1CyvdYXNNe z^1dBJd8f4hLknuEU_lHrb?*ruAX?IxB|J=Mo31y2@Lwes@~xQyzUl?ZhX*Y9&D9Tf z#MD#2R?iTr$XgNdwn0-7sI_C!~){mR|teUnIGB@6vzPO}5RHqxJqmO1;?`DoL z?`*I4n??LO&U6ukOAxqg8HQhYMEDV9z3TBSY^@`Oc8!ICWx=WPWp--er|;wHtvZN! zJuw(<03WD#y+^uEx_=&?J+AUY0+o3~2m{R-ue7 zjP=eG*t8RirQN*myXtvpqHfxR#p08lRBN+8Hsv7r5{BJ9?WY7J|50yR*vaI?k$wQjEF-^P-l*D6m_ zd?g=GP@4042D}zJXDBaf4LWB$&V~lM9vfEDFD-WELAx1lm%NBO9+3HWvJ;PN-aPuN z)~WLmTwmNJ6kPM-`&q+cu=Vyt5=4P{frrg{S&~=ZKJgl10L-tw!)4y+YCX}o*6&rR zn5Sf6(H9`>(hKm3K8+JC`RtPkUOs2goiEWrV}XMSX=Gpshh^B0eNr`o5B-Ef3kQai zwcM_gpNAr2cS8|<@eD+Tj)|iwCQ_-7DO#fqMKb2tPpxY*&??8@d{l`aYze)wqg^bc z+i#QVVA*Ir`3uJA^c!xHZ?luzskQ0N2#lR}xjQnCD&qna>qi@@G<+V^#=mva;BMspRN4~HI67nddH>@OA4P0- ztP%rfm)0QjXk5}m!`3}Uui;Qu=!5;^1zU8{B4EliW|*DJQ>K5fV&(|?&J*k1GM7E| zz0U=&r${)!Vx<<0g0?x3%@)$2ead5T2G@VMbpwM+IX~RRDG_WzZx&6e)>6M^=h$wC zHUW@NUMozd-IE(cwI2Z>N!r(VVP;)sr5n1`j0&-7RRFN-!=fT3_a(#GX+K)#?+(Vj zW*aMoAxet^JwbA#@SS8wy-PM*8YS>+c~51zV2V1f{)~mIt<>CR&h<*KI!*~BI5ZtT zS0)rJYllbUglp^iM~B!@caC%`wQJDA)r*;J+F?tNlAH48AcDq21eos3Ps{Y0Oko2sU}jlG4OmuYo$>O(&cj#5I{ z^#qbG<2o6sJCUA7gxE7r^K=YO|Fj0OQ(aQx)^ZQ;+&r2NZP9>?&mu1S0bHS#enZQ>q5u_V z*`f;Kq+axi(7%r?sbO0oc|o>kX>TlJ&x0QnmR|0HzTWryZOCH1H?Pw3oq4}jjL$LE zp9caIsa|sD;$GBUDeg&<(Z%KaUS!Xw=#`LPxq=*WCRJLD8&xMV61RivGin*iw zVa8^-{Sjw0BC<$G4-No`_@b;W(YHVU$X>rNV5`su>>%aqGSy;Kix1MxxiT0-)Y+uqA3QcH%()cX5rs*I9@Z^P8sZmh0e|RJan;Z zz8x9rUV<)GFJ-ln*`TNrsw^86JC*j4E2L`TmW9bJz1*ly2UO~MXvzb0qIM-^e!zol z(CJRQEBHOQsqkGkeq6XK`Te7C^yN}%g?-T2tuD1rN$}h-v8tK7`Abbp83wKIckIyb z^UfzU9gZG!ypUXSXGARXwTG*&wP7u4uQOJru3HH0?E>)H3@pPIDDgx*1-9p)PLB=c z$Y~8e><+oalDg{&RCIR$;?pV3qTHFUFFtg?^hJN}al>xY`e!@qusch$Zb_{#w4>Em zpkeU4pF#56NKeI-6d6H*?aVBWqP!DVyEb>06}<0{54F>?c0)euH#qoYPUVo9+AWyF z)Wu#OV6e^ew5?peeU$leWG^J^NsR7|Cl<>=lio0Vxgz0(RlV&Ol-5H-7GqN5dBMuy zB$Tn3!*>{pMoG+PN@^Lj!=9Z93`7p~4V!0rQocSF^U=k0_|lCtyBD0?!7*F*YzA4A z+BsE;RZNtfxsLy~UmFjuw3=$E>&!ay+eISL=vh_4i#%eKYJUl_n#@l(mi-=QnsgV_DxzNqDaKI4?^4he5<~OwgmYs2Q$I7zwcno?LzNPVz5uQcXBwCQ))VfKFal?m2ho2YEC^@f5K)DrP6#B1ef(MnCb|eT%-Z6S ztk@VxUkPaYp3}fJ(fE0)FlC^bf?5zI#7{hOmmB^oK9EkU<9rkp(&{4gF`=qbN%bqSR7@aF9(KypR9$0ODqcq=jPou5 zP7K6O-H{Fn-7lK#B(+?TUMegnsVp{`eTm0yz%dJ|Qf6R{ zdEPa}x&s`7%w&^zx8*{_aMeZ zSw)l=?L2EyD0Ib^=iAhuFQ=>G&zcc57TcHH=ZGrbPO!#; ztEY=F0KNg588A|f7ux>b4Y$dUY2y4vT%$8YJ_A$NK0^m%F&AB`s07$Fjs2E?slqN;KK665tMt z$ahNJJ3nWiJJBy^;V=7v$HJe7a0YDCxFv1)cdFPy1gT@kjq2Dw7*`qvWN&~Dr{tP$ zw=`NVA1kczlSSzP@@!n5{V_^1i+-M`ZgSB|&zc^4QP_8Em65c(+Ev_e?~^hw)G0mC z*VrIJnHfNfGz{Di9Ix|RrkE6%K8Q-~ zsCRWeu5di2D^Zg<7~{_K>a%aCl|C?=#(A{kbtgZ0#=o*AF`yX3(8Wq69N4IlSAvAm z<@e1ymse#CsWI9VDWxWTDV*=UZ^pmNa4SV0H&3V8)Mb*qjBfn$x}=ADvPAZ)kau@&zVigH}qDAkb- z=>dk!;F#jLfD2cm=WG0WCCd91G4G~drgzdT{79u(B}(~{;zuDoss`TuHoNC7lT1sM z(=!yz$X1*({79tb&dr<-tJWPTyME$jmnCe}?X+L(1^GyP98Gz>er$B(f$3FaEx*Tyi?jHrlZjt~1 literal 0 HcmV?d00001 diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/tc_85.png b/libraries/map-amap/src/main/res/drawable-xhdpi/tc_85.png new file mode 100755 index 0000000000000000000000000000000000000000..0bdbc57f236e6dede476dad52b793279558af01c GIT binary patch literal 1550 zcmeAS@N?(olHy`uVBq!ia0vp^(?FPm8Ax*9Z@j?3!1y4*C&bmgz~}!c7``Epoz0~I zjPm&fX`8xN` z{p2RAIW9h~9ld$)ukDr*_A3&&QgH7`jfwB&sS{?ENjA*CyJN9=eHEWks*+pQ6vyI; z&gy5?>_5Jl*0$xf6W4aTL+iSZZG+m zo;`<}lFYY9)qc9U{ITe&fSc=-)~&mD+C6l^oS$;*w(YDgJH6_T&$@ll>bk4U(hEDb zO^f^;e{h9`ea-z-g;P&1ob}=K=1-O}>QBz|$T@_q^quzf(S*{I^KN%LM9x+@A6F@} zExl-sQ^GYr%P>ZR)j@rsJZE-k94}(tyy;2A0j+s|)^AR`?s=W*MA51J`|6b>^hhL`M||37oTxj%by=F6cQFMgLF4(%@f{(7D6iZwHS33&IvdtGJ|HuI!W$r|C_ z(sMa$zp+WJzFNXtsV|m&*^cA?ehYEIg+c8aE-TUD5K@{zyNsiKzCQr?#)9hHA| za@WfXlUTR=B=w4>U!Qce_)E&wpIcKty3LK4&%EBMMrz|Kd)7FmJ>(76_& zC-wD5L&P_O$TtfPJgq#rAu{Lu)Ud getMarkers( String tag ); + + /** + * 仅保留指定类型的tag + * + * @param tag 需要保留的类型 + */ + void removeMarkersExcept( String tag ); } diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkersHandler.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkersHandler.java index b9cf9a6b1c..be1a9944a5 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkersHandler.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkersHandler.java @@ -1,5 +1,7 @@ package com.mogo.map.marker; +import android.text.TextUtils; + import com.mogo.map.listener.IMogoMapListener; import com.mogo.map.listener.IMogoMapListenerRegister; @@ -112,4 +114,23 @@ public class MogoMarkersHandler implements IMogoMarkerClickListener, IMogoMarker } return false; } + + /** + * @param tag 需要保留的类型 + */ + public void deleteAllExcept( String tag ) { + if ( TextUtils.isEmpty( tag ) ) { + return; + } + List< IMogoMarker > mogoMarkerList = mServicesMarkers.remove( tag ); + for ( List< IMogoMarker > value : mServicesMarkers.values() ) { + if ( value != null && !value.isEmpty() ) { + for ( IMogoMarker mogoMarker : value ) { + mogoMarker.destroy(); + } + value.clear(); + } + } + mServicesMarkers.put( tag, mogoMarkerList ); + } } diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoNaviInfo.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoNaviInfo.java index 2d578f4ec5..1da3f6d630 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoNaviInfo.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/navi/MogoNaviInfo.java @@ -3,6 +3,8 @@ package com.mogo.map.navi; import android.os.Parcel; import android.os.Parcelable; +import androidx.annotation.DrawableRes; + /** * @author congtaowang * @since 2019-12-25 @@ -32,9 +34,10 @@ public class MogoNaviInfo implements Parcelable { private int curStepRetainTime; /** - * 导航转向图标 + * 导航转向图标资源ID */ - private int iconType; + @DrawableRes + private int iconResId; /** * 下条路名 @@ -83,12 +86,12 @@ public class MogoNaviInfo implements Parcelable { this.curStepRetainTime = curStepRetainTime; } - public int getIconType() { - return iconType; + public int getIconResId() { + return iconResId; } - public void setIconType( int iconType ) { - this.iconType = iconType; + public void setIconResId( int iconResId ) { + this.iconResId = iconResId; } public String getNextRoadName() { @@ -126,7 +129,7 @@ public class MogoNaviInfo implements Parcelable { dest.writeInt( this.currentSpeed ); dest.writeInt( this.curStepRetainDistance ); dest.writeInt( this.curStepRetainTime ); - dest.writeInt( this.iconType ); + dest.writeInt( this.iconResId ); dest.writeString( this.nextRoadName ); dest.writeInt( this.pathRetainTime ); dest.writeInt( this.pathRetainDistance ); @@ -140,7 +143,7 @@ public class MogoNaviInfo implements Parcelable { this.currentSpeed = in.readInt(); this.curStepRetainDistance = in.readInt(); this.curStepRetainTime = in.readInt(); - this.iconType = in.readInt(); + this.iconResId = in.readInt(); this.nextRoadName = in.readString(); this.pathRetainTime = in.readInt(); this.pathRetainDistance = in.readInt(); diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java index 0cd6aff6d8..7e9baa5ef9 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMarkerManager.java @@ -76,4 +76,9 @@ public class MogoMarkerManager implements IMogoMarkerManager { public List< IMogoMarker > getMarkers( String tag ) { return MogoMarkersHandler.getInstance().getMarkers( tag ); } + + @Override + public void removeMarkersExcept( String tag ) { + MogoMarkersHandler.getInstance().deleteAllExcept( tag ); + } } diff --git a/modules/mogo-module-apps/build.gradle b/modules/mogo-module-apps/build.gradle index dde252e48c..35003b7077 100644 --- a/modules/mogo-module-apps/build.gradle +++ b/modules/mogo-module-apps/build.gradle @@ -27,6 +27,11 @@ android { } } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + } dependencies { diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java new file mode 100644 index 0000000000..a3429b563f --- /dev/null +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppNavigatorFragment.java @@ -0,0 +1,65 @@ +package com.mogo.module.apps; + +import android.view.View; + +import androidx.annotation.NonNull; + +import com.alibaba.android.arouter.launcher.ARouter; +import com.mogo.commons.mvp.IView; +import com.mogo.commons.mvp.MvpFragment; +import com.mogo.commons.mvp.Presenter; +import com.mogo.service.MogoServicePaths; +import com.mogo.service.cardmanager.IMogoCardManager; + +/** + * @author congtaowang + * @since 2020-01-06 + *

+ * 描述 + */ +public class AppNavigatorFragment extends MvpFragment< IView, Presenter< IView > > implements IView { + + private View mNavigation; + private View mMusic; + private View mChat; + private View mApps; + + private IMogoCardManager mCardManager; + + private AppsFragment mAppsFragment; + + @Override + protected int getLayoutId() { + return R.layout.module_apps_fragment_apps_navigator; + } + + @Override + protected void initViews() { + + mCardManager = ( IMogoCardManager ) ARouter.getInstance().build( MogoServicePaths.PATH_CARD_MANAGER ).navigation( getContext() ); + + mNavigation = findViewById( R.id.module_apps_id_navigation ); + mMusic = findViewById( R.id.module_apps_id_music ); + mChat = findViewById( R.id.module_apps_id_chat ); + mApps = findViewById( R.id.module_apps_id_apps ); + mNavigation.setOnClickListener( view -> { + mCardManager.switch2( "CARD_TYPE_NAVIGATION" ); + } ); + mMusic.setOnClickListener( view -> { + mCardManager.switch2( "CARD_TYPE_SHARE_MUSIC" ); + } ); + mChat.setOnClickListener( view -> { + mCardManager.switch2( "CARD_TYPE_CARS_CHATTING" ); + } ); + mApps.setOnClickListener( view -> { + new AppsFragment().show( getChildFragmentManager(), AppsFragment.TAG ); + } ); + } + + @NonNull + @Override + protected Presenter< IView > createPresenter() { + return new Presenter< IView >( this ) { + }; + } +} diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragment.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragment.java index a0a9d22d67..2fd18f57d5 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragment.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragment.java @@ -1,7 +1,9 @@ package com.mogo.module.apps; +import android.app.Dialog; import android.os.Bundle; import android.view.View; +import android.view.WindowManager; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -10,8 +12,11 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.bottomsheet.BottomSheetBehavior; +import com.mogo.commons.mvp.MvpDialogFragment; import com.mogo.commons.mvp.MvpFragment; import com.mogo.module.apps.model.AppInfo; +import com.mogo.utils.BitmapHelper; +import com.mogo.utils.WindowUtils; import java.util.List; @@ -21,9 +26,11 @@ import java.util.List; *

* 描述 */ -public class AppsFragment extends MvpFragment< AppsView, AppsPresenter > implements AppsView { +public class AppsFragment extends MvpDialogFragment< AppsView, AppsPresenter > implements AppsView { - private BottomSheetBehavior mBottomSheetBehavior; + public static final String TAG = "AppsFragment"; + + // private BottomSheetBehavior mBottomSheetBehavior; private RecyclerView mAppsList; private AppsAdapter mAppsAdapter; @@ -35,22 +42,36 @@ public class AppsFragment extends MvpFragment< AppsView, AppsPresenter > impleme @Override protected void initViews() { mAppsList = findViewById( R.id.module_apps_id_apps ); - mAppsList.setLayoutManager( new GridLayoutManager( getContext(), 3 ) ); - - mBottomSheetBehavior = BottomSheetBehavior.from( mAppsList ); - mBottomSheetBehavior.setSkipCollapsed( true ); - mBottomSheetBehavior.setBottomSheetCallback( new BottomSheetBehavior.BottomSheetCallback() { - @Override - public void onStateChanged( @NonNull View bottomSheet, int newState ) { + mAppsList.setLayoutManager( new GridLayoutManager( getContext(), 8 ) ); +// mBottomSheetBehavior = BottomSheetBehavior.from( mAppsList ); +// mBottomSheetBehavior.setSkipCollapsed( true ); +// mBottomSheetBehavior.setBottomSheetCallback( new BottomSheetBehavior.BottomSheetCallback() { +// @Override +// public void onStateChanged( @NonNull View bottomSheet, int newState ) { +// +// } +// +// @Override +// public void onSlide( @NonNull View bottomSheet, float slideOffset ) { +// +// } +// } ); +// mBottomSheetBehavior.setState( BottomSheetBehavior.STATE_COLLAPSED ); + } + @Override + public void onStart() { + super.onStart(); + super.onStart(); + final Dialog dialog = getDialog(); + if ( dialog != null ) { + if ( dialog.getWindow() != null ) { + final WindowManager.LayoutParams params = dialog.getWindow().getAttributes(); + params.width = WindowUtils.getScreenWidth( getContext() ); + params.height = WindowUtils.getScreenHeight( getContext() ); + dialog.getWindow().setAttributes( params ); } - - @Override - public void onSlide( @NonNull View bottomSheet, float slideOffset ) { - - } - } ); - mBottomSheetBehavior.setState( BottomSheetBehavior.STATE_COLLAPSED ); + } } @NonNull @@ -76,11 +97,9 @@ public class AppsFragment extends MvpFragment< AppsView, AppsPresenter > impleme } private void bindListener() { - mAppsAdapter.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { - AppInfo tag = (AppInfo) v.getTag(); - - } - }); + mAppsAdapter.setOnClickListener( view -> { + AppInfo app = ( AppInfo ) view.getTag(); + mPresenter.launch( app ); + } ); } } diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragmentProvider.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragmentProvider.java index 03e8970e62..09a6a429e8 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragmentProvider.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsFragmentProvider.java @@ -26,11 +26,11 @@ import com.mogo.service.module.ModuleType; @Route( path = MogoModulePaths.PATH_MODULE_APPS ) public class AppsFragmentProvider implements IMogoModuleProvider { - private AppsFragment mAppsFragment; + private AppNavigatorFragment mAppsFragment; @Override public Fragment createFragment( Context context, Bundle data ) { - mAppsFragment = new AppsFragment(); + mAppsFragment = new AppNavigatorFragment(); mAppsFragment.setArguments( data ); return mAppsFragment; } diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java index 99995c942e..aafde6d392 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsPresenter.java @@ -1,5 +1,6 @@ package com.mogo.module.apps; +import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; @@ -83,4 +84,17 @@ public class AppsPresenter extends Presenter< AppsView > { return appInfos; } + public void launch( AppInfo appInfo ) { + if ( appInfo == null ) { + return; + } + Intent intent = getContext().getPackageManager().getLaunchIntentForPackage( appInfo.getPackageName() ); + if ( intent == null ) { + Logger.e( TAG, "can't launch app: %s", appInfo.toString() ); + return; + } + intent.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK ); + getContext().startActivity( intent ); + } + } diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppInfo.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppInfo.java index f1c3fe5aa9..3f0896a955 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppInfo.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppInfo.java @@ -43,4 +43,14 @@ public class AppInfo { public Drawable getIcon() { return mIcon; } + + @Override + public String toString() { + return "AppInfo{" + + "mName='" + mName + '\'' + + ", mPackageName='" + mPackageName + '\'' + + ", mVersionName='" + mVersionName + '\'' + + ", mVersionCode=" + mVersionCode + + '}'; + } } diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_apps.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_apps.png new file mode 100755 index 0000000000000000000000000000000000000000..80ecfda0bdfc99082228ffd6a1a69a856da44174 GIT binary patch literal 16180 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 KMNUMnLSTZ>DetQQ literal 0 HcmV?d00001 diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_music.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_music.png new file mode 100755 index 0000000000000000000000000000000000000000..8f5b1de38e0ddd3c21b0f031d9d9336d95017300 GIT binary patch literal 8963 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 IM6N<$g2kQAT>t<8 literal 0 HcmV?d00001 diff --git a/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps.xml b/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps.xml index d2d41058b9..b3c0033544 100644 --- a/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps.xml +++ b/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps.xml @@ -1,5 +1,18 @@ - - + + + + + + + + + + + + + + @@ -9,6 +22,5 @@ android:layout_width="match_parent" android:layout_height="match_parent" app:behavior_hideable="false" - app:behavior_peekHeight="76dp" - app:layout_behavior="@string/bottom_sheet_behavior" /> - \ No newline at end of file + app:behavior_peekHeight="76dp" /> + \ No newline at end of file diff --git a/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps_navigator.xml b/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps_navigator.xml new file mode 100644 index 0000000000..07f9fae0cc --- /dev/null +++ b/modules/mogo-module-apps/src/main/res/layout/module_apps_fragment_apps_navigator.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml b/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml index 3f995c1085..ade4edbf41 100644 --- a/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml +++ b/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml @@ -3,6 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:gravity="center" android:orientation="vertical"> + android:layout_height="wrap_content" + android:gravity="center" + android:maxLines="2" /> \ No newline at end of file diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/ModuleType.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/ModuleType.java index 9723e975e8..9d8995fa9c 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/ModuleType.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/ModuleType.java @@ -48,4 +48,9 @@ public interface ModuleType { * 小智、天气、时间等 */ int TYPE_EXTENSION = 8; + + /** + * 操作快捷入口 + */ + int TYPE_ENTRANCE = 9; } diff --git a/modules/mogo-module-extensions/build.gradle b/modules/mogo-module-extensions/build.gradle index fc86f87817..8b4348232b 100644 --- a/modules/mogo-module-extensions/build.gradle +++ b/modules/mogo-module-extensions/build.gradle @@ -27,13 +27,16 @@ android { } } + compileOptions { + targetCompatibility 1.8 + sourceCompatibility 1.8 + } + } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation rootProject.ext.dependencies.androidxappcompat implementation rootProject.ext.dependencies.androidxconstraintlayout implementation rootProject.ext.dependencies.arouter diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java index 7cf63d02b0..2d86954222 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsModuleConst.java @@ -8,9 +8,19 @@ package com.mogo.module.extensions; */ public class ExtensionsModuleConst { + /** + * 顶部UI + */ public static final String PATH_EXTENSION = "/extension/ui"; + /** + * 快捷操作入口：定位、 + */ + public static final String PATH_ENTRANCE = "/extension/entrance"; + public static final String TYPE = "extension"; + public static final String TYPE_ENTRANCE = "entrance"; + } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsPresenter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsPresenter.java index 682a3ea9eb..c668d6baf8 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsPresenter.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/ExtensionsPresenter.java @@ -104,7 +104,7 @@ public class ExtensionsPresenter extends Presenter< ExtensionsView > implements String temp = getContext().getResources().getString( R.string.module_ext_str_weather_temp_format, weatherInfo.getTemperature() ); Phenomena phenomena = Phenomena.getById( weatherInfo.getPhenomena() ); String desc = phenomena == null ? "" : phenomena.nameCn; - int resId = 0; + int resId = phenomena.resId; mView.renderWeatherInfo( temp, desc, resId ); } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java new file mode 100644 index 0000000000..336b8bf097 --- /dev/null +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -0,0 +1,146 @@ +package com.mogo.module.extensions.entrance; + +import android.os.Bundle; +import android.view.View; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import com.alibaba.android.arouter.launcher.ARouter; +import com.mogo.commons.mvp.MvpFragment; +import com.mogo.commons.mvp.Presenter; +import com.mogo.map.MogoLatLng; +import com.mogo.map.location.IMogoLocationClient; +import com.mogo.map.location.MogoLocation; +import com.mogo.map.navi.IMogoNavi; +import com.mogo.map.navi.IMogoNaviListener; +import com.mogo.map.navi.MogoNaviInfo; +import com.mogo.map.uicontroller.IMogoMapUIController; +import com.mogo.module.extensions.R; +import com.mogo.module.extensions.navi.NaviInfoView; +import com.mogo.service.MogoServicePaths; +import com.mogo.service.map.IMogoMapService; + +/** + * @author congtaowang + * @since 2020-01-07 + *

+ * 描述 + */ +public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresenter > implements EntranceView, IMogoNaviListener { + + + private View mSearch; + + private View mCommonAddress; + private View mHome; + private View mCompany; + + private View mUploadRoadCondition; + + private View mVRMode; + private View mMove2CurrentLocation; + + private NaviInfoView mNaviInfo; + private View mExitNavi; + + private IMogoMapService mService; + private IMogoMapUIController mMApUIController; + private IMogoLocationClient mMogoLocationClient; + private IMogoNavi mMogoNavi; + + @Override + protected int getLayoutId() { + return R.layout.module_ext_layout_entrance; + } + + @Override + protected void initViews() { + mCommonAddress = findViewById( R.id.module_map_id_common_address ); + + mSearch = findViewById( R.id.module_map_id_search ); + mSearch.setOnClickListener( view -> { + } ); + + mHome = findViewById( R.id.module_map_id_home ); + mHome.setOnClickListener( view -> { + } ); + + mCompany = findViewById( R.id.module_map_id_company ); + mCompany.setOnClickListener( view -> { + } ); + + mUploadRoadCondition = findViewById( R.id.module_map_id_upload_road_condition ); + mUploadRoadCondition.setOnClickListener( view -> { + } ); + + mVRMode = findViewById( R.id.module_map_id_vr_mode ); + mVRMode.setOnClickListener( view -> { + } ); + + mMove2CurrentLocation = findViewById( R.id.module_map_id_move2_current_location ); + mMove2CurrentLocation.setOnClickListener( view -> { + final MogoLocation location = mMogoLocationClient.getLastKnowLocation(); + if ( location != null ) { + mMApUIController.moveToCenter( new MogoLatLng( location.getLatitude(), location.getLongitude() ) ); + } + } ); + + mNaviInfo = findViewById( R.id.module_map_id_navi_info_panel ); + mExitNavi = findViewById( R.id.module_map_id_exit_navi ); + mExitNavi.setOnClickListener( view -> { + if ( mMogoNavi != null ) { + mMogoNavi.stopNavi(); + } + } ); + + } + + @NonNull + @Override + protected EntrancePresenter createPresenter() { + return new EntrancePresenter( this ); + } + + @Override + public void onActivityCreated( @Nullable Bundle savedInstanceState ) { + super.onActivityCreated( savedInstanceState ); + mService = ( IMogoMapService ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICES_MAP ).navigation( getContext() ); + mMApUIController = mService.getMapUIController(); + mMogoLocationClient = mService.getLocationClient( getContext() ); + mMogoNavi = mService.getNavi( getContext() ); + } + + + @Override + public void onInitNaviFailure() { + + } + + @Override + public void onInitNaviSuccess() { + + } + + @Override + public void onNaviInfoUpdate( MogoNaviInfo naviinfo ) { + if ( naviinfo == null ) { + return; + } + mNaviInfo.notifyChanged( naviinfo ); + } + + @Override + public void onStartNavi() { + mCommonAddress.setVisibility( View.GONE ); + mNaviInfo.setVisibility( View.VISIBLE ); + mExitNavi.setVisibility( View.VISIBLE ); + } + + @Override + public void onStopNavi() { + mCommonAddress.setVisibility( View.VISIBLE ); + mNaviInfo.setVisibility( View.GONE ); + mExitNavi.setVisibility( View.GONE ); + } +} diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java new file mode 100644 index 0000000000..c6061be280 --- /dev/null +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java @@ -0,0 +1,16 @@ +package com.mogo.module.extensions.entrance; + +import com.mogo.commons.mvp.Presenter; + +/** + * @author congtaowang + * @since 2020-01-07 + *

+ * 描述 + */ +public class EntrancePresenter extends Presenter { + + public EntrancePresenter( EntranceView view ) { + super( view ); + } +} diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceProvider.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceProvider.java new file mode 100644 index 0000000000..fdc5b86988 --- /dev/null +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceProvider.java @@ -0,0 +1,75 @@ +package com.mogo.module.extensions.entrance; + +import android.content.Context; +import android.os.Bundle; +import android.view.View; + +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; + +import com.alibaba.android.arouter.facade.annotation.Route; +import com.mogo.map.listener.IMogoMapListener; +import com.mogo.map.location.IMogoLocationListener; +import com.mogo.map.navi.IMogoNaviListener; +import com.mogo.module.extensions.ExtensionsModuleConst; +import com.mogo.service.module.IMogoModuleLifecycle; +import com.mogo.service.module.IMogoModuleProvider; +import com.mogo.service.module.ModuleType; + +/** + * @author congtaowang + * @since 2020-01-07 + *

+ * 描述 + */ +@Route( path = ExtensionsModuleConst.PATH_ENTRANCE ) +public class EntranceProvider implements IMogoModuleProvider { + + @Override + public Fragment createFragment( Context context, Bundle data ) { + EntranceFragment fragment = new EntranceFragment(); + fragment.setArguments( data ); + return fragment; + } + + @Override + public View createView( Context context ) { + return null; + } + + @NonNull + @Override + public String getModuleName() { + return null; + } + + @Override + public IMogoModuleLifecycle getCardLifecycle() { + return null; + } + + @Override + public IMogoMapListener getMapListener() { + return null; + } + + @Override + public int getType() { + return ModuleType.TYPE_ENTRANCE; + } + + @Override + public IMogoNaviListener getNaviListener() { + return null; + } + + @Override + public IMogoLocationListener getLocationListener() { + return null; + } + + @Override + public void init( Context context ) { + + } +} diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceView.java new file mode 100644 index 0000000000..9ea2e13101 --- /dev/null +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceView.java @@ -0,0 +1,12 @@ +package com.mogo.module.extensions.entrance; + +import com.mogo.commons.mvp.IView; + +/** + * @author congtaowang + * @since 2020-01-07 + *

+ * 描述 + */ +public interface EntranceView extends IView { +} diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java new file mode 100644 index 0000000000..a0c76b7dad --- /dev/null +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java @@ -0,0 +1,108 @@ +package com.mogo.module.extensions.navi; + +import android.content.Context; +import android.util.AttributeSet; +import android.widget.ImageView; +import android.widget.RelativeLayout; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.mogo.map.impl.amap.utils.IconTypeUtils; +import com.mogo.map.navi.MogoNaviInfo; + +import java.text.SimpleDateFormat; +import java.util.Calendar; + +/** + * @author congtaowang + * @since 2019-10-03 + *

+ * 描述 + */ +public abstract class BaseNaviInfoView extends RelativeLayout { + + public BaseNaviInfoView( Context context ) { + this( context, null ); + } + + public BaseNaviInfoView( Context context, @Nullable AttributeSet attrs ) { + this( context, attrs, 0 ); + } + + public BaseNaviInfoView( Context context, @Nullable AttributeSet attrs, int defStyleAttr ) { + super( context, attrs, defStyleAttr ); + } + + public void notifyChanged( MogoNaviInfo naviInfo ) { + + } + + protected void fillNextCrossTurning( TextView target, int nextIconType ) { + target.setText( "后" + IconTypeUtils.getNameByIconType( nextIconType ) ); + } + + protected void fillNextCrossIconType( ImageView target, int iconId ) { + if ( iconId > 0 ) { + target.setImageResource( iconId ); + } + } + + protected void fillNextCrossDistance( TextView target, TextView unit, int distance ) { + if ( distance >= 1000 ) { + target.setText( String.format( "%.1f", distance / 1000f ) ); + unit.setText( "公里" ); + } else { + target.setText( distance + "" ); + unit.setText( "米" ); + } + } + + protected void fillFormatSurplusDistance( int m, StringBuilder builder ) { + if ( m >= 1000 ) { + builder.append( String.format( "%.1f公里", m / 1000f ) ); + } else { + builder.append( m ).append( "米" ); + } + } + + protected void fillFormatTime( int seconds, StringBuilder builder ) { + int days = seconds / ( 24 * 60 * 60 ); + if ( days > 0 ) { + builder.append( days ).append( "天" ); + } + seconds -= days * 24 * 60 * 60; + int hours = seconds / ( 60 * 60 ); + if ( hours > 0 ) { + builder.append( hours ).append( "小时" ); + } + seconds -= hours * 60 * 60; + int min = seconds / 60; + builder.append( min > 1 ? min : 1 ).append( "分钟" ); + } + + protected void fillArriveTime( int seconds, StringBuilder builder ) { + + int days = seconds / ( 24 * 60 * 60 ); + if ( days > 0 ) { + builder.append( days ).append( "天后" ); + } else { + seconds -= days * 24 * 60 * 60; + int hours = seconds / ( 60 * 60 ); + seconds -= hours * 60 * 60; + int min = seconds / 60; + Calendar calendar = Calendar.getInstance(); + int curHour = calendar.get( Calendar.HOUR_OF_DAY ); + int curMin = calendar.get( Calendar.MINUTE ); + if ( curHour + hours + ( curMin + min ) / 60 > 24 ) { + builder.append( "一天后" ); + } else { + calendar.add( Calendar.HOUR_OF_DAY, hours ); + calendar.add( Calendar.MINUTE, min ); + SimpleDateFormat dateFormat = new SimpleDateFormat( "HH:mm" ); + builder.append( dateFormat.format( calendar.getTime() ) ); + } + } + builder.append( "到达" ); + } +} diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/NaviInfoView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/NaviInfoView.java new file mode 100644 index 0000000000..8c34869f9c --- /dev/null +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/NaviInfoView.java @@ -0,0 +1,100 @@ +package com.mogo.module.extensions.navi; + +import android.content.Context; +import android.util.AttributeSet; +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.mogo.map.navi.MogoNaviInfo; +import com.mogo.module.extensions.R; + +/** + * @author congtaowang + * @since 2019-09-29 + *

+ * 导航信息 + */ +public class NaviInfoView extends BaseNaviInfoView { + + private ImageView turnIcon; + private TextView distance; + private TextView distanceUnit; + private TextView nextRoad; + private TextView estimateInfo; + + private StringBuilder mBuilder = new StringBuilder(); + + public NaviInfoView( Context context ) { + this( context, null ); + } + + public NaviInfoView( Context context, @Nullable AttributeSet attrs ) { + this( context, attrs, 0 ); + } + + public NaviInfoView( Context context, @Nullable AttributeSet attrs, int defStyleAttr ) { + super( context, attrs, defStyleAttr ); + View.inflate( context, R.layout.module_map_layout_navi_info_panel, this ); + turnIcon = findViewById( R.id.module_map_id_navi_next_info_road_turn_icon ); + distance = findViewById( R.id.module_map_id_navi_next_info_distance ); + distanceUnit = findViewById( R.id.module_map_id_navi_next_info_distance_unit ); + nextRoad = findViewById( R.id.module_map_id_navi_next_info_road ); + estimateInfo = findViewById( R.id.module_map_id_navi_arrive_destination_estimate_info ); + } + + @Override + public void notifyChanged( MogoNaviInfo naviInfo ) { + super.notifyChanged( naviInfo ); + if ( naviInfo == null ) { + return; + } + fillNextCrossDistance( distance, distanceUnit, naviInfo.getCurStepRetainDistance() ); + fillNextCrossIconType( turnIcon, naviInfo.getIconResId() ); + nextRoad.setText( naviInfo.getNextRoadName() ); + + try { + mBuilder.delete( 0, mBuilder.length() ); + } catch ( Exception e ) { + e.printStackTrace(); + } + mBuilder.append( "剩余" ); + fillFormatSurplusDistance( naviInfo.getPathRetainDistance(), mBuilder ); + mBuilder.append( " " ); + fillFormatTime( naviInfo.getPathRetainTime(), mBuilder ); + mBuilder.append( "\n" ); + fillArriveTime( naviInfo.getPathRetainTime(), mBuilder ); + + final String text = mBuilder.toString(); + estimateInfo.setText( text ); + } + + /** + * 获取当行信息 + * + * @return + */ + public String getGuideInfo() { + StringBuilder builder = new StringBuilder(); + if ( getVisibility() == VISIBLE ) { + builder.append( distance.getText() ); + builder.append( nextRoad.getText() ); + } + return builder.toString(); + } + + /** + * 获取剩余里程 + * + * @return + */ + public String getPathRetainDistance() { + StringBuilder builder = new StringBuilder(); + if ( getVisibility() == VISIBLE ) { + builder.append( estimateInfo.getText() ); + } + return builder.toString(); + } +} diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/weather/Phenomena.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/weather/Phenomena.java index fd39a92327..8b2f0fca5f 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/weather/Phenomena.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/weather/Phenomena.java @@ -2,6 +2,8 @@ package com.mogo.module.extensions.weather; import android.text.TextUtils; +import com.mogo.module.extensions.R; + import java.util.HashMap; import java.util.Map; @@ -9,68 +11,70 @@ import java.util.Map; * @author Lzq */ public enum Phenomena { - Sunny( "00", "晴", "Sunny" ), - Cloudy( "01", "多云", "Cloudy" ), - Overcast( "02", "阴", "Overcast" ), + Sunny( "00", "晴", "Sunny", R.drawable.ic_sunny ), + Cloudy( "01", "多云", "Cloudy", R.drawable.ic_cloudy ), + Overcast( "02", "阴", "Overcast", R.drawable.ic_overcast ), - Shower( "03", "阵雨", "Shower" ), - Thundershower( "04", "雷阵雨", "Thundershower" ), - ThundershowerWithHail( "05", "雷阵雨伴有冰雹", "Thundershower with hail" ), - Sleet( "06", "雨夹雪", "Sleet" ), - LightRain( "07", "小雨", "Light rain" ), - ModerateRain( "08", "中雨", "Moderate rain" ), - HeavyRain( "09", "大雨", "Heavy rain" ), - Storm( "10", "暴雨", "Storm" ), - HeavyStorm( "11", "大暴雨", "Heavy storm" ), - SevereStorm( "12", "特大暴雨", "Severe storm" ), + Shower( "03", "阵雨", "Shower", R.drawable.ic_shower ), + Thundershower( "04", "雷阵雨", "Thundershower", R.drawable.ic_thundershower ), + ThundershowerWithHail( "05", "雷阵雨伴有冰雹", "Thundershower with hail", R.drawable.ic_thundershower ), + Sleet( "06", "雨夹雪", "Sleet", R.drawable.ic_snow ), + LightRain( "07", "小雨", "Light rain", R.drawable.ic_light_rain ), + ModerateRain( "08", "中雨", "Moderate rain", R.drawable.ic_light_rain ), + HeavyRain( "09", "大雨", "Heavy rain", R.drawable.ic_heavy_rain ), + Storm( "10", "暴雨", "Storm", R.drawable.ic_heavy_rain ), + HeavyStorm( "11", "大暴雨", "Heavy storm", R.drawable.ic_heavy_rain ), + SevereStorm( "12", "特大暴雨", "Severe storm", R.drawable.ic_severe_storm ), - SnowFlurry( "13", "阵雪", "Snow flurry" ), - LightSnow( "14", "小雪", "Light snow" ), - ModerateSnow( "15", "中雪", "Moderate snow" ), - HeavySnow( "16", "大雪", "Heavy snow" ), - Snowstorm( "17", "暴雪", "Snowstorm" ), + SnowFlurry( "13", "阵雪", "Snow flurry", R.drawable.ic_snow ), + LightSnow( "14", "小雪", "Light snow", R.drawable.ic_snow ), + ModerateSnow( "15", "中雪", "Moderate snow", R.drawable.ic_snow ), + HeavySnow( "16", "大雪", "Heavy snow", R.drawable.ic_snow ), + Snowstorm( "17", "暴雪", "Snowstorm", R.drawable.ic_snow ), - Foggy( "18", "雾", "Foggy" ), - IceRain( "19", "冻雨", "Ice rain" ), - Duststorm( "20", "沙尘暴", "Duststorm" ), + Foggy( "18", "雾", "Foggy", R.drawable.ic_fog ), + IceRain( "19", "冻雨", "Ice rain", R.drawable.ic_heavy_rain ), + Duststorm( "20", "沙尘暴", "Duststorm", R.drawable.ic_duststorm ), - LightToModerateRain( "21", "小到中雨", "Light to moderate rain" ), - ModerateToHeavyRain( "22", "中到大雨", "Moderate to heavy rain" ), - HeavyRainToStorm( "23", "大到大雨", "Heavy rain to storm" ), - StormToHeavyStorm( "24", "暴雨到大暴雨", "Storm to heavy storm" ), - HeavyToSevereStorm( "25", "大暴雨到特大暴雨", "Heavy to severe storm" ), + LightToModerateRain( "21", "小到中雨", "Light to moderate rain", R.drawable.ic_moderate_rain ), + ModerateToHeavyRain( "22", "中到大雨", "Moderate to heavy rain", R.drawable.ic_heavy_rain ), + HeavyRainToStorm( "23", "大到大雨", "Heavy rain to storm", R.drawable.ic_heavy_rain ), + StormToHeavyStorm( "24", "暴雨到大暴雨", "Storm to heavy storm", R.drawable.ic_severe_storm ), + HeavyToSevereStorm( "25", "大暴雨到特大暴雨", "Heavy to severe storm", R.drawable.ic_severe_storm ), - LightToModerateSnow( "26", "小到中雪", "Light to moderate snow" ), - ModerateToHeavySnow( "27", "中到大雪", "Moderate to heavy snow" ), - HeavySnowToSnowStorm( "28", "大到暴雪", "Heavy snow to snowstorm" ), + LightToModerateSnow( "26", "小到中雪", "Light to moderate snow", R.drawable.ic_snow ), + ModerateToHeavySnow( "27", "中到大雪", "Moderate to heavy snow", R.drawable.ic_snow ), + HeavySnowToSnowStorm( "28", "大到暴雪", "Heavy snow to snowstorm", R.drawable.ic_snow ), - Dust( "29", "浮尘", "Dust" ), - Sand( "30", "扬沙", "Sand" ), - SandStorm( "31", "强沙尘暴", "Sandstorm" ), + Dust( "29", "浮尘", "Dust", R.drawable.ic_dust_sand ), + Sand( "30", "扬沙", "Sand", R.drawable.ic_dust_sand ), + SandStorm( "31", "强沙尘暴", "Sandstorm", R.drawable.ic_duststorm ), - Densefog( "32", "浓雾", "Dense fog" ), - StrongFog( "49", "强浓雾", "Strong fog" ), - DenseFog( "57", "大雾", "Dense fog" ), - ExtraHeavyFog( "58", "特强浓雾", "Extra heavy fog" ), + Densefog( "32", "浓雾", "Dense fog", R.drawable.ic_fog ), + StrongFog( "49", "强浓雾", "Strong fog", R.drawable.ic_fog ), + DenseFog( "57", "大雾", "Dense fog", R.drawable.ic_fog ), + ExtraHeavyFog( "58", "特强浓雾", "Extra heavy fog", R.drawable.ic_fog ), - Haze( "53", "霾", "Haze" ), - ModerateHaze( "54", "中度霾", "Moderate haze" ), - Severehaze( "55", "重度霾", "Severe haze" ), - SevereHaze( "56", "严重霾", "Severe haze" ), + Haze( "53", "霾", "Haze", R.drawable.ic_haze ), + ModerateHaze( "54", "中度霾", "Moderate haze", R.drawable.ic_haze ), + Severehaze( "55", "重度霾", "Severe haze", R.drawable.ic_haze ), + SevereHaze( "56", "严重霾", "Severe haze", R.drawable.ic_haze ), - Unknown( "99", "无", "Unknown" ), + Unknown( "99", "无", "Unknown", R.drawable.ic_unknown ), - Rain( "301", "雨", "rain" ), - Snow( "302", "雪", "snow" ); + Rain( "301", "雨", "rain", R.drawable.ic_heavy_rain ), + Snow( "302", "雪", "snow", R.drawable.ic_snow ); public final String id; public final String nameCn; public final String nameEn; + public final int resId; - Phenomena( String id, String nameCn, String nameEn ) { + Phenomena( String id, String nameCn, String nameEn, int resId ) { this.id = id; this.nameCn = nameCn; this.nameEn = nameEn; + this.resId = resId; } static Map< String, Phenomena > mPhenomenas; diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_cloudy.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_cloudy.png new file mode 100755 index 0000000000000000000000000000000000000000..fee3071109195c5bab11de10e80600373977a82a GIT binary patch literal 988 zcmV<210(#2P)Px&mPtfGR9Fe^ms>~_Q5eU+v#YjLWEV6_yyR``At8z~^0JE{hV>GJ77-E=y+jZc zz6eGyK_Nt8k-hX3(Zz}=LX9PR$RfKv#HyB`q7j{%3V_R(E#JBC`_Af&ZR8 z=ezyp+nF;gkv;4V*d4GtV0Xao!2i?%=G{*2DNj{lmcA-}(#N6d7^@$5dACs4U?*v# zx6EQWP?AU8Lw(#`a)7zsl*!b=te~OY$%(KPKt5A67`#Q+%jm9 z<9kXZt_NW!_@EIqcY6u}yJOPsI3~p9aU6(2@OV;Jnr974RJB(4-$?E^DSk=B+%b9d=ZJYda`>BEKoeC5w;HF)I?OAu4j+OhNH{Y^p6_$GA$+9- z4PXz#?m)@m;fAY+uv7tj7~n3-N*Nd8hNk!CUauP`Ngd$#;DU6&xTq2CCs#S(*#z4p zUy>^z(jR>b#hV^^0M3VVGo%VEb8m;5plY$kH-;QeX3E1l6Z#Il#Rd5>?_yv=tXk*vLWs%^|HU1L$7??kqOL)5+^lvo2XzT z;b|+0r*iu-FAjotmE7fzmCIDv41JL7K^&lEiAzD~!SY3hFgioj(*wy~z!y)kiMG8)jb-GIMVG=6D=T4w*ArSM1sza77!(#$)oD1(zwi~%ZKEIy_hpAY(ST*` zS)JAcq3dh0-Uy}X_bvGT1vy^=_MHW}?UZ&0><-u+usaav4*UheM{21PY)obV0000< KMNUMnLSTYJ(8hZJ literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_dust_sand.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_dust_sand.png new file mode 100755 index 0000000000000000000000000000000000000000..d6bdc42cc54add433e55cce25d97ca7597ecbf82 GIT binary patch literal 551 zcmV+?0@(eDP)Px$;Ymb6R9Fe^Rk2C~K@fctLR6w5g<@fC{EbwC2!e(Fg@uicU}a-r<44#ig5U?3 zSosSoSg9!zjhDojTyo=FV0Z5zn7#NGcb33>YBz}$Ag}Px1ur3$xC-5JYI#jqERo*fZw8g zSNMsdGjbqxE0vT_xk=cym# z6{rL1!2fh0IT4@B^JoostbEEes8l&ISQ4*@{&3e|fIM2M9veJL%=hk|!N`y#X7$Km z=B*s=YWoI*$d|-Cw0KOB{K;zv3v%zk-Q_S5t!Sx>F`f`6q7{uc@-aT(FcGb2)O%Ag zUgA^mMA4}XmsE;Q9uLabfsShzaYNb{T}_!o$Ai5niCJ{uMR=yL{cbh=e(b)?v?H}r z2h@Ro>p*fMGKb-?_=j)sNkq>-`afpgmfv5l+a$rM43|`j{?1J2q+N4KE&D~@mzj>I p>MuTAAEgec1L}Y}pbm_6;0pxi0FsiEqDKG#002ovPDHLkV1m|G`&j@0 literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_duststorm.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_duststorm.png new file mode 100755 index 0000000000000000000000000000000000000000..510d168d17c72d5612e41c0708747fa1e80e597b GIT binary patch literal 754 zcmVPx%tVu*cR9Fe^SW9RVQ4~FQCWRzosS4JG(jrN!3vnk1MzlK-6m+L<+_-b2A_^|t zRRlNwaO1)+h>9)*cP6B$pa_DBt+C# z$@>fe^hZ0O9ncPF2ebn*J3uk>bwtNscMQVDS}@hn%j2}VIMq?(LeZj%=1=+k0G$JK z#v^h@utz}RI1N4f;lbO6iz1r&NDsp30J~ZYb2_Z2`%Z_=E;%`~ld?3fI%S04;N*K} z91yrq7m#c~{B8FN)Ta)$N&gK@V0!>F_C6sQbcyIZWuMmFu^L5+MtyRP?EZ^tYg`C> zh^T<<@CZ=yU~2f!mq$|)$)!%Xgq3}JiO$-p%vL1Y=^mqoS^HIMTO1=6i|Lmzy#tIp zlq~A2bQ7(k?$T{86JRT-3oZPYjWG&_2OLK)eD|};>DUV;T~m6SNyoVUl(LE znk~3to~BIUc?;$nM4uj(m6mfl@9UGf3{_mxPM{i4%XqEyHvpz>E!TGwn`^xJg?|2z zb2?O_nv8Zjm6|}cc0y@21FkKrUX`Cftu>4{N`C_|=%idLKI0M}0&6v>9q7z~=p&DL zlTaP#j4qa{n?&?6j465}0vm}6tT%ZZ2$lO07*qoM6N<$g7sHai~s-t literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_fog.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_fog.png new file mode 100755 index 0000000000000000000000000000000000000000..53d738e1711328bcc041014cf86d03517d280533 GIT binary patch literal 449 zcmV;y0Y3hTP)Px$dr3q=R9Fe^mrY6oK@f#!#HhG-6M~+@pUvz%fZz#&H^@>1FOXBXaqr5#>v#ec zAuCY{fuLZOk41yRPdF z`2ncF7O;#tWFv50mgT1zF`_TQs^eBGcte%!V7QtZt`SYAK2IlUK=d70 zRa_;Bh>Ap~QQD<`9L=#FzT&p(38s8p-cdQRRvPg=MdPI5rc{LsU$}iv-4Li85xD>U rZe0jPx&U`a$lR9Fe^m(NO7Q544SEukV(YZ4Ta5lI$OleC1&xj9LQ!pLW6EaVH+%tt6n zsRj`=i7*?K4Z;wls0gznqXKIn6=lCK@4l?F&e`YQ3sIA^;A5{p-&$+C&i3qcOQk}J z2^143CQwYEm_RXsQmNd?5LQ-JcEdjgwu80c9e7YKm!GiKCDhmt@i5p1euB5)9yOk` z{ym}50GI(Wc|qVTSd-ON{z_cDn5h0hR(?Z1imV5hV_h=*ckpetO=JW4>lO7|Z)?=8 zlh_2Znl0eJ4Q_#~$<5;5q()kSY%j`FzUru+7xitbd$WN^(nVM44R(KshZSEhm~-4~ zisQTP{Nm|6Cj?(VP<<;G5~NxNnH}JVsW64!8p|W5V>Ds-QqMVC@#teG)(X@oi28TL zdZzr4$3iCSSJ0j!IR~5;U?25+>>%>DxRjI$ryZzYkg*gg<{-m1ABpk2pS+>ajrEt& zhdeiClQUxSUdMO|KM9(cm97LK#~`WMCK|mtCoK^or_1C?O+BHk_v+R}l~QTJ*-?`V z;tRngM_8)(ojYp!ettittWB%2l}4tddK+!BY^Igf$I+^$@8|cEx#KCN0ygy~g z7z|mJb=1{Qnec{Pj{O4^8croS2b@t6jSMG-SDe2|>j*mhQ|KFl&AJTtsl8|Rjnz~XmcBC6l zx0n_G&1+-NFg_Z`C!>2+b$o60E2Nk}F@a(N#RQ58{M!lq2B^mAHb8jAMF0Q*07*qo IM6N<$f`{z5EdT%j literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_heavy_rain.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_heavy_rain.png new file mode 100755 index 0000000000000000000000000000000000000000..041b44358b26b62394ce4d64fcfeb1133464ce98 GIT binary patch literal 801 zcmV++1K#|JP)Px%+et)0R9Fe^S4(RXQ5e17O>DEYC>RM8v(avB7L^L(ql@ZF&?qVDLR?r2mO}S} z^bZsiT?wKR!Ht6G!i6Ac9#RxsNKsS-&4W~mh# zd8y`1u5K-r+n^(9Fq{W`e+k(rvCGD{=4whBDvuy*SXJz^KdkEClr)MCs|vf|FRNxa zkseePcEMj#&2S>!o7d_(+n249&Z!E0_OGJefD3&C#&-IaNNqUgDimH zsLv$L?U!&e1kyjuPV?GHX_mm-J&Y!3 z7{K}*Fb3=f^chwa86q}d*FS-KAB3+!^f4TpHLv39@mM0y}Z zQ=HRukb;LEY~R0V9g_^leu+MQ1ixyQbAE7+sAA1|7&&kcv12^ICpSfc7p-x9t`*P< fXa%$abqf3eN~uxHx#2@H00000NkvXXu0mjf_V{$I literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_light_rain.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_light_rain.png new file mode 100755 index 0000000000000000000000000000000000000000..bd633baec468b30b3e2fe74afd4e2b73b7e12ac0 GIT binary patch literal 631 zcmV--0*L*IP)Px%F-b&0R9Fe^S3OGuK@hz)q97K678W9=iD^uusGvoPq!26;L9w*b*3wGz2du2c z!dNK?YL`k95HVmO0TsJ^;1@w`Bp>OUJWbK!@R&2_#b&StVp-# zSp8;u(J1L8FHo{Shx`#<4J)OOc!84rJ9uT~ZV$^=h7NKGf|HU->eD}A;s)tAy;DE7 zQktz@243|+631!e_L>p4T^njo05^b4J4NylJESbP$4?R@bYQ#!c!4p1eKs{??9cW9 z+yY^!d)-X3{~a4l$NV8mJO6|V*h(ajj&22$QMLtyn{X9YGx457M`RoR^Mu~7aNXlz~P|_gks``aQyQ`WDnusQS zSm8yqB5`yaROSK)whtG(H3P}m93k2)cJ$ft&Px%F-b&0R9Fe^S3OGuK@hz)q97K678W9=iD^uusGvoPq!26;L9w*b*3wGz2du2c z!dNK?YL`k95HVmO0TsJ^;1@w`Bp>OUJWbK!@R&2_#b&StVp-# zSp8;u(J1L8FHo{Shx`#<4J)OOc!84rJ9uT~ZV$^=h7NKGf|HU->eD}A;s)tAy;DE7 zQktz@243|+631!e_L>p4T^njo05^b4J4NylJESbP$4?R@bYQ#!c!4p1eKs{??9cW9 z+yY^!d)-X3{~a4l$NV8mJO6|V*h(ajj&22$QMLtyn{X9YGx457M`RoR^Mu~7aNXlz~P|_gks``aQyQ`WDnusQS zSm8yqB5`yaROSK)whtG(H3P}m93k2)cJ$ft&Px&TS-JgR9Fe^R$WMwQ5b&Dx7l)%B4&w8C5nVfqQDEIi=s5aNjEhJb4ZvW{X!Iq z5MFd)L=aJVQIMuq6kX-CC@=_C82uSUkr~Yefgx1>5c@ejN1Cj&Z#z!5dGo#Suyf9P zp7(utIN!^Nj4&K9955U(955U(955V6odYact%@FWZ3_5b@oQr3lFwup*J=p>B-Q%2ZQwf0Zb7l7Q z=DW-hP~FwbYkG(CIm^u}o`91#iP#qvKS;ro&s8vE zui_MbKLR&^YY;La&TaQQcSCd!C%#DR;|WIWIiobEx4Pz&9&b*fAy(XL1)700AX=7bD$e*I3uk z%b5G(HLgAd8i2(T?H%^@5I!i*3tSz01DtyBK}P5?Yvu}1Rqdm2zG~#{$L0A57Ckls zM*&%|$dv$Ym?G-aXjR=UsJ$T8a`?GFM?O=Du967}+>3E|3BuQln#^oHgQ+ns*Jmb% z5BUF3i54R+nIUFY*`e z@osiRxF5<#{GyNsdshNR literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_severe_storm.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_severe_storm.png new file mode 100755 index 0000000000000000000000000000000000000000..e7a3cf6b4d7b9401942a1eabaf8103d36d78a5cf GIT binary patch literal 987 zcmV<110?*3P)Px&l}SWFR9Fe^SX)RGQ5Zh|nbF-KNfC5&Mc9W*h>}PWOwET30>Rd0#Udg|6OzEU z9wPB2dWtRvLQj^054IQ~^icHRUcv}^(Tc9r&Mq1jK}2ot&fh=EdYRobyJOB%b6)10 z@4tQf&Ci*0mN9$S3fKzR3fKzR3fKxT23CvURi;akB{~408j*PzvSJ1pr@C(>&L0FS z8lIcwU>Rxu+_Yygndk>(oyeF|OblKEunQBFjgw-Z^%hG=dzD}-sd|?&ELmSpyaM2( zmG1JcLD-QHdo5cwopier>QNaEF+|h3DPT&jENvNw-G7XT%SJ|#&5yH%s`9m(aVTRd z`%x%uc|TTByWook>r}*>q_AniS}kg$rlj(1h^A*mwKd#Sa(eAMDdZ9|Y$GL$RuThf zEW=dQLpJvczQKvap(WsMd@Ks*B7+{M*WO2jW)ans>j-O()C!2$uo;B4bSafx(Vn7_ z7in*7s$WI*8Y#JeF zY7K`d(0Ux7ifR~=rVmC`6lgJ?kP01-L^TXaV*$S>3bYa@u?EM>4s5JFCR_(+D8Vx; z31;L5nBTUw=yC?W1~61w^OFl4opeH3SQBH}6d1%LE;SFA?E7w1Bq!-{SKUXtVH~A| zGe(L2)keF;q(hb)0u}YIbLFD9pWpB!N~w7GG#&1n>4db0qKfm26nZ7-fc1{Vc+Ei? z4Y=!H2tEI61MT5C-_mCJ=!MSN)A|5yt({4{O87=LTNyrb)NQLnl}Y!*qkrdTG^qp9o(kmG98iAnW)s%W$OGE|dvn5O_p%Jnj*KB}1!^a;FRV9C=B9vk2TIO`QgddS?`8CX( z(f}9Ji8$b=^gR94{_98+)-aS=hR>p^c9G8#VMZU4VetG;$LISrM;aL^L<3k7IDeuq z;$+S*w1s_G_JPke;kCEi`&me1+!_S#m!R=`%kR$!e1e*wC_A|}MFgFXNN002ov JPDHLkV1n_-!hiq( literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_shower.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_shower.png new file mode 100755 index 0000000000000000000000000000000000000000..845717f32ef9789145e8b629f895be4c8a199c93 GIT binary patch literal 967 zcmV;&133JNP)Px&fk{L`R9Fe^SY1dIQ4~IR*G&vb2*NB0&D5uapdc#OG75wW*Yc%@pdg{Qh=QU( zr5}0_3Zl0P3-d+7pkB(L+LemvA)-Hb)x=H3%9YAU*WEpRcm2b4cD&=xNDp)1V`lC> z=eys2d*<%U64_xpU^`$tV5tKfC@)}tX$yChdGr?IfO{VYDwgTxq&nwNCJ>QqVmd&A zFEUpmV9>qp{%q+BW%otM^E!KHokPr{BXeMP63u@11!6v{t3!weQRF?9n1dcq!&ojL*Bn6mj3(x& zUMu%Bca?2|&nhnFFxSO-Av6!T1av}>6!`_{2L58~9dI64g=<5hESjQx1Ydt*ei+6L z!Mj*|Rfo7kh2@8cYF!X>4P#w^{GbIu;*PT(W9NWQZ60n4hNO*a{dGj1t-nG=sAed=uZC z95o|Ax)Hbu^a4>J1`GgAzk(KmSC5@zC}m!3d$qt~#C0s9Vx-z<0-1a+4qK#r7`!LdluW!usOI7k zl#7sj3@8EefmB=xq23R?25z7we&J}xf*kPlweP|!N%Cj*1+iLGgfx&^Knq z5~jOQ)Bk2^)z|hWyo7o1AJdQjUUc=h51HS?p*AMoEX4{IgI0)6X^AO@62q`Ez{BjMTFCFclz4IlX>4Px&zez+vR9Fe^m`zAjQ51lkeh>l+63Tuk2wX^IL_dqNjf=vCt7y^Bt~P?%EL1m4x2Yu9*Pq`qULH-z` ztHRbxS?{-LowjE58EMxh?2tTgpzP`Nyt!7kRxiKY&QT~rcyo71JR zdO!7bW?bMyZAB@WR95jZe6SNxw}FpQ_r(vmiVh=i3u>*eg6m9h090!11Q>1L+DFPM z0m~R{M@)we)=xonoHxKKH`#LZNjG7OKLK_LT(*eH07|eWv_G~hu0y}EZN|1k>v@+r zSqa}k_UtJr2fgvS!yMCo5>!Hipz*WoaEY=KF2Dr5hJ|5%bGG5&kaI?nl6U-eIsFIa zBHtOdDcK{Wy~d4~q63CZU3_l!$IQ5nlZ|l4IJRn??~ul9LAN*ue~ly2J3(@O;RJ_r z6AprvXH+WfEYvdwO!EwtwNa=G`6L127W`B ze8boUO|U*{(A^<3$c-ua^$FO&_zm^FV1r&u{V03|6}k9(&;wx?(H=EuS;0T>0NP;} z1UDc0c6bCO#GRe2{m)k8P4>~R6Uo!pp$VepY41kckHca-5oKG1zF67$XQbnBx_6JXoJxPYJ%WR+ zPD*Q%=_(Gi# z593Rv@MlCDIJ3xpE#ztZHvWox8rKV8qTrhadL0ad$SAa>wEsV?Mwgq|J`DpO>bE2% zLCl{oOm;;Gyb9#iGxaTxGA-p{lTTweVfMe}Y48LSd=W)Y3tIZwJ~}R+GVQ^Tj}sX~ z?oFDp@6pe@y5#qiczx6ym+=b3D-f?hiB{kr5ksM9MtT%@00000NkvXXu0mjfeQo5m literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_sunny.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_sunny.png new file mode 100755 index 0000000000000000000000000000000000000000..287ce9cc3049d9b6ca997477f37389407ad80341 GIT binary patch literal 913 zcmV;C18)3@P)Px&OG!jQR9Fe^SxsmYK@@&(lh&dsu?Rg>=s}YR-aLw$R%=BNFFklu(L+JJ_;c{$ zQ4c-%a}luzOZB9OUPO_$(X=Way$L4OL&1UpsiCd3O*79o6S8hrGMn8F(a63-cyIR2 zH{ZUUo%byP2raBYSb@J@0W{5k7EW%31~6(NmR7oWV9Xv| zTA5XYeouFaA{4Ew_6@{24h_Kb$fHk3c0wvqKpZXU3P!o3y8zaQ zIOiA;^)mDh0QwGy^E@^Q&_02w=`UIg8g7H!TsQ7{^;MUrB~3&K`Sg1rj6=k_jEU?^ zHyF(i_Q2}u4IV!W1odBR1i?Au(9v-nd#4uuz?thm4rOr%kcyC;-H(Xm&Z)+F()qsA zAjG3;GFR<6MB1+4?o3XO(cIw!AT}nLY`2}`}c_0Pl(rtb^C+w+~ zbq13&kL}py)US*}q=Pm261ZHtrYyEnvMYpIj%8eFU&BVQNNp(YoeI zTFxZuk3ya<@O~4RoV`c6Ll2qoxw@#0UO*Vb)SL5^PhaHs#)2f?N6c<`O>c;_6QpuV ztmT=serq`=)$`TMxh3g!s<@{ISeTDB6NDubg`x7cH zsq`?*OO~o@m0_R1a-Ni@QdcvcA}k@~I=r4*R|Baf&7|Je%td^`3U5S?DLrgO29#Q> zN%9Dko{kJu^|Zp1xK4Ag>%7LkRxq{Xmy5i?$~U6;<|P@M`Hko*d~1Z-?GfY_sL&sS zA`RPf<2Z`l*=0L6;52kj`&wtwiUX8x*>e`#p0IC}wEpz4SN^x0kaV-2hxt9-xowgE n3HYr`VjPDSRv@gv|5t%uzYa_x2|*f?00000NkvXXu0mjfa;dNi literal 0 HcmV?d00001 diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_thunder.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/ic_thunder.png new file mode 100755 index 0000000000000000000000000000000000000000..ebc955f081b5115d7ef6c1ba63c2bb85b157238e GIT binary patch literal 772 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 literal 0 HcmV?d00001 diff --git a/modules/mogo-module-map/src/main/res/drawable-xhdpi/module_map_ic_company.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_map_ic_company.png similarity index 100% rename from modules/mogo-module-map/src/main/res/drawable-xhdpi/module_map_ic_company.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_map_ic_company.png diff --git a/modules/mogo-module-map/src/main/res/drawable-xhdpi/module_map_ic_home.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_map_ic_home.png similarity index 100% rename from modules/mogo-module-map/src/main/res/drawable-xhdpi/module_map_ic_home.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_map_ic_home.png diff --git a/modules/mogo-module-map/src/main/res/drawable-xhdpi/module_map_ic_move2_current_location.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_map_ic_move2_current_location.png similarity index 100% rename from modules/mogo-module-map/src/main/res/drawable-xhdpi/module_map_ic_move2_current_location.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_map_ic_move2_current_location.png diff --git a/modules/mogo-module-map/src/main/res/drawable-xhdpi/module_map_ic_search.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_map_ic_search.png similarity index 100% rename from modules/mogo-module-map/src/main/res/drawable-xhdpi/module_map_ic_search.png rename to modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_map_ic_search.png diff --git a/modules/mogo-module-map/src/main/res/drawable/module_map_dw_common_corner_bkg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_map_dw_common_corner_bkg.xml similarity index 100% rename from modules/mogo-module-map/src/main/res/drawable/module_map_dw_common_corner_bkg.xml rename to modules/mogo-module-extensions/src/main/res/drawable/module_map_dw_common_corner_bkg.xml diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_map_dw_navi_info_extras_bkg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_map_dw_navi_info_extras_bkg.xml new file mode 100644 index 0000000000..cc7147c272 --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/drawable/module_map_dw_navi_info_extras_bkg.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_map_dw_navi_info_panel_bkg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_map_dw_navi_info_panel_bkg.xml new file mode 100644 index 0000000000..f21cba570e --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/drawable/module_map_dw_navi_info_panel_bkg.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-map/src/main/res/drawable/module_map_dw_upload_road_condition_bkg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_map_dw_upload_road_condition_bkg.xml similarity index 100% rename from modules/mogo-module-map/src/main/res/drawable/module_map_dw_upload_road_condition_bkg.xml rename to modules/mogo-module-extensions/src/main/res/drawable/module_map_dw_upload_road_condition_bkg.xml diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml new file mode 100644 index 0000000000..7b3d2a893d --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml index 05ec75c36a..758656e960 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml @@ -4,6 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="@dimen/dp_120" + android:background="#0C0C0C " android:orientation="vertical" android:paddingLeft="@dimen/dp_70" android:paddingRight="@dimen/dp_70"> @@ -13,6 +14,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/module_ext_ic_voice" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -24,9 +26,9 @@ android:text="@string/module_ext_str_voice_msg" android:textColor="@color/module_ext_color_voice_text" android:textSize="@dimen/dp_32" - app:layout_constraintBottom_toBottomOf="@+id/module_ext_id_voice" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@+id/module_ext_id_voice" - app:layout_constraintTop_toTopOf="@+id/module_ext_id_voice" /> + app:layout_constraintTop_toTopOf="parent" /> + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values/strings.xml b/modules/mogo-module-extensions/src/main/res/values/strings.xml index 09466eae59..c64b22ee19 100644 --- a/modules/mogo-module-extensions/src/main/res/values/strings.xml +++ b/modules/mogo-module-extensions/src/main/res/values/strings.xml @@ -14,4 +14,7 @@ 周六 ··· + + 搜索目的地 + 上报\n路况 diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index 5d96764978..9a26f2fbe9 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -4,7 +4,6 @@ import android.os.Bundle; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.viewpager.widget.ViewPager; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.mvp.MvpActivity; @@ -19,6 +18,7 @@ import com.mogo.module.extensions.ExtensionsModuleConst; import com.mogo.module.main.cards.CardModulesAdapter; import com.mogo.module.main.cards.MogoModulesHandler; import com.mogo.module.main.cards.MogoModulesManager; +import com.mogo.module.main.cards.OnPageChangeListenerAdapter; import com.mogo.module.main.cards.OrientedViewPager; import com.mogo.module.main.cards.VerticalStackTransformer; import com.mogo.module.service.ServiceConst; @@ -34,7 +34,7 @@ import java.util.List; * @author congtaowang * @since 2019-12-23 *

- * 描述 + * 描述：加载各个模块 */ public class MainActivity extends MvpActivity< MainView, MainPresenter > implements MainView, IMogoLocationListener, @@ -67,13 +67,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mCardsContainer = findViewById( R.id.module_main_id_cards_container ); mCardsContainer.setOrientation( OrientedViewPager.Orientation.VERTICAL ); - mCardsContainer.setOnPageChangeListener( new ViewPager.OnPageChangeListener() { - - @Override - public void onPageScrolled( int position, float positionOffset, int positionOffsetPixels ) { - Logger.i( TAG, "position = " + position ); - } - + mCardsContainer.setOnPageChangeListener( new OnPageChangeListenerAdapter() { @Override public void onPageSelected( int position ) { try { @@ -83,19 +77,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme e.printStackTrace(); } } - - @Override - public void onPageScrollStateChanged( int state ) { - if ( state == ViewPager.SCROLL_STATE_IDLE ) { -// if ( mCurrentPosition == 0 ) { -// mCurrentPosition = mCardModulesAdapter.getCount() - 3; -// mCardsContainer.setCurrentItem( mCurrentPosition, false ); -// } else if ( mCurrentPosition == mCardModulesAdapter.getCount() - 2 ) { -// mCurrentPosition = 1; -// mCardsContainer.setCurrentItem( mCurrentPosition, false ); -// } - } - } } ); } @@ -107,6 +88,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme MogoModulePaths.addModule( new MogoModule( MogoModulePaths.PATH_MODULE_MAP, MogoModulePaths.PATH_MODULE_MAP ) ); MogoModulePaths.addModule( new MogoModule( ServiceConst.PATH_REFRESH_STRATEGY, ServiceConst.PATH_REFRESH_STRATEGY ) ); MogoModulePaths.addModule( new MogoModule( ExtensionsModuleConst.PATH_EXTENSION, ExtensionsModuleConst.TYPE ) ); + MogoModulePaths.addModule( new MogoModule( ExtensionsModuleConst.PATH_ENTRANCE, ExtensionsModuleConst.TYPE_ENTRANCE ) ); mMogoModuleHandler = new MogoModulesManager( this ); mMogoMapService = ( IMogoMapService ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICES_MAP ).navigation(); @@ -128,6 +110,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mMogoModuleHandler.loadMap( R.id.module_main_id_map_fragment_container ); mMogoModuleHandler.loadAppsList( R.id.module_main_id_fragment_container ); mMogoModuleHandler.loadExtensions( R.id.module_main_id_header_fragment_container ); + mMogoModuleHandler.loadEntrances( R.id.module_main_id_entrance_fragment_container ); mLocationClient = mMogoMapService.getSingletonLocationClient( getApplicationContext() ); mLocationClient.addLocationListener( this ); @@ -163,11 +146,22 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme @Override public boolean onMarkerClicked( IMogoMarker marker ) { -// int mappedCardPosition = mCardModulesAdapter.getNextCardPosition( marker.getOwner(), mCurrentPosition ); -// mCardsContainer.setCurrentItem( mappedCardPosition, true ); + switch2( marker.getOwner() ); return false; } + @Override + public void switch2( String cardType ) { + if ( mCardModulesAdapter != null ) { + int position = mCardModulesAdapter.getProviderPosition( cardType ); + if ( position != -1 ) { + mCardsContainer.setCurrentItem( position, false ); + } else { + Logger.e( TAG, "Can't find type of %s's position", cardType ); + } + } + } + @Override protected void onDestroy() { super.onDestroy(); diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainPresenter.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainPresenter.java index 2117dc53c7..905d597035 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainPresenter.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainPresenter.java @@ -1,6 +1,13 @@ package com.mogo.module.main; +import android.text.TextUtils; + +import androidx.annotation.NonNull; +import androidx.lifecycle.LifecycleOwner; +import androidx.lifecycle.Observer; + import com.mogo.commons.mvp.Presenter; +import com.mogo.module.main.livedata.CardSwitchLiveData; /** * @author congtaowang @@ -13,4 +20,18 @@ public class MainPresenter extends Presenter< MainView > { public MainPresenter( MainView view ) { super( view ); } + + @Override + public void onCreate( @NonNull LifecycleOwner owner ) { + super.onCreate( owner ); + CardSwitchLiveData.getInstance().observeForever( new Observer< String >() { + @Override + public void onChanged( String s ) { + if ( TextUtils.isEmpty( s ) ) { + return; + } + mView.switch2( s ); + } + } ); + } } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainView.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainView.java index 1bec469b31..3803a0e42c 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainView.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainView.java @@ -9,4 +9,6 @@ import com.mogo.commons.mvp.IView; * 主页 view 接口 */ public interface MainView extends IView { + + void switch2( String cardType ); } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MogoCardManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MogoCardManager.java new file mode 100644 index 0000000000..5fcd499113 --- /dev/null +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MogoCardManager.java @@ -0,0 +1,28 @@ +package com.mogo.module.main; + +import android.content.Context; + +import com.alibaba.android.arouter.facade.annotation.Route; +import com.mogo.module.main.livedata.CardSwitchLiveData; +import com.mogo.service.MogoServicePaths; +import com.mogo.service.cardmanager.IMogoCardManager; + +/** + * @author congtaowang + * @since 2020-01-06 + *

+ * 卡片控制 + */ +@Route( path = MogoServicePaths.PATH_CARD_MANAGER ) +public class MogoCardManager implements IMogoCardManager { + + @Override + public void switch2( String cardType ) { + CardSwitchLiveData.getInstance().postValue( cardType ); + } + + @Override + public void init( Context context ) { + + } +} diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/CardModulesAdapter.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/CardModulesAdapter.java index 806d216622..77a3a48ad7 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/CardModulesAdapter.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/CardModulesAdapter.java @@ -65,34 +65,23 @@ public class CardModulesAdapter extends FragmentStatePagerAdapter { } /** - * marker、卡片、语音等通过 launcher 切换到其他卡片。 + * 获取对应卡片类型在列表中的位置 * - * @param providerTag 卡片类型 - * @param currentPosition 当前卡片位置 - * @return 需要跳转到的卡片实际位置 + * @param tag 卡片类型 + * @return 列表中的位置 */ - public int getNextCardPosition( String providerTag, int currentPosition ) { - int position = 0; - int currentFactPosition = getFactPosition( currentPosition ); - for ( IMogoModuleProvider provider : mProviders ) { - if ( TextUtils.equals( providerTag, provider.getModuleName() ) ) { - break; + public int getProviderPosition( String tag ) { + if ( mProviders != null ) { + for ( int i = 0; i < mProviders.size(); i++ ) { + IMogoModuleProvider provider = mProviders.get( i ); + if ( provider != null ) { + if ( TextUtils.equals( provider.getModuleName(), tag ) ) { + return i; + } + } } - position++; } - int offset = 0; - if ( currentFactPosition > position ) { - // 下一个卡片在当前卡片前面 - offset = position - mProviders.size(); - } else if ( currentFactPosition < position ) { - // 下一个卡片在当前卡片后面 - offset = mProviders.size() - position; - } - return currentPosition + offset; + return -1; } - @Override - public void finishUpdate( @NonNull ViewGroup container ) { - super.finishUpdate( container ); - } } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java index bac3025f0c..41c4ec0712 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java @@ -54,6 +54,13 @@ public interface MogoModulesHandler extends IMogoMapListener, */ void loadExtensions( int containerId ); + /** + * 加载快捷操作 + * + * @param containerId + */ + void loadEntrances( int containerId ); + /** * 设置某一个module可用 * diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java index f044239821..95c3dfe253 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java @@ -119,6 +119,11 @@ public class MogoModulesManager implements MogoModulesHandler, loadModuleByType( ModuleType.TYPE_EXTENSION, containerId ); } + @Override + public void loadEntrances( int containerId ) { + loadModuleByType( ModuleType.TYPE_ENTRANCE, containerId ); + } + private void loadModuleByType( int type, int containerId ) { if ( mModuleProviders.isEmpty() ) { return; diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/OnPageChangeListenerAdapter.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/OnPageChangeListenerAdapter.java new file mode 100644 index 0000000000..f43f436c6e --- /dev/null +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/OnPageChangeListenerAdapter.java @@ -0,0 +1,27 @@ +package com.mogo.module.main.cards; + +import androidx.viewpager.widget.ViewPager; + +/** + * @author congtaowang + * @since 2020-01-06 + *

+ * 描述 + */ +public class OnPageChangeListenerAdapter implements ViewPager.OnPageChangeListener { + + @Override + public void onPageScrolled( int position, float positionOffset, int positionOffsetPixels ) { + + } + + @Override + public void onPageSelected( int position ) { + + } + + @Override + public void onPageScrollStateChanged( int state ) { + + } +} diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/PlaceholderFragment.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/PlaceholderFragment.java deleted file mode 100644 index 6b2c2b566c..0000000000 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/PlaceholderFragment.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.mogo.module.main.cards; - -import android.os.Bundle; - -import androidx.annotation.Nullable; - -import com.mogo.module.main.R; - -/** - * @author congtaowang - * @since 2019-12-31 - *

- * 描述 - */ -public class PlaceholderFragment extends UnDestroyedViewFragment { - - @Override - protected int getLayoutId() { - return R.layout.module_main_fragement_placeholder; - } - - @Override - public void onCreate( @Nullable Bundle savedInstanceState ) { - super.onCreate( savedInstanceState ); - } -} diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/PlaceholderFragmentProvider.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/PlaceholderFragmentProvider.java deleted file mode 100644 index 4109a1004e..0000000000 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/PlaceholderFragmentProvider.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.mogo.module.main.cards; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.drawable.BitmapDrawable; -import android.os.Bundle; -import android.view.View; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; - -import com.mogo.commons.mvp.IView; -import com.mogo.commons.mvp.MvpFragment; -import com.mogo.commons.mvp.Presenter; -import com.mogo.map.listener.IMogoMapListener; -import com.mogo.map.location.IMogoLocationListener; -import com.mogo.map.navi.IMogoNaviListener; -import com.mogo.module.main.R; -import com.mogo.service.module.IMogoModuleLifecycle; -import com.mogo.service.module.IMogoModuleProvider; -import com.mogo.service.module.ModuleType; - -/** - * @author congtaowang - * @since 2019-12-31 - *

- * 描述 - */ -public class PlaceholderFragmentProvider implements IMogoModuleProvider { - - private Fragment mCopyTarget; - private PlaceholderFragment mUi; - - public void setCopyTarget( Fragment mUICopyTarget ) { - this.mCopyTarget = mUICopyTarget; - } - - public void renderTargetUI() { - if ( mCopyTarget == null ) { - return; - } - final View target = mCopyTarget.getView(); - if ( target == null ) { - return; - } - target.setDrawingCacheEnabled( true ); - Bitmap result = target.getDrawingCache(); - result = target.getDrawingCache() != null ? result.copy( Bitmap.Config.ARGB_8888, false ) : null; - if ( mUi.getView() != null ) { - mUi.getView().setBackgroundDrawable( new BitmapDrawable( result ) ); - } - } - - @Override - public Fragment createFragment( Context context, Bundle data ) { - mUi = new PlaceholderFragment(); - return mUi; - } - - @Override - public View createView( Context context ) { - return null; - } - - @NonNull - @Override - public String getModuleName() { - return "placeholder"; - } - - @Override - public IMogoModuleLifecycle getCardLifecycle() { - return null; - } - - @Override - public IMogoMapListener getMapListener() { - return null; - } - - @Override - public int getType() { - return ModuleType.TYPE_CARD_FRAGMENT; - } - - @Override - public IMogoNaviListener getNaviListener() { - return null; - } - - @Override - public IMogoLocationListener getLocationListener() { - return null; - } - - @Override - public void init( Context context ) { - - } -} diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/UnDestroyedViewFragment.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/UnDestroyedViewFragment.java deleted file mode 100644 index 29eb86e890..0000000000 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/UnDestroyedViewFragment.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.mogo.module.main.cards; - -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.mogo.commons.mvp.IView; -import com.mogo.commons.mvp.MvpFragment; -import com.mogo.commons.mvp.Presenter; -import com.mogo.module.main.R; - -/** - * @author congtaowang - * @since 2019-12-31 - *

- * 描述 - */ -public abstract class UnDestroyedViewFragment extends MvpFragment< IView, Presenter< IView > > implements IView { - - @Nullable - @Override - public View onCreateView( @NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState ) { - if ( mRootView == null ) { - return super.onCreateView( inflater, container, savedInstanceState ); - } - return mRootView; - } - - @Override - protected void initViews() { - - } - - @NonNull - @Override - protected Presenter< IView > createPresenter() { - return new Presenter< IView >( this ) { - }; - } -} diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/VerticalStackTransformer.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/VerticalStackTransformer.java index 44cde6ab7f..425bdc4af9 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/VerticalStackTransformer.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/VerticalStackTransformer.java @@ -26,12 +26,10 @@ public class VerticalStackTransformer extends VerticalBaseTransformer { protected void onTransform( View page, float position ) { if ( position <= 0.0f ) { page.setAlpha( 1.0f ); - Log.e( "onTransform", "position <= 0.0f ==>" + position ); page.setTranslationY( 0f ); //控制停止滑动切换的时候，只有最上面的一张卡片可以点击 page.setClickable( true ); } else { - Log.e( "onTransform", "position <= 3.0f ==>" + position ); float scale = ( float ) ( page.getWidth() - WindowUtils.dip2px( context, spaceBetweenFirAndSecWith * position ) ) / ( float ) ( page.getWidth() ); //控制下面卡片的可见度 page.setAlpha( 1.0f ); diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/ZoomOutPageTransformer.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/ZoomOutPageTransformer.java deleted file mode 100644 index b1a9aea583..0000000000 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/ZoomOutPageTransformer.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.mogo.module.main.cards; - -import android.view.View; - -import androidx.viewpager.widget.ViewPager; - -public class ZoomOutPageTransformer implements ViewPager.PageTransformer { - private static final float MAX_SCALE = 1.0f; - private static final float MIN_SCALE = 0.85f;//0.85f - - @Override - public void transformPage( View view, float position ) { -// //setScaleY只支持api11以上 - if ( position < -1 ) { - view.setScaleX( MIN_SCALE ); - view.setScaleY( MIN_SCALE ); - } else if ( position <= 1 ) //a页滑动至b页 ； a页从 0.0 -1 ；b页从1 ~ 0.0 - { // [-1,1] -// Log.e("TAG", view + " , " + position + ""); - float scaleFactor = MIN_SCALE + ( 1 - Math.abs( position ) ) * ( MAX_SCALE - MIN_SCALE ); - view.setScaleX( scaleFactor ); - //每次滑动后进行微小的移动目的是为了防止在三星的某些手机上出现两边的页面为显示的情况 - if ( position > 0 ) { - view.setTranslationX( -scaleFactor * 2 ); - } else if ( position < 0 ) { - view.setTranslationX( scaleFactor * 2 ); - } - view.setScaleY( scaleFactor ); - - } else { // (1,+Infinity] - - view.setScaleX( MIN_SCALE ); - view.setScaleY( MIN_SCALE ); - - } - } - -} \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/livedata/CardSwitchLiveData.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/livedata/CardSwitchLiveData.java new file mode 100644 index 0000000000..fafe630a3d --- /dev/null +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/livedata/CardSwitchLiveData.java @@ -0,0 +1,24 @@ +package com.mogo.module.main.livedata; + +import androidx.lifecycle.MutableLiveData; + +/** + * @author congtaowang + * @since 2020-01-06 + *

+ * 切换卡片 + */ +public class CardSwitchLiveData extends MutableLiveData< String > { + + private CardSwitchLiveData() { + // private constructor + } + + private static final class InstanceHolder { + private static final CardSwitchLiveData INSTANCE = new CardSwitchLiveData(); + } + + public static CardSwitchLiveData getInstance() { + return InstanceHolder.INSTANCE; + } +} diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml index 485feb099d..da46c8d320 100644 --- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml +++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml @@ -1,49 +1,59 @@ - - + + android:layout_height="match_parent" + app:layout_constraintLeft_toRightOf="@+id/module_main_id_fragment_container" + app:layout_constraintRight_toRightOf="parent" /> - + android:orientation="vertical"> + + app:layout_constraintTop_toTopOf="parent" /> - - - - - - + android:layout_marginTop="@dimen/dp_10"> + + - \ No newline at end of file + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java index 853f3ed188..f25c406c7f 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java @@ -6,17 +6,10 @@ import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.mvp.MvpFragment; import com.mogo.map.IMogoMap; import com.mogo.map.IMogoUiSettings; -import com.mogo.map.MogoLatLng; import com.mogo.map.MogoMapView; -import com.mogo.map.location.IMogoLocationClient; -import com.mogo.map.location.MogoLocation; -import com.mogo.map.uicontroller.IMogoMapUIController; -import com.mogo.service.MogoServicePaths; -import com.mogo.service.map.IMogoMapService; /** * @author congtaowang @@ -31,20 +24,6 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter > implements private MogoMapView mMogoMapView; private IMogoMap mMogoMap; - private View mSearch; - private View mHome; - - private View mCompany; - - private View mUploadRoadCondition; - - private View mVRMode; - private View mMove2CurrentLocation; - - private IMogoMapService mService; - private IMogoMapUIController mMApUIController; - private IMogoLocationClient mMogoLocationClient; - @Override protected int getLayoutId() { return R.layout.module_map_fragment_map; @@ -55,39 +34,6 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter > implements mMogoMapView = findViewById( R.id.module_map_id_map ); mMogoMap = mMogoMapView.getMap(); mMogoMap.getUIController().showMyLocation( true ); - findViewById(R.id.module_map_id_search).setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { - ARouter.getInstance().build(MogoModulePaths.PATH_MODULE_NAV_ACTIVITY).navigation(getActivity()); - } - }); - - mSearch = findViewById( R.id.module_map_id_search ); - mSearch.setOnClickListener( view -> { - } ); - - mHome = findViewById( R.id.module_map_id_home ); - mHome.setOnClickListener( view -> { - } ); - - mCompany = findViewById( R.id.module_map_id_company ); - mCompany.setOnClickListener( view -> { - } ); - - mUploadRoadCondition = findViewById( R.id.module_map_id_upload_road_condition ); - mUploadRoadCondition.setOnClickListener( view -> { - } ); - - mVRMode = findViewById( R.id.module_map_id_vr_mode ); - mVRMode.setOnClickListener( view -> { - } ); - - mMove2CurrentLocation = findViewById( R.id.module_map_id_move2_current_location ); - mMove2CurrentLocation.setOnClickListener( view -> { - final MogoLocation location = mMogoLocationClient.getLastKnowLocation(); - if ( location != null ) { - mMApUIController.moveToCenter( new MogoLatLng( location.getLatitude(), location.getLongitude() ) ); - } - } ); } @NonNull @@ -103,9 +49,6 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter > implements mMogoMapView.onCreate( savedInstanceState ); } initMapView(); - mService = ( IMogoMapService ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICES_MAP ).navigation( getContext() ); - mMApUIController = mService.getMapUIController(); - mMogoLocationClient = mService.getLocationClient( getContext() ); } @Override diff --git a/modules/mogo-module-map/src/main/res/layout/module_map_fragment_map.xml b/modules/mogo-module-map/src/main/res/layout/module_map_fragment_map.xml index 038b269721..30ae83c338 100644 --- a/modules/mogo-module-map/src/main/res/layout/module_map_fragment_map.xml +++ b/modules/mogo-module-map/src/main/res/layout/module_map_fragment_map.xml @@ -9,120 +9,4 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-map/src/main/res/values/strings.xml b/modules/mogo-module-map/src/main/res/values/strings.xml index 344eed0558..fab4c86972 100644 --- a/modules/mogo-module-map/src/main/res/values/strings.xml +++ b/modules/mogo-module-map/src/main/res/values/strings.xml @@ -1,5 +1,3 @@ mogo-module-map - 搜索目的地 - 上报\n路况 diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshApiService.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshApiService.java index d7327c28dc..06a99a2843 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshApiService.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshApiService.java @@ -22,6 +22,6 @@ public interface RefreshApiService { @FormUrlEncoded @POST( "/yycp-launcherSnapshot/launcherSnapshot/querySnapshotAsync" ) - Observable< BaseData > refreshData( @QueryMap Map< String, Object > params, + Observable< BaseData > refreshData( @FieldMap Map< String, Object > parameters ); } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshBody.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshBody.java index 2200ed394a..11f0d33453 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshBody.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshBody.java @@ -11,7 +11,7 @@ import java.util.List; */ public class RefreshBody { - public List< String > dataType = new ArrayList<>(); +// public List< String > dataType = new ArrayList<>(); public int limit = 50;// 请求数量 public int radius = 2_000; // 地理围栏半径（米） public LatLon location; diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java index 004825d28f..477a9c25a4 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java @@ -4,6 +4,7 @@ import android.content.Context; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.commons.data.BaseData; +import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.network.ParamsProvider; import com.mogo.commons.network.SubscribeImpl; import com.mogo.commons.network.Utils; @@ -28,13 +29,28 @@ import io.reactivex.schedulers.Schedulers; */ public class RefreshModel { + public static final String HOST_DEV = "http://dzt-test.zhidaohulian.com"; + public static final String HOST_TEST = "http://dzt-test.zhidaohulian.com"; + public static final String HOST_PRODUCT = "https://dzt.zhidaohulian.com"; + private final Context mContext; private RefreshApiService mRefreshApiService; public RefreshModel( Context context ) { this.mContext = context; IMogoNetwork network = ( IMogoNetwork ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICES_NETWORK ).navigation( context ); - this.mRefreshApiService = network.create( RefreshApiService.class, "http://www.baidu.com/" ); + this.mRefreshApiService = network.create( RefreshApiService.class, getNetHost() ); + } + + private String getNetHost() { + switch ( DebugConfig.getNetMode() ) { + case DebugConfig.NET_MODE_DEV: + return HOST_DEV; + case DebugConfig.NET_MODE_QA: + return HOST_TEST; + default: + return HOST_PRODUCT; + } } public void refreshData( MogoLatLng latLng, int radius, final RefreshCallback callback ) { @@ -47,7 +63,7 @@ public class RefreshModel { refreshBody.location = new RefreshBody.LatLon( latLng.lat, latLng.lng ); refreshBody.radius = radius; field.put( "data", GsonUtil.jsonFromObject( refreshBody ) ); - mRefreshApiService.refreshData( query, field ) + mRefreshApiService.refreshData( field ) .subscribeOn( Schedulers.io() ) .observeOn( AndroidSchedulers.mainThread() ) .subscribe( new SubscribeImpl< BaseData >( RequestOptions.create( mContext ) ) { diff --git a/modules/mogo-module-tanlu/src/androidTest/java/com/zhidao/tanlu/ExampleInstrumentedTest.java b/modules/mogo-module-tanlu/src/androidTest/java/com/zhidao/tanlu/ExampleInstrumentedTest.java deleted file mode 100644 index 51d57e90b8..0000000000 --- a/modules/mogo-module-tanlu/src/androidTest/java/com/zhidao/tanlu/ExampleInstrumentedTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.zhidao.tanlu; - -import android.content.Context; - -import androidx.test.platform.app.InstrumentationRegistry; -import androidx.test.ext.junit.runners.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see Testing documentation - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - - assertEquals("com.zhidao.tanlu.test", appContext.getPackageName()); - } -} diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java b/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java index fd3e61b1ec..75a082790c 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java @@ -60,4 +60,9 @@ public class MogoServicePaths { * 消息中心 */ public static final String PATH_WINDOW_MANAGER = "/windowmanger/api"; + + /** + * 卡片控制 + */ + public static final String PATH_CARD_MANAGER = "/cardmanager/api"; } diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/cardmanager/IMogoCardManager.java b/services/mogo-service-api/src/main/java/com/mogo/service/cardmanager/IMogoCardManager.java new file mode 100644 index 0000000000..2d68cfbe26 --- /dev/null +++ b/services/mogo-service-api/src/main/java/com/mogo/service/cardmanager/IMogoCardManager.java @@ -0,0 +1,19 @@ +package com.mogo.service.cardmanager; + +import com.alibaba.android.arouter.facade.template.IProvider; + +/** + * @author congtaowang + * @since 2020-01-06 + *

+ * 卡片管理 + */ +public interface IMogoCardManager extends IProvider { + + /** + * 切换卡片 + * + * @param cardType + */ + void switch2( String cardType ); +} diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/module/ModuleType.java b/services/mogo-service-api/src/main/java/com/mogo/service/module/ModuleType.java index 7ebd3a1079..f7fb47463f 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/module/ModuleType.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/module/ModuleType.java @@ -48,4 +48,9 @@ public interface ModuleType { * 小智、天气、时间等 */ int TYPE_EXTENSION = 8; + + /** + * 操作快捷入口 + */ + int TYPE_ENTRANCE = 9; } diff --git a/services/mogo-service/src/test/java/com/mogo/service/map/ExampleUnitTest.java b/services/mogo-service/src/test/java/com/mogo/service/map/ExampleUnitTest.java deleted file mode 100644 index 6c7fa71433..0000000000 --- a/services/mogo-service/src/test/java/com/mogo/service/map/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.mogo.service.map; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see Testing documentation - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals( 4, 2 + 2 ); - } -} \ No newline at end of file