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

opt

Browse Source
This commit is contained in:
wangcongtao
2020-05-29 14:59:33 +08:00
parent 33266019f7
commit 17b1e18db8
6 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gradle.properties
View File

@@ -54,7 +54,7 @@ MOGO_MODULE_GUIDE_VERSION=1.1.0.12
## 工程外部模块 ## 工程外部模块
# 探路 # 探路
MOGO_MODULE_TANLU_VERSION=1.0.6-SNAPSHOT MOGO_MODULE_TANLU_VERSION=1.0.6.2
# 车聊聊 # 车聊聊
CARCHATTING_VERSION=1.0.4-SNAPSHOT CARCHATTING_VERSION=1.0.4-SNAPSHOT
# 车聊聊接口 # 车聊聊接口
@@ -68,7 +68,7 @@ MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2
# v2x # v2x
MOGO_MODULE_V2X_VERSION=1.0.7 MOGO_MODULE_V2X_VERSION=1.0.7
# 媒体卡片 # 媒体卡片
MOGO_MODULE_MEDIA_VERSION=1.0.4.10 MOGO_MODULE_MEDIA_VERSION=1.0.4.11
# 推送 # 推送
MOGO_MODULE_PUSH_VERSION=1.0.1 MOGO_MODULE_PUSH_VERSION=1.0.1
# 广告资源位 # 广告资源位

8
modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/CarSeries.java
View File

@@ -17,6 +17,8 @@ public class CarSeries {
public static final int CAR_SERIES_D84X = 23; public static final int CAR_SERIES_D84X = 23;
public static final int CAR_SERIES_F80X = 30; public static final int CAR_SERIES_F80X = 30;
public static final int CAR_SERIES_G80X = 40; public static final int CAR_SERIES_G80X = 40;
public static final int CAR_SERIES_E84X = 50;
public static final int CAR_SERIES_E84XCD = 51;
public static int CAR_SERIES = 0; public static int CAR_SERIES = 0;
@@ -33,7 +35,7 @@ public class CarSeries {
CAR_SERIES = CAR_SERIES_C80X; CAR_SERIES = CAR_SERIES_C80X;
} else if ( "D801-802".equals( device ) ) { } else if ( "D801-802".equals( device ) ) {
CAR_SERIES = CAR_SERIES_D80X; CAR_SERIES = CAR_SERIES_D80X;
} else if( "D801B-802B".equals( device )){ } else if ( "D801B-802B".equals( device ) ) {
// 2+16G // 2+16G
CAR_SERIES = CAR_SERIES_D80X; CAR_SERIES = CAR_SERIES_D80X;
} else if ( "D811-812".equals( device ) ) { } else if ( "D811-812".equals( device ) ) {
@@ -46,6 +48,10 @@ public class CarSeries {
CAR_SERIES = CAR_SERIES_G80X; CAR_SERIES = CAR_SERIES_G80X;
} else if ( "F801-802".equals( device ) ) { } else if ( "F801-802".equals( device ) ) {
CAR_SERIES = CAR_SERIES_F80X; CAR_SERIES = CAR_SERIES_F80X;
} else if ( "E841-842".equals( device ) ) {
CAR_SERIES = CAR_SERIES_E84X;
} else if ( "E84XCD".equals( device ) ) {
CAR_SERIES = CAR_SERIES_E84XCD;
} else { } else {
CAR_SERIES = CAR_SERIES_F80X; CAR_SERIES = CAR_SERIES_F80X;
} }

3
modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml
View File

@@ -25,7 +25,7 @@
<View <View
android:id="@+id/module_map_id_navi_bg" android:id="@+id/module_map_id_navi_bg"
android:layout_width="@dimen/module_ext_navi_info_panel_width" android:layout_width="match_parent"
android:layout_height="@dimen/module_ext_navi_info_panel_height" android:layout_height="@dimen/module_ext_navi_info_panel_height"
android:background="@drawable/module_ext_dw_navi_info_panel_bkg" android:background="@drawable/module_ext_dw_navi_info_panel_bkg"
android:focusable="true" android:focusable="true"
@@ -252,6 +252,7 @@
android:textSize="@dimen/module_ext_north_textSize" android:textSize="@dimen/module_ext_north_textSize"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"
app:layout_constraintRight_toRightOf="@+id/module_entrance_id_upload_road_condition" app:layout_constraintRight_toRightOf="@+id/module_entrance_id_upload_road_condition"
app:layout_constraintTop_toBottomOf="@+id/module_map_id_navi_bg" app:layout_constraintTop_toBottomOf="@+id/module_map_id_navi_bg"
app:layout_goneMarginTop="@dimen/module_ext_north_goneMarginTop" /> app:layout_goneMarginTop="@dimen/module_ext_north_goneMarginTop" />

2
modules/mogo-module-search/src/main/res/drawable/amap_calculate_navi_strategy2_bkg.xml
View File

@@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item > <item >
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<solid android:color="#43CEDF" /> <solid android:color="#3BC59A" />
<corners android:radius="5dp" /> <corners android:radius="5dp" />
</shape> </shape>
</item> </item>

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

@@ -88,7 +88,7 @@ public class MapMarkerInfoView extends MapMarkerBaseView {
ivUserHead.setVisibility( View.INVISIBLE ); ivUserHead.setVisibility( View.INVISIBLE );
ivIcon.setVisibility( View.VISIBLE ); ivIcon.setVisibility( View.VISIBLE );
if ( bindObj instanceof MarkerExploreWay ) { if ( bindObj instanceof MarkerExploreWay && ( ( MarkerExploreWay ) bindObj ).getPoiType() != null ) {
switch ( ( ( MarkerExploreWay ) bindObj ).getPoiType() ) { switch ( ( ( MarkerExploreWay ) bindObj ).getPoiType() ) {
case MarkerPoiTypeEnum.GAS_STATION: case MarkerPoiTypeEnum.GAS_STATION:
ivIcon.setImageResource( R.drawable.icon_map_marker_refuel ); ivIcon.setImageResource( R.drawable.icon_map_marker_refuel );

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

@@ -57,7 +57,7 @@ public class MapMarkerView extends MapMarkerBaseView {
switch ( markerShowEntity.getMarkerType() ) { switch ( markerShowEntity.getMarkerType() ) {
case ServiceConst.CARD_TYPE_ROAD_CONDITION: case ServiceConst.CARD_TYPE_ROAD_CONDITION:
case ServiceConst.CARD_TYPE_NOVELTY: case ServiceConst.CARD_TYPE_NOVELTY:
if ( bindObj instanceof MarkerExploreWay ) { if ( bindObj instanceof MarkerExploreWay && ( ( MarkerExploreWay ) bindObj ).getPoiType() != null ) {
switch ( ( ( MarkerExploreWay ) bindObj ).getPoiType() ) { switch ( ( ( MarkerExploreWay ) bindObj ).getPoiType() ) {
case MarkerPoiTypeEnum.GAS_STATION: case MarkerPoiTypeEnum.GAS_STATION:
ivIcon.setImageResource( R.drawable.icon_map_marker_refuel ); ivIcon.setImageResource( R.drawable.icon_map_marker_refuel );