yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决BUG

Browse Source 
【新鲜事】地图poi点绘制与设计图不一致
http://jira.zhidaohulian.com/projects/UI/issues/UI-268?filter=allopenissues
This commit is contained in:
董宏宇
2020-02-13 18:22:11 +08:00
parent 5859fb54d4
commit 302bb2512d
18 changed files with 121 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

@@ -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>

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

@@ -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";
}

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

@@ -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);

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

@@ -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;
}

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

@@ -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);
}
@@ -108,10 +108,28 @@ 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);

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_dark_green.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.3 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_red.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.4 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_4s.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_pondingl.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_check.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_work.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_shop.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_shop_discount.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

15
modules/mogo-module-service/src/main/res/drawable/bg_map_marker_dark_green_info.xml Normal file
View File

@@ -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 >

15
modules/mogo-module-service/src/main/res/drawable/bg_map_marker_red_info.xml Normal file
View File

@@ -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 >

15
modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_dark_green.xml Normal file
View File

@@ -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 >

15
modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_red.xml Normal file
View File

@@ -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 >