diff --git a/.idea/misc.xml b/.idea/misc.xml index 707ee6e613..38ac68093c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,14 @@ +<<<<<<< HEAD + +======= + + + + +>>>>>>> qa \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 5b0620c0c7..8324550285 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,8 +1,8 @@ -import java.text.SimpleDateFormat - apply plugin: 'com.android.application' +apply plugin: 'com.alibaba.arouter' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' +import java.text.SimpleDateFormat android { compileSdkVersion rootProject.ext.android.compileSdkVersion @@ -282,4 +282,4 @@ def getGitCommit() { gitCommit } -apply plugin: 'arouterhook' \ No newline at end of file +apply plugin: 'arouterhook' diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index c3bb8b9885..8f53b1fca3 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -9,13 +9,13 @@ import com.auto.zhidao.logsdk.CrashSystem; import com.bytedance.boost_multidex.BoostMultiDex; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; -import com.mogo.module.adcard.AdCardConstants; import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant; import com.mogo.module.carchatting.card.CallChatConstant; import com.mogo.module.common.MogoModule; import com.mogo.module.common.MogoModulePaths; import com.mogo.module.main.service.MogoMainService; import com.mogo.module.media.MediaConstants; +import com.mogo.module.push.PushUIConstants; import com.mogo.module.service.ServiceConst; import com.mogo.module.tanlu.constant.TanluConstants; import com.mogo.module.v2x.V2XConst; @@ -57,7 +57,7 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addModule(new MogoModule(AuthorizeConstant.PATH_AGREEMENT_FRAGMENT, AuthorizeConstant.PATH_AGREEMENT_MODULE_NAME)); //运营位卡片，需要默认显示，放在第一个加载 - MogoModulePaths.addModule(new MogoModule(AdCardConstants.TAG, AdCardConstants.MODULE_NAME)); +// MogoModulePaths.addModule(new MogoModule(AdCardConstants.TAG, AdCardConstants.MODULE_NAME)); if (DebugConfig.isLauncher()) { MogoModulePaths.addModule(new MogoModule(MediaConstants.TAG, MediaConstants.MODULE_TYPE)); } @@ -69,8 +69,7 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addBaseModule( new MogoModule( ServiceConst.PATH_REFRESH_STRATEGY, ServiceConst.PATH_REFRESH_STRATEGY ) ); MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_OBU,"moduleObu")); MogoModulePaths.addBaseModule( new MogoModule( V2XConst.PATH_V2X_UI, V2XConst.PATH_V2X_UI ) ); - // 暂时去掉推送 -// MogoModulePaths.addModule(new MogoModule(PushUIConstants.TAG, PushUIConstants.TAG)); + MogoModulePaths.addModule(new MogoModule( PushUIConstants.TAG, PushUIConstants.TAG)); if (!DebugConfig.isLauncher()) { PersistentManager.getInstance().initManager(this); diff --git a/gradle.properties b/gradle.properties index 137c8144cc..2702a70bff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -76,7 +76,7 @@ MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x MOGO_MODULE_V2X_VERSION=1.1.36-SNAPSHOT # 推送 -MOGO_MODULE_PUSH_VERSION=1.0.1 +MOGO_MODULE_PUSH_VERSION=1.1.3 # 广告资源位 MOGO_MODULE_AD_CARD_VERSION=1.0.1 # 探路上报和分享模块 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 index 85faab6b7a..192cdfe588 100644 --- 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 @@ -67,7 +67,7 @@ public abstract class BaseNaviInfoView { protected String getFormatSurplusTime( int seconds ) { if ( seconds > 60 * 60 ) { - mFormatSurplusDistanceUnit = "h"; + mFormatSurplusTimeUnit = "h"; return String.format( "%.1f", ( ( float ) seconds ) / ( 60 * 60 ) ); } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java index d5195bf069..c01082b2d1 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java @@ -138,6 +138,9 @@ public class MapMarkerInfoView extends MapMarkerBaseView { case MarkerPoiTypeEnum.ILLEGAL_PARK_LIVING: ivIcon.setImageResource( R.drawable.module_service_ic_rc_illegal_park_light ); break; + case MarkerPoiTypeEnum.ROAD_SLIPPERY: + // TODO: 2020/6/28 添加点击展示图标 + break; default: ivIcon.setImageResource( R.drawable.icon_map_marker_road_block_up2_light ); break; diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java index 6d2d7affe2..193df223a0 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java @@ -101,6 +101,9 @@ public class MapMarkerView extends MapMarkerBaseView { case MarkerPoiTypeEnum.ILLEGAL_PARK_LIVING: ivIcon.setImageResource( R.drawable.module_service_ic_rc_illegal_park ); break; + case MarkerPoiTypeEnum.ROAD_SLIPPERY: + // TODO: 2020/6/28 添加展示图标 + break; case MarkerPoiTypeEnum.FOURS_PARKING: default: ivIcon.setImageResource( R.drawable.icon_map_marker_road_block_up2 ); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/OnlineCarMarkerView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/OnlineCarMarkerView.java index b47fc1f616..a277c94308 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/OnlineCarMarkerView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/OnlineCarMarkerView.java @@ -50,8 +50,20 @@ public class OnlineCarMarkerView implements IMarkerView { if ( sRef.get( vehicleType ) == null || sRef.get( vehicleType ).get() == null || sRef.get( vehicleType ).get().isRecycled() ) { switch ( vehicleType ) { + case 5: + sRef.put( vehicleType, new SoftReference<>( BitmapFactory.decodeResource( AbsMogoApplication.getApp().getResources(), R.drawable.icon_map_marker_car_type_taxi ) ) ); + break; + case 6: + sRef.put( vehicleType, new SoftReference<>( BitmapFactory.decodeResource( AbsMogoApplication.getApp().getResources(), R.drawable.icon_map_marker_car_type_bus ) ) ); + break; + case 1: + sRef.put( vehicleType, new SoftReference<>( BitmapFactory.decodeResource( AbsMogoApplication.getApp().getResources(), R.drawable.icon_map_marker_car_type_110 ) ) ); + break; case 2: - sRef.put( vehicleType, new SoftReference<>( BitmapFactory.decodeResource( AbsMogoApplication.getApp().getResources(), R.drawable.icon_map_marker_car_type2 ) ) ); + sRef.put( vehicleType, new SoftReference<>( BitmapFactory.decodeResource( AbsMogoApplication.getApp().getResources(), R.drawable.icon_map_marker_car_type_120 ) ) ); + break; + case 7: + sRef.put( vehicleType, new SoftReference<>( BitmapFactory.decodeResource( AbsMogoApplication.getApp().getResources(), R.drawable.icon_map_marker_car_type_119 ) ) ); break; default: sRef.put( vehicleType, new SoftReference<>( BitmapFactory.decodeResource( AbsMogoApplication.getApp().getResources(), R.drawable.icon_map_marker_car_gray ) ) ); diff --git a/modules/mogo-module-service/src/main/res/drawable/icon_map_marker_car_type_110.png b/modules/mogo-module-service/src/main/res/drawable/icon_map_marker_car_type_110.png new file mode 100644 index 0000000000..74f12e781d Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable/icon_map_marker_car_type_110.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable/icon_map_marker_car_type_119.png b/modules/mogo-module-service/src/main/res/drawable/icon_map_marker_car_type_119.png new file mode 100644 index 0000000000..db23ff7144 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable/icon_map_marker_car_type_119.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable/icon_map_marker_car_type_120.png b/modules/mogo-module-service/src/main/res/drawable/icon_map_marker_car_type_120.png new file mode 100644 index 0000000000..1c929ca8a0 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable/icon_map_marker_car_type_120.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable/icon_map_marker_car_type_bus.png b/modules/mogo-module-service/src/main/res/drawable/icon_map_marker_car_type_bus.png new file mode 100644 index 0000000000..afe1372cb9 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable/icon_map_marker_car_type_bus.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable/icon_map_marker_car_type_taxi.png b/modules/mogo-module-service/src/main/res/drawable/icon_map_marker_car_type_taxi.png new file mode 100644 index 0000000000..0b363c6d61 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable/icon_map_marker_car_type_taxi.png differ