dev

app/build.gradle

@@ -81,6 +81,7 @@ dependencies {
         api rootProject.ext.dependencies.mogocommons
         implementation rootProject.ext.dependencies.modulecommon
         implementation rootProject.ext.dependencies.moduletanlu
+        implementation rootProject.ext.dependencies.modulesearch
     } else {
         implementation project(':modules:mogo-module-main')
         implementation project(':foudations:mogo-commons')

config.gradle

@@ -101,6 +101,7 @@ ext {
             // 在线车辆
             moduleonlinecar          : "com.mogo.module:module-onlinecar:${MOGO_MODULE_ONLINECAR_VERSION}",
             modulemedia              : "com.mogo.module:module-media:${MOGO_MODULE_MEDIA_VERSION}",
+            modulesearch              : "com.mogo.module:module-search:${MOGO_MODULE_SEARCH_VERSION}",
 
             // 长链
             socketsdk                : 'com.zhidao.socketsdk:socketsdk:2.1.0',

gradle.properties

@@ -50,5 +50,6 @@ CARCHATTINGPROVIDER_VERSION=1.0.0-SNAPSHOT
 MOGO_MODULE_ONLINECAR_VERSION=1.0.0-SNAPSHOT
 MOGO_MODULE_MEDIA_VERSION=1.0.0-SNAPSHOT
 MOGO_MODULE_PUSH_VERSION=1.0.0-SNAPSHOT
+MOGO_MODULE_SEARCH_VERSION=1.0.0-SNAPSHOT
 
 

libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java

@@ -95,10 +95,6 @@ public class AMapNaviViewWrapper implements IMogoMapView,
                 options.setTrafficLayerEnabled( false );
                 // 设置导航界面是否显示路线全览按钮。
                 options.setRouteListButtonShow( false );
-                // 设置起点位图，须在画路前设置
-//                options.setStartPointBitmap( BitmapFactory.decodeResource( getContext().getResources(), R.drawable.ic_current_location_cursor ) );
-                // 设置终点位图，须在画路前设置
-//                options.setEndPointBitmap( BitmapFactory.decodeResource( getContext().getResources(), R.drawable.ic_search_choice_point ) );
                 // 设置导航状态下屏幕是否一直开启。
                 options.setScreenAlwaysBright( true );
                 // 设置交通播报是否打开（只适用于驾车导航，需要联网）。

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/weather/Phenomena.java

@@ -11,59 +11,59 @@ import java.util.Map;
  * @author Lzq
  */
 public enum Phenomena {
-    Sunny( "00", "晴", "Sunny", R.drawable.ic_sunny ),
-    Cloudy( "01", "多云", "Cloudy", R.drawable.ic_cloudy ),
-    Overcast( "02", "阴", "Overcast", R.drawable.ic_overcast ),
+    Sunny( "00", "晴", "Sunny", R.drawable.module_ext_ic_sunny ),
+    Cloudy( "01", "多云", "Cloudy", R.drawable.module_ext_ic_cloudy ),
+    Overcast( "02", "阴", "Overcast", R.drawable.module_ext_ic_overcast ),
 
-    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 ),
+    Shower( "03", "阵雨", "Shower", R.drawable.module_ext_ic_shower ),
+    Thundershower( "04", "雷阵雨", "Thundershower", R.drawable.module_ext_ic_thundershower ),
+    ThundershowerWithHail( "05", "雷阵雨伴有冰雹", "Thundershower with hail", R.drawable.module_ext_ic_thundershower ),
+    Sleet( "06", "雨夹雪", "Sleet", R.drawable.module_ext_ic_snow ),
+    LightRain( "07", "小雨", "Light rain", R.drawable.module_ext_ic_light_rain ),
+    ModerateRain( "08", "中雨", "Moderate rain", R.drawable.module_ext_ic_light_rain ),
+    HeavyRain( "09", "大雨", "Heavy rain", R.drawable.module_ext_ic_heavy_rain ),
+    Storm( "10", "暴雨", "Storm", R.drawable.module_ext_ic_heavy_rain ),
+    HeavyStorm( "11", "大暴雨", "Heavy storm", R.drawable.module_ext_ic_heavy_rain ),
+    SevereStorm( "12", "特大暴雨", "Severe storm", R.drawable.module_ext_ic_severe_storm ),
 
-    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 ),
+    SnowFlurry( "13", "阵雪", "Snow flurry", R.drawable.module_ext_ic_snow ),
+    LightSnow( "14", "小雪", "Light snow", R.drawable.module_ext_ic_snow ),
+    ModerateSnow( "15", "中雪", "Moderate snow", R.drawable.module_ext_ic_snow ),
+    HeavySnow( "16", "大雪", "Heavy snow", R.drawable.module_ext_ic_snow ),
+    Snowstorm( "17", "暴雪", "Snowstorm", R.drawable.module_ext_ic_snow ),
 
-    Foggy( "18", "雾", "Foggy", R.drawable.ic_fog ),
-    IceRain( "19", "冻雨", "Ice rain", R.drawable.ic_heavy_rain ),
-    Duststorm( "20", "沙尘暴", "Duststorm", R.drawable.ic_duststorm ),
+    Foggy( "18", "雾", "Foggy", R.drawable.module_ext_ic_fog ),
+    IceRain( "19", "冻雨", "Ice rain", R.drawable.module_ext_ic_heavy_rain ),
+    Duststorm( "20", "沙尘暴", "Duststorm", R.drawable.module_ext_ic_duststorm ),
 
-    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 ),
+    LightToModerateRain( "21", "小到中雨", "Light to moderate rain", R.drawable.module_ext_ic_moderate_rain ),
+    ModerateToHeavyRain( "22", "中到大雨", "Moderate to heavy rain", R.drawable.module_ext_ic_heavy_rain ),
+    HeavyRainToStorm( "23", "大到大雨", "Heavy rain to storm", R.drawable.module_ext_ic_heavy_rain ),
+    StormToHeavyStorm( "24", "暴雨到大暴雨", "Storm to heavy storm", R.drawable.module_ext_ic_severe_storm ),
+    HeavyToSevereStorm( "25", "大暴雨到特大暴雨", "Heavy to severe storm", R.drawable.module_ext_ic_severe_storm ),
 
-    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 ),
+    LightToModerateSnow( "26", "小到中雪", "Light to moderate snow", R.drawable.module_ext_ic_snow ),
+    ModerateToHeavySnow( "27", "中到大雪", "Moderate to heavy snow", R.drawable.module_ext_ic_snow ),
+    HeavySnowToSnowStorm( "28", "大到暴雪", "Heavy snow to snowstorm", R.drawable.module_ext_ic_snow ),
 
-    Dust( "29", "浮尘", "Dust", R.drawable.ic_dust_sand ),
-    Sand( "30", "扬沙", "Sand", R.drawable.ic_dust_sand ),
-    SandStorm( "31", "强沙尘暴", "Sandstorm", R.drawable.ic_duststorm ),
+    Dust( "29", "浮尘", "Dust", R.drawable.module_ext_ic_dust_sand ),
+    Sand( "30", "扬沙", "Sand", R.drawable.module_ext_ic_dust_sand ),
+    SandStorm( "31", "强沙尘暴", "Sandstorm", R.drawable.module_ext_ic_duststorm ),
 
-    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 ),
+    Densefog( "32", "浓雾", "Dense fog", R.drawable.module_ext_ic_fog ),
+    StrongFog( "49", "强浓雾", "Strong fog", R.drawable.module_ext_ic_fog ),
+    DenseFog( "57", "大雾", "Dense fog", R.drawable.module_ext_ic_fog ),
+    ExtraHeavyFog( "58", "特强浓雾", "Extra heavy fog", R.drawable.module_ext_ic_fog ),
 
-    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 ),
+    Haze( "53", "霾", "Haze", R.drawable.module_ext_ic_haze ),
+    ModerateHaze( "54", "中度霾", "Moderate haze", R.drawable.module_ext_ic_haze ),
+    Severehaze( "55", "重度霾", "Severe haze", R.drawable.module_ext_ic_haze ),
+    SevereHaze( "56", "严重霾", "Severe haze", R.drawable.module_ext_ic_haze ),
 
-    Unknown( "99", "无", "Unknown", R.drawable.ic_unknown ),
+    Unknown( "99", "无", "Unknown", R.drawable.module_ext_ic_unknown ),
 
-    Rain( "301", "雨", "rain", R.drawable.ic_heavy_rain ),
-    Snow( "302", "雪", "snow", R.drawable.ic_snow );
+    Rain( "301", "雨", "rain", R.drawable.module_ext_ic_heavy_rain ),
+    Snow( "302", "雪", "snow", R.drawable.module_ext_ic_snow );
 
     public final String id;
     public final String nameCn;