Merge branch 'feature/v1.0.0' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into feature/v1.0.0

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>

modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerPoiTypeEnum.java

@@ -17,5 +17,13 @@ public interface MarkerPoiTypeEnum {
     //商场打折
     public String SHOP_DISCOUNT = "10004";
     //4S店
-    public String FOURS_SHOP = "10005";
+    public String FOURS_4S = "10005";
+    //施工
+    public String FOURS_ROAD_WORK = "10006";
+    //拥堵
+    public String FOURS_BLOCK_UP = "10007";
+    //积水
+    public String FOURS_PONDING = "10008";
+    //超市打折
+    public String FOURS_SHOP_FREE = "10009";
 }

modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java

@@ -5,6 +5,7 @@ import android.graphics.Bitmap;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
@@ -25,7 +26,7 @@ import com.mogo.utils.logger.Logger;
  * desc   : 地图上抽离的Marker的共性
  * version: 1.0
  */
-public abstract class MapMarkerBaseView extends ConstraintLayout {
+public abstract class MapMarkerBaseView extends LinearLayout {
     private String TAG = "MapMarkerBaseView";
 
     protected Context mContext;

modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java

@@ -122,10 +122,34 @@ public class MapMarkerInfoView extends MapMarkerBaseView {
                                 ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_dark_blue);
                                 break;
                             case MarkerPoiTypeEnum.SHOP_DISCOUNT:
-
+                                ivIcon.setImageResource(R.drawable.icon_map_marker_shop_discount);
+                                clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_red_info);
+                                ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_red);
                                 break;
-                            case MarkerPoiTypeEnum.FOURS_SHOP:
+                            case MarkerPoiTypeEnum.FOURS_4S:
-
+                                ivIcon.setImageResource(R.drawable.icon_map_marker_4s);
+                                clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_dark_blue_info);
+                                ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_dark_blue);
+                                break;
+                            case MarkerPoiTypeEnum.FOURS_ROAD_WORK:
+                                ivIcon.setImageResource(R.drawable.icon_map_marker_road_work);
+                                clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_dark_blue_info);
+                                ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_dark_blue);
+                                break;
+                            case MarkerPoiTypeEnum.FOURS_BLOCK_UP:
+                                ivIcon.setImageResource(R.drawable.icon_map_marker_road_block_up);
+                                clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_blue_info);
+                                ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_blue);
+                                break;
+                            case MarkerPoiTypeEnum.FOURS_PONDING:
+                                ivIcon.setImageResource(R.drawable.icon_map_marker_pondingl);
+                                clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_blue_info);
+                                ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_blue);
+                                break;
+                            case MarkerPoiTypeEnum.FOURS_SHOP_FREE:
+                                ivIcon.setImageResource(R.drawable.icon_map_marker_shop);
+                                clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_dark_green_info);
+                                ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_dark_green);
                                 break;
                             default:
                                 ivIcon.setImageResource(R.drawable.icon_map_marker_road_check);

modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java

@@ -167,7 +167,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag
                             case MarkerPoiTypeEnum.SHOP_DISCOUNT:
                                 properties.put("type", 9);
                                 break;
-                            case MarkerPoiTypeEnum.FOURS_SHOP:
+                            case MarkerPoiTypeEnum.FOURS_4S:
                                 properties.put("type", 10);
                                 break;
                         }
@@ -404,7 +404,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag
                         case MarkerPoiTypeEnum.SHOP_DISCOUNT:
                             num_shop_discount++;
                             break;
-                        case MarkerPoiTypeEnum.FOURS_SHOP:
+                        case MarkerPoiTypeEnum.FOURS_4S:
                             num_fours_shop++;
                             break;
                     }

modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java

@@ -45,7 +45,7 @@ public class MapMarkerView extends MapMarkerBaseView {
 
     public MapMarkerView(Context context, MarkerShowEntity markerShowEntity, MogoMarkerOptions options) {
         super(context);
-        mOptions=options;
+        mOptions = options;
         updateView(markerShowEntity);
     }
 
@@ -90,7 +90,6 @@ public class MapMarkerView extends MapMarkerBaseView {
                     ivUserHead.setVisibility(View.INVISIBLE);
                     ivIcon.setVisibility(View.VISIBLE);
 
-                    ivBg.setImageResource(R.drawable.bg_map_marker_green);
                     ivCar.setImageResource(R.drawable.icon_map_marker_location_blue);
 
                     if (bindObj instanceof MarkerNoveltyInfo) {
@@ -108,14 +107,32 @@ public class MapMarkerView extends MapMarkerBaseView {
                                 ivBg.setImageResource(R.drawable.bg_map_marker_dark_blue);
                                 break;
                             case MarkerPoiTypeEnum.SHOP_DISCOUNT:
-
+                                ivIcon.setImageResource(R.drawable.icon_map_marker_shop_discount);
+                                ivBg.setImageResource(R.drawable.bg_map_marker_red);
                                 break;
-                            case MarkerPoiTypeEnum.FOURS_SHOP:
+                            case MarkerPoiTypeEnum.FOURS_4S:
-
+                                ivIcon.setImageResource(R.drawable.icon_map_marker_4s);
+                                ivBg.setImageResource(R.drawable.bg_map_marker_blue);
+                                break;
+                            case MarkerPoiTypeEnum.FOURS_ROAD_WORK:
+                                ivIcon.setImageResource(R.drawable.icon_map_marker_road_work);
+                                ivBg.setBackgroundResource(R.drawable.bg_map_marker_dark_blue);
+                                break;
+                            case MarkerPoiTypeEnum.FOURS_BLOCK_UP:
+                                ivIcon.setImageResource(R.drawable.icon_map_marker_road_block_up);
+                                ivBg.setBackgroundResource(R.drawable.bg_map_marker_blue);
+                                break;
+                            case MarkerPoiTypeEnum.FOURS_PONDING:
+                                ivIcon.setImageResource(R.drawable.icon_map_marker_pondingl);
+                                ivBg.setBackgroundResource(R.drawable.bg_map_marker_blue);
+                                break;
+                            case MarkerPoiTypeEnum.FOURS_SHOP_FREE:
+                                ivIcon.setImageResource(R.drawable.icon_map_marker_shop);
+                                ivBg.setBackgroundResource(R.drawable.bg_map_marker_dark_green);
                                 break;
                             default:
-                                ivIcon.setImageResource(R.drawable.icon_map_marker_road_check);
+//                                ivIcon.setImageResource(R.drawable.icon_map_marker_road_check);
-                                ivBg.setImageResource(R.drawable.bg_map_marker_green);
+//                                ivBg.setImageResource(R.drawable.bg_map_marker_green);
                                 break;
                         }
                     }

modules/mogo-module-service/src/main/res/drawable/bg_map_marker_dark_green_info.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    <gradient
+        android:angle="270"
+        android:endColor="#24A2C2"
+        android:startColor="#29F9B2" />
+    <corners android:radius="360dp" />
+
+    <padding
+        android:bottom="@dimen/dp_6"
+        android:left="@dimen/dp_6"
+        android:right="@dimen/dp_40"
+        android:top="@dimen/dp_6" />
+
+</shape >

modules/mogo-module-service/src/main/res/drawable/bg_map_marker_red_info.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    <gradient
+        android:angle="270"
+        android:endColor="#E52E4D"
+        android:startColor="#FA6577" />
+    <corners android:radius="360dp" />
+
+    <padding
+        android:bottom="@dimen/dp_6"
+        android:left="@dimen/dp_6"
+        android:right="@dimen/dp_40"
+        android:top="@dimen/dp_6" />
+
+</shape >

modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_blue.xml

@@ -8,6 +8,8 @@
             android:pivotY="15%"
             android:toDegrees="45" >
             <shape android:shape="rectangle" >
+                <size android:width="@dimen/dp_20"
+                    android:height="@dimen/dp_20"/>
                 <solid android:color="#256BFF" />
             </shape >
         </rotate >

modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_dark_green.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:id="@+id/shape_id" >
+        <!-- 倒三角 -->
+        <rotate
+            android:fromDegrees="45"
+            android:pivotX="135%"
+            android:pivotY="15%"
+            android:toDegrees="45" >
+            <shape android:shape="rectangle" >
+                <solid android:color="#249CC4" />
+            </shape >
+        </rotate >
+    </item >
+</layer-list >

modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_red.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:id="@+id/shape_id" >
+        <!-- 倒三角 -->
+        <rotate
+            android:fromDegrees="45"
+            android:pivotX="135%"
+            android:pivotY="15%"
+            android:toDegrees="45" >
+            <shape android:shape="rectangle" >
+                <solid android:color="#E52E4D" />
+            </shape >
+        </rotate >
+    </item >
+</layer-list >

modules/mogo-module-service/src/main/res/drawable/ic_reverse_triangle.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="20dp"
+    android:viewportWidth="400"
+    android:viewportHeight="200" >
+    <path
+        android:fillColor="#256BFF"
+        android:pathData="M200.162432,198.826894l-200.162432,-198.826894l400.325329,0l-200.162897,198.826894z" />
+</vector >

modules/mogo-module-service/src/main/res/layout/view_map_marker.xml

@@ -1,12 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:gravity="center"
     android:orientation="vertical"
+    android:paddingStart="@dimen/dp_5"
+    android:paddingEnd="@dimen/dp_5"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout" >
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" >
+
+        <ImageView
+            android:id="@+id/ivBg"
+            android:layout_width="@dimen/dp_88"
+            android:layout_height="@dimen/dp_105"
+            android:layout_gravity="center"
+            android:src="@drawable/bg_map_marker_blue"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <com.mogo.service.imageloader.MogoImageView
+            android:id="@+id/ivUserHead"
+            android:layout_width="@dimen/dp_76"
+            android:layout_height="@dimen/dp_76"
+            android:layout_gravity="center"
+            android:layout_marginTop="@dimen/dp_6"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:miv_failureHolder="@drawable/icon_default_user_head"
+            app:miv_overlayImageId="@drawable/icon_default_user_head"
+            app:miv_placeHolder="@drawable/icon_default_user_head"
+            app:miv_shape="circle" />
+
+        <ImageView
+            android:id="@+id/ivIcon"
+            android:layout_width="@dimen/dp_76"
+            android:layout_height="@dimen/dp_76"
+            android:layout_gravity="center"
+            android:layout_marginTop="@dimen/dp_6"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:src="@drawable/icon_map_marker_road_block_up"
+            tools:visibility="visible" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout >
+
     <ImageView
         android:id="@+id/ivCar"
         android:layout_width="@dimen/dp_34"
@@ -15,42 +61,4 @@
         app:layout_constraintEnd_toEndOf="@+id/ivBg"
         app:layout_constraintStart_toStartOf="@+id/ivBg"
         app:layout_constraintTop_toBottomOf="@+id/ivBg" />
-
+</LinearLayout >
-    <ImageView
-        android:id="@+id/ivBg"
-        android:layout_width="@dimen/dp_68"
-        android:layout_height="@dimen/dp_85"
-        android:layout_gravity="center"
-        android:src="@drawable/bg_map_marker_blue"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <com.mogo.service.imageloader.MogoImageView
-        android:id="@+id/ivUserHead"
-        android:layout_width="@dimen/dp_56"
-        android:layout_height="@dimen/dp_56"
-        android:layout_gravity="center"
-        android:layout_marginTop="@dimen/dp_6"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:miv_failureHolder="@drawable/icon_default_user_head"
-        app:miv_overlayImageId="@drawable/icon_default_user_head"
-        app:miv_placeHolder="@drawable/icon_default_user_head"
-        app:miv_shape="circle" />
-
-    <ImageView
-        android:id="@+id/ivIcon"
-        android:layout_width="@dimen/dp_45"
-        android:layout_height="@dimen/dp_45"
-        android:layout_gravity="center"
-        android:layout_marginTop="@dimen/dp_14"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:src="@drawable/icon_map_marker_road_block_up"
-        tools:visibility="visible" />
-
-</merge >

modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml

@@ -1,26 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:gravity="center_vertical"
+    android:gravity="center"
-    android:orientation="horizontal"
+    android:orientation="vertical"
+    android:paddingStart="@dimen/dp_5"
+    android:paddingEnd="@dimen/dp_5"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout" >
 
-    <ImageView
-        android:id="@+id/ivCar"
-        android:layout_width="@dimen/dp_34"
-        android:layout_height="@dimen/dp_64"
-        android:src="@drawable/icon_map_marker_car_gray"
-        app:layout_constraintEnd_toEndOf="@+id/ivReverseTriangle"
-        app:layout_constraintStart_toStartOf="@+id/ivReverseTriangle"
-        app:layout_constraintTop_toBottomOf="@+id/ivReverseTriangle" />
-
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/clMarkerContent"
         android:layout_width="wrap_content"
-        android:layout_height="@dimen/dp_74"
+        android:layout_height="@dimen/dp_90"
         android:background="@drawable/bg_map_marker_blue_info"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -28,8 +21,9 @@
 
         <com.mogo.service.imageloader.MogoImageView
             android:id="@+id/ivUserHead"
-            android:layout_width="@dimen/dp_60"
+            android:layout_width="@dimen/dp_76"
-            android:layout_height="@dimen/dp_60"
+            android:layout_height="@dimen/dp_76"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:miv_failureHolder="@drawable/icon_default_user_head"
@@ -39,10 +33,10 @@
 
         <ImageView
             android:id="@+id/ivIcon"
-            android:layout_width="@dimen/dp_45"
+            android:layout_width="@dimen/dp_76"
-            android:layout_height="@dimen/dp_45"
+            android:layout_height="@dimen/dp_76"
             android:layout_gravity="center"
-            android:layout_marginLeft="@dimen/dp_14"
+            android:layout_marginLeft="@dimen/dp_10"
             android:visibility="invisible"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -67,14 +61,28 @@
             tools:text="诗一样的女子" />
     </androidx.constraintlayout.widget.ConstraintLayout >
 
-    <ImageView
+    <LinearLayout
-        android:id="@+id/ivReverseTriangle"
+        android:layout_width="match_parent"
-        android:layout_width="10dp"
+        android:layout_height="match_parent"
-        android:layout_height="10dp"
+        android:layout_marginBottom="-10dp"
-        android:src="@drawable/bg_shape_reverse_triangle_blue"
+        android:gravity="center"
+        android:orientation="vertical"
         app:layout_constraintEnd_toEndOf="@+id/clMarkerContent"
         app:layout_constraintStart_toStartOf="@+id/clMarkerContent"
-        app:layout_constraintTop_toBottomOf="@+id/clMarkerContent" />
+        app:layout_constraintTop_toBottomOf="@+id/clMarkerContent" >
 
+        <ImageView
+            android:id="@+id/ivReverseTriangle"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:src="@drawable/bg_shape_reverse_triangle_blue" />
 
-</merge >
+        <ImageView
+            android:id="@+id/ivCar"
+            android:layout_width="@dimen/dp_34"
+            android:layout_height="@dimen/dp_64"
+            android:src="@drawable/icon_map_marker_car_gray"
+            android:translationY="-10dp" />
+    </LinearLayout >
+
+</LinearLayout >