diff --git a/.idea/gradle.xml b/.idea/gradle.xml index b59a552525..6249850d4f 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -31,9 +31,6 @@ diff --git a/app/build.gradle b/app/build.gradle index c505195521..ee51cfe30a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -121,6 +121,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'true' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' } // f系列-分体机 @@ -144,6 +146,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'true' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' } // e系列，采用Launcher方案 e8xx { @@ -166,6 +170,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'true' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' } // 同上 em4 { @@ -188,6 +194,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'true' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' } // e系列-2+32，对标D系列2+32，采用独立app的形式 em3 { @@ -210,6 +218,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'true' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' } // e系列-1+16，对标D系列1+16，采用独立app形式 em1 { @@ -232,6 +242,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'false' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' } // e系列-1+16，对标D系列1+16，采用独立app形式 em2 { @@ -254,6 +266,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'false' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' } // d系列 d8xx { @@ -276,6 +290,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'true' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'true' } // d系列 2 + 32 d80x { @@ -298,6 +314,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'true' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'true' } // d系列 1+16 版本 d82x { @@ -320,6 +338,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'false' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'true' } // 比亚迪 bydauto { @@ -342,6 +362,8 @@ android { buildConfigField 'boolean', 'IS_MAP_BASED', 'true' // 是否加载引导模块 buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' + // 分享时是否隐藏 adas + buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' } qa { dimension "env" diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 3bfce8ee6e..8aa657a92e 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -57,7 +57,7 @@ public class MogoApplication extends AbsMogoApplication { crashSystem.init(); //设置debug模式，日志不上传 crashSystem.setDebug( BuildConfig.DEBUG ); - Logger.init( BuildConfig.DEBUG ? LogLevel.VERBOSE : LogLevel.VERBOSE ); + Logger.init( BuildConfig.DEBUG ? LogLevel.VERBOSE : LogLevel.OFF ); if( DebugConfig.isNeedLoadGuideModule() ){ MogoModulePaths.addModule( new MogoModule( MogoModulePaths.PATH_GUIDE, MogoModulePaths.PATH_GUIDE ) ); @@ -129,6 +129,7 @@ public class MogoApplication extends AbsMogoApplication { DebugConfig.setSupportLauncherCardRefreshStrategy( BuildConfig.IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY ); DebugConfig.setMapBased( BuildConfig.IS_MAP_BASED ); DebugConfig.setNeedLoadGuideModule( BuildConfig.IS_NEED_LOAD_GUIDE_MODULE ); + DebugConfig.setNeedHideAdasWhenShare( BuildConfig.IS_NEED_HIDE_ADAS_WHEN_SHARE ); } @Override diff --git a/config.gradle b/config.gradle index ad3efe1d74..730d32d42b 100644 --- a/config.gradle +++ b/config.gradle @@ -131,7 +131,7 @@ ext { jetbrainsannotationsjava5 : "org.jetbrains:annotations-java5:15.0", // 统一登录 - accountsdk : "com.zhidao.accountservice:account-sdk:1.0.17", + accountsdk : "com.zhidao.accountservice:account-sdk:1.0.18", // crash crashSdk : "com.zhidaoauto.crash.log:library:1.0.5", kotlinstdlibjdk7 : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}", diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java index 1c5d3e4307..aa08c2fec0 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java @@ -1,7 +1,5 @@ package com.mogo.commons.debug; -import com.mogo.utils.logger.Logger; - /** * @author congtaowang * @since 2019-12-23 @@ -318,4 +316,14 @@ public class DebugConfig { public static boolean isNeedLoadGuideModule() { return isNeedLoadGuideModule; } + + private static boolean isNeedHideAdasWhenShare = false; + + public static boolean isNeedHideAdasWhenShare() { + return isNeedHideAdasWhenShare; + } + + public static void setNeedHideAdasWhenShare( boolean isNeedHideAdas ) { + DebugConfig.isNeedHideAdasWhenShare = isNeedHideAdas; + } } diff --git a/gradle.properties b/gradle.properties index 3298ec9f05..d7a48f50cd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7 ######## 外部依赖引用 # 车聊聊 -CARCHATTING_VERSION=1.6.8-SNAPSHOT +CARCHATTING_VERSION=2.2.5 # 车聊聊接口 CARCHATTINGPROVIDER_VERSION=1.1.7 # loglib diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java index 303b3c22a4..2b7c5a6774 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java @@ -581,7 +581,11 @@ public class AMapNaviViewWrapper implements IMogoMapView, // mMyLocationMarker.startAnimation(); // } // }); - mMyLocationMarker.startAnimation(); + try { + mMyLocationMarker.startAnimation(); + } catch ( Exception e ) { + e.printStackTrace(); + } } @Override diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java index 679e008277..80d0bef084 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java @@ -342,10 +342,16 @@ public class AMapMarkerWrapper implements IMogoMarker, Observer { ScaleAnimation animationScale = new ScaleAnimation( fromX, toX, fromY, toY ); animationScale.setDuration( duration ); animationScale.setFillMode( Animation.FILL_MODE_FORWARDS ); - animationScale.setInterpolator( interpolator ); + if ( interpolator != null ) { + animationScale.setInterpolator( interpolator ); + } mMarker.setAnimation( animationScale ); - mMarker.startAnimation(); + try { + mMarker.startAnimation(); + } catch ( Exception e ) { + e.printStackTrace(); + } } @Override @@ -357,7 +363,9 @@ public class AMapMarkerWrapper implements IMogoMarker, Observer { ScaleAnimation animationScale = new ScaleAnimation( fromX, toX, fromY, toY ); animationScale.setDuration( duration ); animationScale.setFillMode( Animation.FILL_MODE_FORWARDS ); - animationScale.setInterpolator( interpolator ); + if ( interpolator != null ) { + animationScale.setInterpolator( interpolator ); + } animationScale.setAnimationListener( new Animation.AnimationListener() { @Override public void onAnimationStart() { @@ -398,7 +406,9 @@ public class AMapMarkerWrapper implements IMogoMarker, Observer { AnimationSet animationSet = new AnimationSet( true ); animationSet.setDuration( duration ); - animationSet.setInterpolator( interpolator ); + if ( interpolator != null ) { + animationSet.setInterpolator( interpolator ); + } animationSet.setAnimationListener( new Animation.AnimationListener() { @Override public void onAnimationStart() { @@ -422,7 +432,11 @@ public class AMapMarkerWrapper implements IMogoMarker, Observer { } ); mMarker.setAnimation( animationSet ); - mMarker.startAnimation(); + try { + mMarker.startAnimation(); + } catch ( Exception e ) { + e.printStackTrace(); + } } @Override diff --git a/libraries/map-amap/src/main/res/drawable-ldpi/map_api_ic_current_location2.png b/libraries/map-amap/src/main/res/drawable-ldpi/map_api_ic_current_location2.png index 5f91be07f3..98fc674705 100644 Binary files a/libraries/map-amap/src/main/res/drawable-ldpi/map_api_ic_current_location2.png and b/libraries/map-amap/src/main/res/drawable-ldpi/map_api_ic_current_location2.png differ diff --git a/libraries/map-amap/src/main/res/drawable-mdpi/map_api_ic_current_location2.png b/libraries/map-amap/src/main/res/drawable-mdpi/map_api_ic_current_location2.png index 5f91be07f3..98fc674705 100644 Binary files a/libraries/map-amap/src/main/res/drawable-mdpi/map_api_ic_current_location2.png and b/libraries/map-amap/src/main/res/drawable-mdpi/map_api_ic_current_location2.png differ diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi-1920x1000/map_api_ic_current_location2.png b/libraries/map-amap/src/main/res/drawable-xhdpi-1920x1000/map_api_ic_current_location2.png index c24c56f3db..eb8ca757dc 100644 Binary files a/libraries/map-amap/src/main/res/drawable-xhdpi-1920x1000/map_api_ic_current_location2.png and b/libraries/map-amap/src/main/res/drawable-xhdpi-1920x1000/map_api_ic_current_location2.png differ diff --git a/libraries/map-amap/src/main/res/drawable-xhdpi/map_api_ic_current_location2.png b/libraries/map-amap/src/main/res/drawable-xhdpi/map_api_ic_current_location2.png index c24c56f3db..eb8ca757dc 100644 Binary files a/libraries/map-amap/src/main/res/drawable-xhdpi/map_api_ic_current_location2.png and b/libraries/map-amap/src/main/res/drawable-xhdpi/map_api_ic_current_location2.png differ diff --git a/libraries/map-autonavi/src/main/java/com/mogo/map/impl/automap/navi/AutoNaviReceiver.java b/libraries/map-autonavi/src/main/java/com/mogo/map/impl/automap/navi/AutoNaviReceiver.java index bc6d302e76..7df39ce72c 100644 --- a/libraries/map-autonavi/src/main/java/com/mogo/map/impl/automap/navi/AutoNaviReceiver.java +++ b/libraries/map-autonavi/src/main/java/com/mogo/map/impl/automap/navi/AutoNaviReceiver.java @@ -126,7 +126,6 @@ public class AutoNaviReceiver extends BroadcastReceiver { if ( state == -1 ) { return; } - Logger.d( TAG, "map status: state = %d", state ); switch ( state ) { case MapStateValue.START_NAVI: case MapStateValue.START_EMULATOR_NAVI: diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt index b31a0437f6..0d6f65cfc8 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt @@ -135,7 +135,8 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { mainInfoId, mLongitude, mLatitude, - mSpeed + mSpeed, + mFromType ) //地图上打点 @@ -175,7 +176,8 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { mainInfoId, mLongitude, mLatitude, - mSpeed + mSpeed, + mFromType ) } @@ -350,7 +352,8 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { mainInfoId, mLongitude, mLatitude, - mSpeed + mSpeed, + mFromType ) //地图上打点 @@ -424,9 +427,9 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { mainInfoId, mLongitude, mLatitude, - mSpeed + mSpeed, + mFromType ) - } //获取图片 diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt index 6aaa000d64..57bcbd692c 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt @@ -146,7 +146,8 @@ class CosStatusController : CosStatusCallback { mainInfoId, mLongitude, mLatitude, - mSpeed + mSpeed, + mFromType ) } Log.d(TAG, "delete file: $localPath") @@ -161,7 +162,7 @@ class CosStatusController : CosStatusCallback { // CosCallbackMapController.mainService?.sendCustomResult(it) // } // } else { - sendInformationDirectly(type, map, mType, entity, mainInfoId, mLongitude, mLatitude, mSpeed) + sendInformationDirectly(type, map, mType, entity, mainInfoId, mLongitude, mLatitude, mSpeed,mFromType) // } } @@ -176,13 +177,14 @@ class CosStatusController : CosStatusCallback { mainInfoId: Long, longitude: Double, latitude: Double, - speed: Float + speed: Float, + fromType: String ) { - Log.d(TAG, "sendInformationDirectly poiType= $poiType ---- mainInfoId= $mainInfoId --- isCustom = ${entity?.isCustom}") + Log.d(TAG, "sendInformationDirectly poiType= $poiType --fromType =$fromType ---- mainInfoId= $mainInfoId --- isCustom = ${entity?.isCustom}") //开始上传 entity?.isCustom?.let { mainServiceHttpModel.sendInformationMessage( - fromType = mFromType, + fromType = fromType, type = type, url = map, isCustom = it, diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt index da2ff0c096..330de85af0 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt @@ -75,15 +75,8 @@ class MainService : Service() { private var mLatitude: Double = 0.0 lateinit var serviceApis: IMogoServiceApis - //发送主动上报结果广播给外部 -// fun sendCustomResult(result: Boolean) { -// var intent = Intent(customResultAction) -// intent.putExtra("isSuccess", result) -// sendBroadcast(intent) -// } override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { - Log.d(TAG, "onStartCommand -----------> ") //清理多媒体资源和sp策略数据 clearStrategyType(this) //初始化埋点 @@ -95,7 +88,7 @@ class MainService : Service() { VoiceController.initVoice() serviceApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(this) as IMogoServiceApis speed = serviceApis.getMapServiceApi().getSingletonLocationClient(this).getLastKnowLocation().getSpeed() - Log.d(TAG, "onStartCommand speed = $speed" ) + Log.d(TAG, "onStartCommand speed = $speed") if (intent != null) { params = intent.getParcelableExtra("params") params?.let { @@ -105,18 +98,12 @@ class MainService : Service() { mLongitude = it.lon mLatitude = it.lat Log.d(TAG, "onStartCommand shareType = $shareType --fromType = $fromType --mainInfoId = $mainInfoId -- mLongitude = $mLongitude --mLatitude = $mLatitude --it.duration = ${it.duration} ") -// if (shareType == TANLU_ROAD_CONGESTION || shareType == TANLU_TRAFFIC_CHECK || shareType == TANLU_ROAD_CLOSURE || shareType == TANLU_ROAD_CURRENT -// || shareType == TANLU_ROAD_PONDING || shareType == TANLU_ROAD_ICING || shareType == TANLU_ROAD_HEAVY_FOG -// || shareType == TANLU_ROAD_ACCIDENT || shareType == TANLU_ROAD_WORK -// ) { -// takePhoto(1, false, true) - if (fromType == UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO || fromType == UPLOAD_FROM_STRATEGY_BLOCK_AUTO) { - // 如果是策略上报，isCustom = false - takeVideo(it.duration) - } else { - takeVideo(it.duration, isCustom = true, id = id) - } -// } + if (fromType == UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO || fromType == UPLOAD_FROM_STRATEGY_BLOCK_AUTO) { + // 如果是策略上报，isCustom = false + takeVideo(it.duration) + } else { + takeVideo(it.duration, isCustom = true, id = id) + } } } else { Log.e(TAG, "intent == null ") @@ -210,20 +197,6 @@ class MainService : Service() { // ) } -// private fun sendMarkerInfoReceiver(lat: Double, lon: Double, imageUrl: String?, type: String?) { -// Log.e("MainService", "sendMarkerInfoReceiver ------> type = $type ") -// Log.e("MainService", "sendMarkerInfoReceiver ------> fromType = $fromType ") -// Log.e("MainService", "sendMarkerInfoReceiver ------> isCustom = $isCustom ") -// var intent = Intent() -// intent.action = "com.zhidao.roadcondition.marker.info" -// intent.putExtra("type", type) -// intent.putExtra("imageUrl", imageUrl) -// intent.putExtra("lat", lat) -// intent.putExtra("lon", lon) -// intent.putExtra("custom", isCustom) -// intent.putExtra("fromType", fromType) -// sendBroadcast(intent) -// } /** * 初始化定位监听 @@ -290,7 +263,7 @@ class MainService : Service() { } //获取图片 - private fun takePhoto( isInterval: Boolean = false, isCustom: Boolean = false) { + private fun takePhoto(isInterval: Boolean = false, isCustom: Boolean = false) { Log.d("MainService", "takePhoto -----1----->") //判断是否授权 // if (isAuthorization(BaseApplication.getAppContext())) { @@ -388,7 +361,7 @@ class MainService : Service() { override fun onDestroy() { super.onDestroy() unregisterReceiver(mAlarmBroadCast) - unregisterReceiver(mCustomSendBroadCast) +// unregisterReceiver(mCustomSendBroadCast) CarCorderController.release() CosCallbackMapController.release() LatLngStickyEventBus.getInstance().unregister(this) diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/VoiceController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/VoiceController.kt index c37f8a140d..556ad10664 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/VoiceController.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/VoiceController.kt @@ -2,6 +2,7 @@ package com.zhidao.roadcondition.service import com.mogo.commons.AbsMogoApplication import com.zhidao.auto.platform.voice.VoiceClient +import java.lang.Exception /** * @description 声音控制类 @@ -45,7 +46,11 @@ object VoiceController { * @param customType 命令 */ fun unRegisterCustomWakeupCmd(customType: String) { - voiceClient.unRegisterCustomWakeupCmd(customType) + try { + voiceClient.unRegisterCustomWakeupCmd(customType) + } catch (e:Exception){ + + } } /** diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java index 1adc5272ea..0892ada5c5 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsListActivity.java @@ -44,6 +44,8 @@ public class AppsListActivity extends MvpActivity< AppsListView, AppsListPresent getWindow().setStatusBarColor( Color.BLACK ); } super.onCreate( savedInstanceState ); + // 透明 activity 不会让前一个 activity 走 onStop 方法 + AppServiceHandler.getApis().getStatusManagerApi().setMainPageIsBackgroundStatus( TAG, true ); AppServiceHandler.getApis().getStatusManagerApi().setAppListUIShow( TAG, true ); } diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/adapter/AppIndicatorAdapter.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/adapter/AppIndicatorAdapter.java index dfd77cce0c..2c8633d0c9 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/adapter/AppIndicatorAdapter.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/adapter/AppIndicatorAdapter.java @@ -24,8 +24,8 @@ public class AppIndicatorAdapter extends RecycleBaseAdapter< AppInfo > { @Override public void onBindViewHolder( RecycleViewHolder holder, AppInfo app, int position ) { ImageView ivIndicator = holder.getView( R.id.module_apps_id_app_icon ); - ivIndicator.setImageResource( app.getIconResId() ); - holder.itemView.setOnClickListener( view -> { + ivIndicator.setBackgroundResource( app.getIconResId() ); + ivIndicator.setOnClickListener( ( view ) -> { if ( getOnItemClickedListener() != null ) { getOnItemClickedListener().onItemClicked( app, position ); } diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/NavigatorApps.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/NavigatorApps.java index 12c4c92d54..e72b57dd14 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/NavigatorApps.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/NavigatorApps.java @@ -13,18 +13,18 @@ import java.util.List; */ public class NavigatorApps { - private static AppInfo app = new AppInfo( "高德地图", "com.autonavi.amapauto", "", 0, null, R.drawable.module_apps_ic_navigator_navi, 1 ); + private static AppInfo app = new AppInfo( "高德地图", "com.autonavi.amapauto", "", 0, null, R.drawable.module_apps_ic_navigator_navi_selector, 1 ); private static AppInfo app_ = new AppInfo( "高德地图", "com.autonavi.amapauto", "", 0, null, R.drawable.module_apps_ic_navigator_navi_disable, 1 ); // private static AppInfo app2 = new AppInfo( "音乐", "com.tencent.wecarflow", "", 0, null, R.drawable.module_apps_ic_navigator_media, 2 ); - private static AppInfo app2 = new AppInfo( "音乐", "com.zhidao.music", "", 0, null, R.drawable.module_apps_ic_navigator_media, 2 ); - private static AppInfo app3 = new AppInfo( "车聊聊", "com.zhidao.imdemo", "", 0, null, R.drawable.module_apps_ic_navigator_im, 6 ); - private static AppInfo app4 = new AppInfo( "全部应用", "com.mogo.launcher.applist", "", 0, null, R.drawable.module_apps_ic_navigator_applist, 4 ); + private static AppInfo app2 = new AppInfo( "音乐", "com.zhidao.music", "", 0, null, R.drawable.module_apps_ic_navigator_media_selector, 2 ); +// private static AppInfo app3 = new AppInfo( "车聊聊", "com.zhidao.imdemo", "", 0, null, R.drawable.module_apps_ic_navigator_im_selector, 6 ); + private static AppInfo app4 = new AppInfo( "全部应用", "com.mogo.launcher.applist", "", 0, null, R.drawable.module_apps_ic_navigator_applist_selector, 4 ); public static List< AppInfo > getApps() { List< AppInfo > sApps = new ArrayList<>(); sApps.add( app ); sApps.add( app2 ); - sApps.add( app3 ); +// sApps.add( app3 ); sApps.add( app4 ); return sApps; } @@ -33,7 +33,7 @@ public class NavigatorApps { List< AppInfo > sApps = new ArrayList<>(); sApps.add( app ); sApps.add( app2 ); - sApps.add( app3 ); +// sApps.add( app3 ); sApps.add( app4 ); return sApps; } diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_applist_pressed.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_applist_pressed.png new file mode 100644 index 0000000000..4c3886419e Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_applist_pressed.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_im_pressed.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_im_pressed.png new file mode 100644 index 0000000000..759e1fc8c0 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_im_pressed.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_media_pressed.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_media_pressed.png new file mode 100644 index 0000000000..6749f97683 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_media_pressed.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_navi_pressed.png b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_navi_pressed.png new file mode 100644 index 0000000000..17db5042cc Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-ldpi/module_apps_ic_navigator_navi_pressed.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_applist_pressed.png b/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_applist_pressed.png new file mode 100644 index 0000000000..4c3886419e Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_applist_pressed.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_im_pressed.png b/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_im_pressed.png new file mode 100644 index 0000000000..759e1fc8c0 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_im_pressed.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_media_pressed.png b/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_media_pressed.png new file mode 100644 index 0000000000..6749f97683 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_media_pressed.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_navi_pressed.png b/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_navi_pressed.png new file mode 100644 index 0000000000..17db5042cc Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-mdpi/module_apps_ic_navigator_navi_pressed.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_applist_pressed.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_applist_pressed.png new file mode 100644 index 0000000000..3297305281 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_applist_pressed.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_im_pressed.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_im_pressed.png new file mode 100644 index 0000000000..2cd1f32ee1 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_im_pressed.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_media_pressed.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_media_pressed.png new file mode 100644 index 0000000000..77372413ea Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_media_pressed.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_navi_pressed.png b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_navi_pressed.png new file mode 100644 index 0000000000..33828da695 Binary files /dev/null and b/modules/mogo-module-apps/src/main/res/drawable-xhdpi/module_apps_ic_navigator_navi_pressed.png differ diff --git a/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_navigator_applist_selector.xml b/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_navigator_applist_selector.xml new file mode 100644 index 0000000000..92e4a07727 --- /dev/null +++ b/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_navigator_applist_selector.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_navigator_im_selector.xml b/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_navigator_im_selector.xml new file mode 100644 index 0000000000..9d24c4abc0 --- /dev/null +++ b/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_navigator_im_selector.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_navigator_media_selector.xml b/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_navigator_media_selector.xml new file mode 100644 index 0000000000..ac283b1fec --- /dev/null +++ b/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_navigator_media_selector.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_navigator_navi_selector.xml b/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_navigator_navi_selector.xml new file mode 100644 index 0000000000..536220ebf7 --- /dev/null +++ b/modules/mogo-module-apps/src/main/res/drawable/module_apps_ic_navigator_navi_selector.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml index c335dd18d9..c91b026b20 100644 --- a/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml @@ -23,7 +23,7 @@ 160px 160px - 30px + 10px 100px 100px \ No newline at end of file diff --git a/modules/mogo-module-apps/src/main/res/values/strings.xml b/modules/mogo-module-apps/src/main/res/values/strings.xml index 6ab6da70d9..60781ed8b7 100644 --- a/modules/mogo-module-apps/src/main/res/values/strings.xml +++ b/modules/mogo-module-apps/src/main/res/values/strings.xml @@ -26,6 +26,7 @@ com.android.messaging com.android.contacts com.android.dialer + com.zhidao.imdemo com.mogo.launcher @@ -44,5 +45,6 @@ com.iflytek.inputmethod.pad com.nwd.tools.reboot com.android.car.setting + com.zhidao.imdemo diff --git a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/module/MogoModuleAuthorize.kt b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/module/MogoModuleAuthorize.kt index 33361ceba2..bba7e8463d 100644 --- a/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/module/MogoModuleAuthorize.kt +++ b/modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/authprovider/module/MogoModuleAuthorize.kt @@ -2,11 +2,13 @@ package com.mogo.module.authorize.authprovider.module import com.alibaba.android.arouter.launcher.ARouter import com.mogo.commons.AbsMogoApplication +import com.mogo.commons.debug.DebugConfig import com.mogo.module.authorize.authprovider.biz.MogoAuthorizeManagerImpl import com.mogo.module.authorize.authprovider.biz.MogoAuthorizeRegisterHandler import com.mogo.module.authorize.authprovider.launcher.MogoMainAuthorize.Companion.mogoAuthShow import com.mogo.module.authorize.util.SharedPreferenceUtil import com.mogo.service.module.IMogoModuleProvider +import com.mogo.utils.logger.Logger class MogoModuleAuthorize private constructor() : MogoAuthorizeManagerImpl(), IMogoAuthorizeModuleProvider { @@ -21,14 +23,18 @@ class MogoModuleAuthorize private constructor() : MogoAuthorizeManagerImpl(), IM } override fun invokeAuthorization(tag: String) { - if(!SharedPreferenceUtil.hasGuide()){ - val guideService = ARouter.getInstance().build("/guide/showFragment").navigation() - if(guideService is IMogoModuleProvider){ - guideService.init(AbsMogoApplication.getApp().applicationContext) + if (DebugConfig.isNeedLoadGuideModule()) { + if(!SharedPreferenceUtil.hasGuide()){ + val guideService = ARouter.getInstance().build("/guide/showFragment").navigation() + if(guideService is IMogoModuleProvider){ + guideService.init(AbsMogoApplication.getApp().applicationContext) + } + val listener = MogoAuthorizeRegisterHandler.getAuthorizeListener(tag) + listener?.authorizeFailed("需要先执行用户引导") + return } - val listener = MogoAuthorizeRegisterHandler.getAuthorizeListener(tag) - listener?.authorizeFailed("需要先执行用户引导") - return + }else{ + Logger.i(TAG,"没有添加Guide模块，无需判断是否引导，准备展示授权") } mogoAuthShow.showAuthorizeView(tag, { //todo SP存储状态 diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoApisHandler.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoApisHandler.java index 1fc4db92be..3ca356c09c 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoApisHandler.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/MogoApisHandler.java @@ -42,7 +42,7 @@ public final class MogoApisHandler { public IMogoServiceApis getApis() { if ( sApis == null ) { synchronized ( this ) { - if ( sApis != null ) { + if ( sApis == null ) { sApis = ARouter.getInstance().navigation( IMogoServiceApis.class ); } } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java index b39f1dfb0c..d70fa857b7 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java @@ -7,7 +7,9 @@ import android.view.WindowManager; import androidx.annotation.NonNull; import com.mogo.commons.debug.DebugConfig; +import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.R; +import com.mogo.utils.logger.Logger; /** * 浮在各种wm上面的dialog基类，调用了window.setType @@ -15,13 +17,16 @@ import com.mogo.module.common.R; * @author tongchenfei */ public class BaseFloatDialog extends Dialog { + + private static final String TAG = "BaseFloatDialog"; + public BaseFloatDialog(@NonNull Context context) { this(context, R.style.BaseFloatDialogStyle); } public BaseFloatDialog(@NonNull Context context, int themeResId) { super(context, themeResId); - if(DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD) { + if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD) { addFlag(); } } @@ -32,4 +37,23 @@ public class BaseFloatDialog extends Dialog { | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION | WindowManager.LayoutParams.FLAG_LOCAL_FOCUS_MODE); } + + @Override + public void show() { + Logger.d(TAG, "onShow===="); + if (DebugConfig.isNeedHideAdasWhenShare()) { + MogoApisHandler.getInstance().getApis().getAdasControllerApi().closeADAS(); + } + super.show(); + } + + @Override + public void dismiss() { + Logger.d(TAG, "onDismiss===="); + if (DebugConfig.isNeedHideAdasWhenShare() + && MogoApisHandler.getInstance().getApis().getStatusManagerApi().isMainPageOnResume()) { + MogoApisHandler.getInstance().getApis().getAdasControllerApi().showADAS(); + } + super.dismiss(); + } } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java index c117f81214..cebd8f8905 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java @@ -27,11 +27,13 @@ public class MapCenterPointStrategy { { // 选点场景，定位中心点 Map< String, MapCenterPoint > choosePoint = new HashMap<>(); - choosePoint.put( "d80x", new MapCenterPoint( 0.5D, 0.5D ) ); - choosePoint.put( "em4", new MapCenterPoint( 0.5D, 0.5D ) ); - choosePoint.put( "e8xx", new MapCenterPoint( 0.5D, 0.5D ) ); - choosePoint.put( "f80x", new MapCenterPoint( 0.5D, 0.5D ) ); - choosePoint.put( "f8xx", new MapCenterPoint( 0.5D, 0.5D ) ); + final MapCenterPoint point = new MapCenterPoint( 0.5D, 0.5D ); + choosePoint.put( "d80x", point ); + choosePoint.put( "em4", point ); + choosePoint.put( "em3", point ); + choosePoint.put( "e8xx", point ); + choosePoint.put( "f80x", point ); + choosePoint.put( "f8xx", point ); sStrategies.put( Scene.CHOOSE_POINT, choosePoint ); } @@ -39,10 +41,13 @@ public class MapCenterPointStrategy { // 导航场景，定位视图右下角偏下 Map< String, MapCenterPoint > navi = new HashMap<>(); navi.put( "d80x", new MapCenterPoint( 0.669444444444444, 0.573333333333D ) ); - navi.put( "em4", new MapCenterPoint( 0.734375D, 0.573333333333D ) ); - navi.put( "e8xx", new MapCenterPoint( 0.734375D, 0.573333333333D ) ); - navi.put( "f80x", new MapCenterPoint( 0.705208333D, 0.575D ) ); - navi.put( "f8xx", new MapCenterPoint( 0.705208333D, 0.575D ) ); + final MapCenterPoint em4 = new MapCenterPoint( 0.734375D, 0.573333333333D ); + navi.put( "em4", em4 ); + navi.put( "em3", em4 ); + navi.put( "e8xx", em4 ); + final MapCenterPoint f80x = new MapCenterPoint( 0.705208333D, 0.575D ); + navi.put( "f80x", f80x ); + navi.put( "f8xx", f80x ); sStrategies.put( Scene.NAVI, navi ); } @@ -50,10 +55,13 @@ public class MapCenterPointStrategy { // 导航场景 vs 道路事件展示场景，定位视图右下角偏下 Map< String, MapCenterPoint > naviWithRoadEvent = new HashMap<>(); naviWithRoadEvent.put( "d80x", new MapCenterPoint( 0.669444444444444, 0.73936170212766D ) ); - naviWithRoadEvent.put( "em4", new MapCenterPoint( 0.734375D, 0.73936170212766D ) ); - naviWithRoadEvent.put( "e8xx", new MapCenterPoint( 0.734375D, 0.73936170212766D ) ); - naviWithRoadEvent.put( "f80x", new MapCenterPoint( 0.705208333D, 0.683333333333D ) ); - naviWithRoadEvent.put( "f8xx", new MapCenterPoint( 0.705208333D, 0.683333333333D ) ); + final MapCenterPoint em4 = new MapCenterPoint( 0.734375D, 0.73936170212766D ); + naviWithRoadEvent.put( "em4", em4 ); + naviWithRoadEvent.put( "em3", em4 ); + naviWithRoadEvent.put( "e8xx", em4 ); + final MapCenterPoint f80x = new MapCenterPoint( 0.705208333D, 0.683333333333D ); + naviWithRoadEvent.put( "f80x", f80x ); + naviWithRoadEvent.put( "f8xx", f80x ); sStrategies.put( Scene.NAVI_WITH_ROAD_EVENT, naviWithRoadEvent ); } @@ -61,10 +69,13 @@ public class MapCenterPointStrategy { // 巡航场景 Map< String, MapCenterPoint > aimless = new HashMap<>(); aimless.put( "d80x", new MapCenterPoint( 0.669444444444444, 0.5D ) ); - aimless.put( "em4", new MapCenterPoint( 0.734375D, 0.5D ) ); - aimless.put( "e8xx", new MapCenterPoint( 0.734375D, 0.5D ) ); - aimless.put( "f80x", new MapCenterPoint( 0.705208333D, 0.5D ) ); - aimless.put( "f8xx", new MapCenterPoint( 0.705208333D, 0.5D ) ); + final MapCenterPoint em4 = new MapCenterPoint( 0.734375D, 0.5D ); + aimless.put( "em4", em4 ); + aimless.put( "em3", em4 ); + aimless.put( "e8xx", em4 ); + final MapCenterPoint f80x = new MapCenterPoint( 0.705208333D, 0.5D ); + aimless.put( "f80x", f80x ); + aimless.put( "f8xx", f80x ); sStrategies.put( Scene.AIMLESS, aimless ); } @@ -72,32 +83,41 @@ public class MapCenterPointStrategy { // 巡航场景 vs 道路事件展示场景 Map< String, MapCenterPoint > aimlessWithRoadEvent = new HashMap<>(); aimlessWithRoadEvent.put( "d80x", new MapCenterPoint( 0.669444444444444, 0.68617 ) ); - aimlessWithRoadEvent.put( "em4", new MapCenterPoint( 0.734375D, 0.68617 ) ); - aimlessWithRoadEvent.put( "e8xx", new MapCenterPoint( 0.734375D, 0.68617 ) ); - aimlessWithRoadEvent.put( "f80x", new MapCenterPoint( 0.705208333D, 0.599074074D ) ); - aimlessWithRoadEvent.put( "f8xx", new MapCenterPoint( 0.705208333D, 0.599074074D ) ); + final MapCenterPoint em4 = new MapCenterPoint( 0.734375D, 0.68617 ); + aimlessWithRoadEvent.put( "em4", em4 ); + aimlessWithRoadEvent.put( "em3", em4 ); + aimlessWithRoadEvent.put( "e8xx", em4 ); + final MapCenterPoint f80x = new MapCenterPoint( 0.705208333D, 0.599074074D ); + aimlessWithRoadEvent.put( "f80x", f80x ); + aimlessWithRoadEvent.put( "f8xx", f80x ); sStrategies.put( Scene.AIMLESS_WITH_ROAD_EVENT, aimlessWithRoadEvent ); } { // 规划路线，定位视图右边 Map< String, MapCenterPoint > calculatePath = new HashMap<>(); - calculatePath.put( "d80x", new MapCenterPoint( 0.733398D, 0.610833D ) ); - calculatePath.put( "em4", new MapCenterPoint( 0.733398D, 0.610833D ) ); - calculatePath.put( "e8xx", new MapCenterPoint( 0.733398D, 0.610833D ) ); - calculatePath.put( "f80x", new MapCenterPoint( 0.703125D, 0.6083333D ) ); - calculatePath.put( "f8xx", new MapCenterPoint( 0.703125D, 0.6083333D ) ); + final MapCenterPoint d80x = new MapCenterPoint( 0.733398D, 0.610833D ); + calculatePath.put( "d80x", d80x ); + calculatePath.put( "em4", d80x ); + calculatePath.put( "em3", d80x ); + calculatePath.put( "e8xx", d80x ); + final MapCenterPoint f80x = new MapCenterPoint( 0.703125D, 0.6083333D ); + calculatePath.put( "f80x", f80x ); + calculatePath.put( "f8xx", f80x ); sStrategies.put( Scene.CALCULATE_PATH, calculatePath ); } { // 分类搜索，定位视图右边 Map< String, MapCenterPoint > categorySearch = new HashMap<>(); - categorySearch.put( "d80x", new MapCenterPoint( 0.733398D, 0.5D ) ); - categorySearch.put( "em4", new MapCenterPoint( 0.733398D, 0.5D ) ); - categorySearch.put( "e8xx", new MapCenterPoint( 0.733398D, 0.5D ) ); - categorySearch.put( "f80x", new MapCenterPoint( 0.733594D, 0.5D ) ); - categorySearch.put( "f8xx", new MapCenterPoint( 0.733594D, 0.5D ) ); + final MapCenterPoint d80x = new MapCenterPoint( 0.733398D, 0.5D ); + categorySearch.put( "d80x", d80x ); + categorySearch.put( "em4", d80x ); + categorySearch.put( "em3", d80x ); + categorySearch.put( "e8xx", d80x ); + final MapCenterPoint f80x = new MapCenterPoint( 0.733594D, 0.5D ); + categorySearch.put( "f80x", f80x ); + categorySearch.put( "f8xx", f80x ); sStrategies.put( Scene.CATEGORY_SEARCH, categorySearch ); } @@ -105,10 +125,13 @@ public class MapCenterPointStrategy { // V2X，场景视图右边 Map< String, MapCenterPoint > categoryV2XEvent = new HashMap<>(); categoryV2XEvent.put( "d80x", new MapCenterPoint( 0.669444444444444, 0.7D ) ); - categoryV2XEvent.put( "em4", new MapCenterPoint( 0.677734375D, 0.7D ) ); - categoryV2XEvent.put( "e8xx", new MapCenterPoint( 0.677734375D, 0.7D ) ); - categoryV2XEvent.put( "f80x", new MapCenterPoint( 0.6963541D, 0.65D ) ); - categoryV2XEvent.put( "f8xx", new MapCenterPoint( 0.6963541D, 0.65D ) ); + final MapCenterPoint em4 = new MapCenterPoint( 0.677734375D, 0.7D ); + categoryV2XEvent.put( "em4", em4 ); + categoryV2XEvent.put( "em3", em4 ); + categoryV2XEvent.put( "e8xx", em4 ); + final MapCenterPoint f80x = new MapCenterPoint( 0.6963541D, 0.65D ); + categoryV2XEvent.put( "f80x", f80x ); + categoryV2XEvent.put( "f8xx", f80x ); sStrategies.put( Scene.CATEGORY_V2X_EVENT, categoryV2XEvent ); } } diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close.png similarity index 100% rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close.png rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close.png diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close_press.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close_press.png similarity index 100% rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_panel_close_press.png rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/module_common_icon_close_press.png diff --git a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_ext_shadow_bkg.9.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_ext_shadow_bkg.9.png index 627be6d3cc..a562d17b93 100644 Binary files a/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_ext_shadow_bkg.9.png and b/modules/mogo-module-common/src/main/res/drawable-xhdpi/module_ext_shadow_bkg.9.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_normal.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_normal.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_normal.png rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_normal.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_pressed.png b/modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_pressed.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/service_car_panel_call_pressed.png rename to modules/mogo-module-common/src/main/res/drawable-xhdpi/selector_call_btn_pressed.png diff --git a/modules/mogo-module-common/src/main/res/drawable/module_common_close_selector.xml b/modules/mogo-module-common/src/main/res/drawable/module_common_close_selector.xml new file mode 100644 index 0000000000..72ab058d93 --- /dev/null +++ b/modules/mogo-module-common/src/main/res/drawable/module_common_close_selector.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-common/src/main/res/drawable/module_common_selector_call.xml b/modules/mogo-module-common/src/main/res/drawable/module_common_selector_call.xml new file mode 100644 index 0000000000..edc0ec8bc3 --- /dev/null +++ b/modules/mogo-module-common/src/main/res/drawable/module_common_selector_call.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-common/src/main/res/drawable/module_ext_shadow_bkg.9.png b/modules/mogo-module-common/src/main/res/drawable/module_ext_shadow_bkg.9.png index 2e176bee54..afb16dbbaa 100644 Binary files a/modules/mogo-module-common/src/main/res/drawable/module_ext_shadow_bkg.9.png and b/modules/mogo-module-common/src/main/res/drawable/module_ext_shadow_bkg.9.png differ diff --git a/modules/mogo-module-common/src/main/res/drawable/selector_call_btn_normal.png b/modules/mogo-module-common/src/main/res/drawable/selector_call_btn_normal.png new file mode 100644 index 0000000000..361ea19865 Binary files /dev/null and b/modules/mogo-module-common/src/main/res/drawable/selector_call_btn_normal.png differ diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index 825c68da05..cf50976e2c 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -1,15 +1,10 @@ package com.mogo.module.extensions.entrance; import android.content.Intent; -import android.graphics.Color; import android.graphics.Rect; import android.os.Bundle; -import android.os.Debug; import android.os.Handler; -import android.text.SpannableString; -import android.text.Spanned; import android.text.TextUtils; -import android.text.style.ForegroundColorSpan; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.MotionEvent; @@ -26,7 +21,6 @@ import androidx.constraintlayout.widget.ConstraintSet; import androidx.constraintlayout.widget.Group; import com.alibaba.android.arouter.launcher.ARouter; -import com.amap.api.maps.model.MyLocationStyle; import com.bumptech.glide.request.RequestOptions; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; @@ -187,6 +181,7 @@ public class EntranceFragment extends MvpFragment { @@ -293,9 +288,9 @@ public class EntranceFragment extends MvpFragment properties = new HashMap<>(); - properties.put( "type", 1 ); - MogoApisHandler.getInstance().getApis().getAnalyticsApi().track( "APP_Find_Mogoer", properties ); + properties.put("type", 1); + MogoApisHandler.getInstance().getApis().getAnalyticsApi().track("APP_Find_Mogoer", properties); } - } ); + }); dealWeatherContainer(); @@ -425,16 +421,17 @@ public class EntranceFragment extends MvpFragment>> time = " + time); + Logger.d(TAG, " playShareGuideVoice shareItemSum = " + shareItemSum + "---- intervalTime = " + intervalTime + ">>> time = " + time); if (intervalTime == 0) { SharedPrefsMgr.getInstance(getContext()).putLong(KEY_CLICK_SHARE_TIME, time); SharedPrefsMgr.getInstance(getContext()).putInt(KEY_CLICK_SHARE_BUTTON, ++shareItemSum); @@ -524,6 +521,7 @@ public class EntranceFragment extends MvpFragment 10021" ); + } catch (Exception e) { + Logger.e(TAG, e, "onIntentReceived -> 10021"); } } } @@ -777,7 +775,7 @@ public class EntranceFragment extends MvpFragment TipToast.tip("分享成功分享成功分享成功分享成功分享成功分享成功分享成功分享成功分享成功")); + findViewById(R.id.btnShowTextTip).setOnClickListener(v -> TipToast.tip("分享成功分享成功分享成功分享成功分享成功分享成功分享成功分享成功分享成功")); - findViewById(R.id.btnShowDrawableTip).setOnClickListener(v->{ + findViewById(R.id.btnShowDrawableTip).setOnClickListener(v -> { mMsgContainer.setVisibility(View.VISIBLE); TipDrawable drawable = new TipDrawable(getResources().getDrawable(R.drawable.model_ext_default_user_head), 150, 150); - TipToast.tip("分享成功",drawable); + TipToast.tip("分享成功", drawable); }); - findViewById(R.id.btnShowDrawableTipNoSize).setOnClickListener(v->{ + findViewById(R.id.btnShowDrawableTipNoSize).setOnClickListener(v -> { mMsgContainer.setVisibility(View.GONE); - String enthusiasmIndex = "一般的字加粗的字一般的字"; - SpannableString spannableStringUnSelectCountStr = new SpannableString(enthusiasmIndex); - ForegroundColorSpan foregroundColorSpanUnSelectCount = new ForegroundColorSpan(Color.RED); - spannableStringUnSelectCountStr.setSpan(foregroundColorSpanUnSelectCount, 4, 7, Spanned.SPAN_INCLUSIVE_EXCLUSIVE); - - TipToast.tip(spannableStringUnSelectCountStr.toString()); -// TipDrawable drawable = -// new TipDrawable(getResources().getDrawable(R.drawable.model_ext_default_user_head)); -// TipToast.tip("分享成功",drawable); +// String enthusiasmIndex = "一般的字加粗的字一般的字"; +// SpannableString spannableStringUnSelectCountStr = new SpannableString(enthusiasmIndex); +// ForegroundColorSpan foregroundColorSpanUnSelectCount = new ForegroundColorSpan(Color.RED); +// spannableStringUnSelectCountStr.setSpan(foregroundColorSpanUnSelectCount, 4, 7, Spanned.SPAN_INCLUSIVE_EXCLUSIVE); +// +// TipToast.tip(spannableStringUnSelectCountStr.toString()); + TipDrawable drawable = + new TipDrawable(getResources().getDrawable(R.drawable.model_ext_default_user_head)); + TipToast.tip("分享成功", drawable); }); } @@ -997,30 +995,30 @@ public class EntranceFragment extends MvpFragment seekHelpNoticeListener = new IMogoOnMessageListener() { - @Override - public Class target() { - return String.class; - } + @Override + public Class target() { + return String.class; + } - @Override - public void onMsgReceived(String obj) { - if(mStatusManager.isSeekHelping()) { - int seekNum = SharedPrefsMgr.getInstance(getContext()).getInt("seek_help_num", 0); - final int finalSeekNum = seekNum++; - SharedPrefsMgr.getInstance(getContext()).putInt("seek_help_num", seekNum); - handler.post(() -> { - seekHelpGroup.setVisibility(View.VISIBLE); - seekHelpNum.setText("" + finalSeekNum); - }); - } - } - }; + @Override + public void onMsgReceived(String obj) { + if (mStatusManager.isSeekHelping()) { + int seekNum = SharedPrefsMgr.getInstance(getContext()).getInt("seek_help_num", 0); + final int finalSeekNum = seekNum++; + SharedPrefsMgr.getInstance(getContext()).putInt("seek_help_num", seekNum); + handler.post(() -> { + seekHelpGroup.setVisibility(View.VISIBLE); + seekHelpNum.setText("" + finalSeekNum); + }); + } + } + }; private Handler handler = new Handler(); - private void listenSeekNumber(){ + private void listenSeekNumber() { mApis.getSocketManagerApi(getContext()).registerOnMessageListener(SEEK_HELP_NOTICE_NUM_MSG_TYPE, seekHelpNoticeListener); - mStatusManager.registerStatusChangedListener(TAG,StatusDescriptor.SEEK_HELPING,this); + mStatusManager.registerStatusChangedListener(TAG, StatusDescriptor.SEEK_HELPING, this); } @Override diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java index 53ddb51511..78aa40001d 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java @@ -120,9 +120,6 @@ public class EntrancePresenter extends Presenter implements Weathe // 相当于每次onResume都会请求一下个人信息，目的是能够相对及时的同步手机端的个人信息修改 requestUserInfo(); } - if(DebugConfig.isMapBased()) { - requestCarModelList(); - } getCommonConfig(); } @@ -242,38 +239,4 @@ public class EntrancePresenter extends Presenter implements Weathe return ""; } } - - private void requestCarModelList() { - Map params = new HashMap<>(8); -// params.put("sn", Utils.getSn()); - params.put("sn", "ZD802B1932L00617"); - mNetWork.create(UserInfoNetApiServices.class, DztHttpConstant.getBaseUrl()). - requestCarModelList(params). - subscribeOn(Schedulers.io()). - observeOn(Schedulers.io()). - subscribe(new SubscribeImpl(RequestOptions.create(context)) { - @Override - public void onSuccess(CarModelListResponse o) { - super.onSuccess(o); - Logger.d(TAG, "请求车模列表成功: " + o); - // todo 保存到sp中 - SharedPrefsMgr.getInstance(context).putString("CAR_MODEL_LIST", - GsonUtil.jsonFromObject(o.getResult())); - } - - @Override - public void onError(Throwable e) { - super.onError(e); - Logger.e(TAG, e, "请求自车模型失败"); - } - - @Override - public void onError(String message, int code) { - super.onError(message, code); - Logger.e(TAG, "请求自车模型失败: " + message); - } - }); - - } - } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/UserInfoNetApiServices.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/UserInfoNetApiServices.java index ef6b3bd04c..e8afa9f17b 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/UserInfoNetApiServices.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/UserInfoNetApiServices.java @@ -23,7 +23,4 @@ public interface UserInfoNetApiServices { */ @GET("carlife/carMachine/getAccountInfo") Single requestUserInfo(@QueryMap Map params); - - @GET("yycp-userDataService/app/enthusiasm/getEnthusiasmInfo/v1") - Observable requestCarModelList(@QueryMap Map params); } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java index ce1e39e34f..eb3e21a46c 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewManager.java @@ -48,7 +48,11 @@ public class TopViewManager implements IMogoTopViewManager { public void addView(View view, ViewGroup.LayoutParams params, IMogoTopViewStatusListener statusListener) { parentParams = params; - TopViewAnimHelper.getInstance().startTopInAnim(view, params, statusListener); + try { + TopViewAnimHelper.getInstance().startTopInAnim(view, params, statusListener); + } catch ( Exception e ) { + e.printStackTrace(); + } } @Override @@ -72,7 +76,11 @@ public class TopViewManager implements IMogoTopViewManager { public void addViewNoLinkage(View view, ViewGroup.LayoutParams params, IMogoTopViewStatusListener statusListener) { parentParams = params; - TopViewNoLinkageAnimHelper.getInstance().startTopInAnim(view, params, statusListener); + try { + TopViewNoLinkageAnimHelper.getInstance().startTopInAnim(view, params, statusListener); + } catch ( Exception e ) { + e.printStackTrace(); + } } @Override @@ -82,31 +90,55 @@ public class TopViewManager implements IMogoTopViewManager { @Override public void addSubView(View view, IMogoTopViewStatusListener statusListener) { - TopViewAnimHelper.getInstance().addSubView(view, parentParams, statusListener); + try { + TopViewAnimHelper.getInstance().addSubView(view, parentParams, statusListener); + } catch ( Exception e ) { + e.printStackTrace(); + } } @Override public void removeView(View view) { - TopViewAnimHelper.getInstance().startTopOutAnim(view); + try { + TopViewAnimHelper.getInstance().startTopOutAnim(view); + } catch ( Exception e ) { + e.printStackTrace(); + } } @Override public void removeViewNoLinkage(View view) { - TopViewNoLinkageAnimHelper.getInstance().startTopOutAnim(view); + try { + TopViewNoLinkageAnimHelper.getInstance().startTopOutAnim(view); + } catch ( Exception e ) { + e.printStackTrace(); + } } @Override public void removeSubView(View view) { - TopViewAnimHelper.getInstance().removeSubView(view); + try { + TopViewAnimHelper.getInstance().removeSubView(view); + } catch ( Exception e ) { + e.printStackTrace(); + } } @Override public boolean isViewAdded(View view) { - return TopViewAnimHelper.getInstance().isViewAdded(view); + try { + return TopViewAnimHelper.getInstance().isViewAdded(view); + } catch ( Exception e ){ + return false; + } } @Override public boolean isViewNoLinkageAdded(View view) { - return TopViewNoLinkageAnimHelper.getInstance().isViewAdded(view); + try { + return TopViewNoLinkageAnimHelper.getInstance().isViewAdded(view); + } catch( Exception e ){ + return false; + } } } diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/model_ext_default_user_head.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/model_ext_default_user_head.png index 726124020a..f95b06e2af 100644 Binary files a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/model_ext_default_user_head.png and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/model_ext_default_user_head.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-ldpi/model_ext_default_user_head_board.png b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/model_ext_default_user_head_board.png new file mode 100644 index 0000000000..6f17f06032 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-ldpi/model_ext_default_user_head_board.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-mdpi/model_ext_default_user_head.png b/modules/mogo-module-extensions/src/main/res/drawable-mdpi/model_ext_default_user_head.png index 726124020a..f95b06e2af 100644 Binary files a/modules/mogo-module-extensions/src/main/res/drawable-mdpi/model_ext_default_user_head.png and b/modules/mogo-module-extensions/src/main/res/drawable-mdpi/model_ext_default_user_head.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-mdpi/model_ext_default_user_head_board.png b/modules/mogo-module-extensions/src/main/res/drawable-mdpi/model_ext_default_user_head_board.png new file mode 100644 index 0000000000..6f17f06032 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-mdpi/model_ext_default_user_head_board.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/model_ext_default_user_head.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/model_ext_default_user_head.png index baa717be4d..7abea7cdfc 100644 Binary files a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/model_ext_default_user_head.png and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/model_ext_default_user_head.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/model_ext_default_user_head_board.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/model_ext_default_user_head_board.png new file mode 100644 index 0000000000..8f08dbc8db Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/model_ext_default_user_head_board.png differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml index f2a8033f4b..e46aa1dcdd 100644 --- a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml +++ b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_upload_road_condition_bkg.xml @@ -2,7 +2,7 @@ - + diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml index f1ac9dc491..d2f8f84db5 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml @@ -69,14 +69,30 @@ tools:text="···" /> + + + tools:visibility="visible" + app:layout_constraintLeft_toLeftOf="@id/ivUserHeadBoard" + app:layout_constraintTop_toTopOf="@id/ivUserHeadBoard" + app:layout_constraintRight_toRightOf="@id/ivUserHeadBoard" + app:layout_constraintBottom_toBottomOf="@id/ivUserHeadBoard"/> + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml index 05a6e0ff20..8a48af5df3 100644 --- a/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-mdpi/dimens.xml @@ -1,7 +1,8 @@ 26px - 66px + 56px + 80px 10px 2px 2px diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml index 549e102b27..71c4fe9ef9 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -147,7 +147,8 @@ 40px 45px - 120px + 100px + 134px 30px 20px 20px diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml index e61d37ba08..13e7cae46c 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml @@ -150,7 +150,8 @@ 10px 10px 45px - 120px + 100px + 134px 30px 20px 20px diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml index af3016c3c6..8e519dfe37 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -158,7 +158,8 @@ 19px 0px 26px - 66px + 56px + 80px 10px 2px 2px diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index 2379b3e458..86457f96fc 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -233,7 +233,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme @Override public void hideCoverUpLayout() { - Logger.d( TAG, "隐藏遮罩" ); + getWindow().setBackgroundDrawable( null ); mCoverUpLayout.setVisibility( View.GONE ); mServiceApis.getAdasControllerApi().showADAS(); } @@ -314,6 +314,9 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme protected void onStop() { super.onStop(); mMogoStatusManager.setMainPageIsBackgroundStatus( TAG, true ); + if ( shouldCloseADASPanelWhenPause() ) { + mServiceApis.getAdasControllerApi().closeADAS(); + } } @Override @@ -370,9 +373,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mServiceApis.getRefreshStrategyControllerApi().clearAllData(); AIAssist.getInstance( this ).release(); mServiceApis.getOnlineCarPanelApi().clear(); - if ( CallChatApi.getInstance().getApiProvider() != null ) { - CallChatApi.getInstance().getApiProvider().initVehicleTeamContainer("init", 0, null); - } ContextHolderUtil.releaseContext(); MogoModulesManager.getInstance().onDestroy(); SchemeIntent.getInstance().clear(); diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java index 09839d91eb..7c959c2012 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/SchemeIntent.java @@ -7,6 +7,7 @@ import android.text.TextUtils; import android.util.Log; import com.mogo.map.MogoLatLng; +import com.mogo.module.common.MogoApisHandler; import com.mogo.service.IMogoServiceApis; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.StatusDescriptor; diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml index 47c99c83a9..fb58d8aef2 100644 --- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml +++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml @@ -2,6 +2,7 @@ @@ -25,9 +26,9 @@ android:layout_width="@dimen/module_main_apps_fragment_container_width" android:layout_height="match_parent" android:paddingLeft="@dimen/module_main_apps_fragment_container_padding" - android:paddingRight="@dimen/module_main_apps_fragment_container_padding" android:paddingTop="@dimen/module_main_apps_fragment_container_paddingTop" - android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop"/> + android:paddingRight="@dimen/module_main_apps_fragment_container_padding" + android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop" /> @@ -58,15 +59,15 @@ android:layout_height="match_parent" android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft" android:paddingLeft="@dimen/module_main_event_panel_fragment_paddingLeft" - android:paddingRight="@dimen/module_main_event_panel_fragment_paddingRight" android:paddingTop="@dimen/module_main_event_panel_fragment_paddingTop" + android:paddingRight="@dimen/module_main_event_panel_fragment_paddingRight" android:paddingBottom="@dimen/module_main_event_panel_fragment_paddingBottom" /> + android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft" /> diff --git a/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml index 99b72ae3db..a2343c16c2 100644 --- a/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml @@ -31,4 +31,9 @@ 1920px 0px + + 0px + 0px + 6px + 6px \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml index 0f5abc133c..d04fe284b7 100644 --- a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml @@ -28,8 +28,8 @@ 20px 20px - 15px - 15px - 15px - 15px + 20px + 18px + 18px + 18px \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/values/colors.xml b/modules/mogo-module-main/src/main/res/values/colors.xml index 1a06e26bf7..639b257173 100644 --- a/modules/mogo-module-main/src/main/res/values/colors.xml +++ b/modules/mogo-module-main/src/main/res/values/colors.xml @@ -1,4 +1,4 @@ - #1D1D1D + #212831 \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/values/dimens.xml b/modules/mogo-module-main/src/main/res/values/dimens.xml index 89a3dc55f4..7662141351 100644 --- a/modules/mogo-module-main/src/main/res/values/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values/dimens.xml @@ -33,6 +33,6 @@ 2px 2px - 6px - 6px + 2px + 4px \ No newline at end of file diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java index e4257b5efc..964039e1f0 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/AutoNaviBroadcastIntentHandler.java @@ -26,6 +26,7 @@ class AutoNaviBroadcastIntentHandler implements IMogoIntentListener { // 接收高德 public static final String AUTONAVI_STANDARD_BROADCAST_SEND = "AUTONAVI_STANDARD_BROADCAST_SEND"; + private EnumMapUI mLastAMapUiType = null; public void register( IMogoIntentManager manager ) { manager.registerIntentListener( AUTONAVI_STANDARD_BROADCAST_RECV, this ); @@ -131,11 +132,17 @@ class AutoNaviBroadcastIntentHandler implements IMogoIntentListener { // 高德改变黑夜白天模式后，传递给launcher，顺便改变其他 if ( extraState == 37 ) { // 白天模式 + mLastAMapUiType = EnumMapUI.Type_Light; MogoApisHandler.getInstance().getApis().getAdasControllerApi().changeAdasControlMode( EnumMapUI.Type_Light ); } else if ( extraState == 38 ) { // 夜间模式 + mLastAMapUiType = EnumMapUI.Type_Night; MogoApisHandler.getInstance().getApis().getAdasControllerApi().changeAdasControlMode( EnumMapUI.Type_Night ); } } } + + public EnumMapUI getLastAMapUiType() { + return mLastAMapUiType; + } } diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapControlCommandHandler.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapControlCommandHandler.java index 94d8c5d59a..9d0bf3daae 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapControlCommandHandler.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapControlCommandHandler.java @@ -103,6 +103,10 @@ class MapControlCommandHandler { return; } + if ( mCallback.getAMapLastType() == ui ) { + return; + } + int KEY_TYPE = 10048; int state = 0;//2黑夜;1白天 ;0自动 switch ( ui ) { diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java index 3ff064cefc..9e34462381 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapPresenter.java @@ -296,6 +296,14 @@ public class MapPresenter extends Presenter< MapView > implements mRegisterCenter.registerADASControlStatusChangedListener( TAG, this ); } + @Override + public EnumMapUI getAMapLastType() { + if ( mAutoNaviReceiver != null ) { + return mAutoNaviReceiver.getLastAMapUiType(); + } + return null; + } + private void initBroadcast() { mAutoNaviReceiver = new AutoNaviBroadcastIntentHandler(); mAutoNaviReceiver.setCallback( this ); diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/OnMapControlCallback.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/OnMapControlCallback.java index cd6263370d..0d866efc2f 100644 --- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/OnMapControlCallback.java +++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/OnMapControlCallback.java @@ -36,4 +36,7 @@ public interface OnMapControlCallback { // 缩放地图 void onZoomMap( boolean zoomIn ); + + // 高德地图上次类型 + EnumMapUI getAMapLastType(); } \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java index 7e88cf83de..b2471ce6ec 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java @@ -45,7 +45,6 @@ import com.mogo.module.service.launchercard.LauncherCardRefresher; import com.mogo.module.service.marker.MapMarkerManager; import com.mogo.module.service.network.RefreshCallback; import com.mogo.module.service.network.RefreshModel; -import com.mogo.module.service.ttsConfig.TtsConfigModleData; import com.mogo.module.service.network.bean.HomeCompanyDistanceForPushData; import com.mogo.module.service.network.bean.HomeCompanyDistanceForPushResponse; import com.mogo.module.service.onlinecar.panel.NavigationTargetInfo; @@ -54,6 +53,7 @@ import com.mogo.module.service.refresh.AutoRefreshStrategy; import com.mogo.module.service.refresh.CustomRefreshStrategy; import com.mogo.module.service.refresh.RefreshObject; import com.mogo.module.service.strategy.CarIconDisplayStrategy; +import com.mogo.module.service.ttsConfig.TtsConfigModleData; import com.mogo.service.adas.IMogoADASController; import com.mogo.service.fragmentmanager.FragmentStackTransactionListener; import com.mogo.service.fragmentmanager.IMogoFragmentManager; @@ -76,7 +76,6 @@ import com.zhidao.carchattingprovider.CallChattingProviderConstant; import com.zhidao.carchattingprovider.ICallChatResponse; import com.zhidao.carchattingprovider.ICallProviderResponse; import com.zhidao.carchattingprovider.ICarsChattingProvider; -import com.zhidao.smartv2x.common.utils.LoggerUtils; import org.jetbrains.annotations.NotNull; import org.json.JSONObject; @@ -400,20 +399,23 @@ public class MogoServices implements IMogoMapListener, * 关闭所有模块的控制面板 */ private void closeAllPanel() { - LoggerUtils.log("zy=======stop"); - mCallProviderResponse = new ICallChatResponse() { - @Override - public void hideUserWindowError(@NotNull String errorMsg) { - LoggerUtils.log("zy=======errorMsg:" + errorMsg); - } - }; + + if ( mCallProviderResponse == null ) { + mCallProviderResponse = new ICallChatResponse() { + @Override + public void hideUserWindowError(@NotNull String errorMsg) { + } + }; + } MogoApisHandler.getInstance().getApis().getShareManager().dismissShareDialog(); MogoApisHandler.getInstance().getApis().getOnlineCarPanelApi().hidePanel(); MogoApisHandler.getInstance().getApis().getAdasControllerApi().setSettingStatus(false); MogoApisHandler.getInstance().getApis().getEventPanelManager().hidePanel(); - carsChattingProvider = (ICarsChattingProvider) ARouter.getInstance().build(CallChattingProviderConstant.CAR_CALL_PROVIDER).navigation(); + if ( carsChattingProvider == null ) { + carsChattingProvider = (ICarsChattingProvider) ARouter.getInstance().build(CallChattingProviderConstant.CAR_CALL_PROVIDER).navigation(); + } if ( carsChattingProvider != null ) { - carsChattingProvider.hideUserWindow("MOGO_COMMON_SERVICE", mContext, mCallProviderResponse); + carsChattingProvider.hideUserWindow(TAG, mContext, mCallProviderResponse); } } @@ -433,6 +435,7 @@ public class MogoServices implements IMogoMapListener, mStatusManager.registerStatusChangedListener(ServiceConst.TYPE, StatusDescriptor.SEEK_HELPING, statusChangedListener); mStatusManager.registerStatusChangedListener(ServiceConst.TYPE, StatusDescriptor.ACC_STATUS, statusChangedListener); mStatusManager.registerStatusChangedListener(ServiceConst.TYPE, StatusDescriptor.TOP_VIEW, statusChangedListener); + mStatusManager.registerStatusChangedListener(ServiceConst.TYPE, StatusDescriptor.MAIN_PAGE_IS_BACKGROUND, statusChangedListener); mStatusManager.setAIAssistReady(TAG, AIAssist.getInstance(mContext).hasFlush()); registerMogoReceiver(context); @@ -482,6 +485,10 @@ public class MogoServices implements IMogoMapListener, } AutoPilotRemoteController.getInstance().start(); + + Intent intent = new Intent( "com.freedom.ser.ACTION" ); + intent.addFlags( Intent.FLAG_INCLUDE_STOPPED_PACKAGES ); + mContext.sendBroadcast( intent ); } private void initLocationServiceProcess(Context context) { @@ -566,7 +573,6 @@ public class MogoServices implements IMogoMapListener, filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION); try { context.getApplicationContext().registerReceiver(mAIAssistReceiver, filter); - Logger.i(TAG, "register voice receiver."); } catch (Exception e) { Logger.e(TAG, e, "error. "); } @@ -585,7 +591,6 @@ public class MogoServices implements IMogoMapListener, float width = getMapCameraFactWidth(); float height = getMapCameraFactHeight(); mIsVertical = width < height; - Logger.i(TAG, "map status is vertical : " + mIsVertical); mIsMapStatusOk = true; } catch (Exception e) { e.printStackTrace(); @@ -620,7 +625,6 @@ public class MogoServices implements IMogoMapListener, case MotionEvent.ACTION_DOWN: if (mLastZoomLevel == 0) { mLastZoomLevel = mUiController.getZoomLevel(); - Logger.i(TAG, "初始化缩放级别 为：%f", mLastZoomLevel); } break; case MotionEvent.ACTION_UP: @@ -668,7 +672,6 @@ public class MogoServices implements IMogoMapListener, if (mStatusManager.isUserInteracted()) { mLastCustomRefreshCenterLocation = latLng; mLastZoomLevel = zoom; - Logger.d(TAG, "user interacted"); return; } @@ -676,7 +679,6 @@ public class MogoServices implements IMogoMapListener, if (mStatusManager.isV2XShow()) { mLastCustomRefreshCenterLocation = latLng; mLastZoomLevel = zoom; - Logger.d(TAG, "user v2x show"); return; } @@ -684,12 +686,9 @@ public class MogoServices implements IMogoMapListener, if (mStatusManager.isSearchUIShow()) { mLastCustomRefreshCenterLocation = latLng; mLastZoomLevel = zoom; - Logger.d(TAG, "user search Ui show"); return; } - Logger.d(TAG, "mLastZoomLevel = %s, zoom = %s", mLastZoomLevel, zoom); - // 手动刷新触发 if (mLastZoomLevel - zoom > mCustomRefreshStrategy.getZoomOutLevel()) { // 缩放级别缩小 @@ -704,7 +703,6 @@ public class MogoServices implements IMogoMapListener, msg.what = ServiceConst.MSG_MAP_CHANGED; msg.obj = new RefreshObject(mCustomRefreshCallback, getQueryRadius(), latLng, 0); mThreadHandler.sendMessage(msg); - Logger.d(TAG, "平移触发"); } } @@ -738,7 +736,6 @@ public class MogoServices implements IMogoMapListener, return false; } float distance = Utils.calculateLineDistance(latLng, mLastCustomRefreshCenterLocation); - Logger.d(TAG, "move distance = %s, factor = %s", distance, (factor / 2)); return distance > (factor / 2); } catch (Exception e) { Logger.e(TAG, e, "warming. "); @@ -838,7 +835,6 @@ public class MogoServices implements IMogoMapListener, if (mStatusManager.isSearchUIShow()) { return; } - Logger.d(TAG, mAutoRefreshCallback == callback ? "触发自动刷新" : "触发手动刷新"); int amount = 20; Message msg = Message.obtain(); @@ -886,16 +882,13 @@ public class MogoServices implements IMogoMapListener, delay = mRefreshRemainingTime; } if (time == 0) { - Logger.d(TAG, "立即刷新"); invokeAutoRefresh(); } else { mHandler.sendEmptyMessageDelayed(ServiceConst.MSG_TYPE_REFRESH_DECREASE, delay); } - Logger.i(TAG, "下次刷新时间：%sms后", mRefreshRemainingTime); } public void refreshStrategy() { - Logger.d(TAG, "move to center and refresh data."); mStatusManager.setUserInteractionStatus(ServiceConst.TYPE, true, false); mUiController.recoverLockMode();// 锁车代替移到中心点 restartAutoRefreshAtTime(0); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java index 4b04d99478..17f2bd0459 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AccStatusIntentHandler.java @@ -65,6 +65,13 @@ class AccStatusIntentHandler implements IntentHandler { if ( state != ACC_OFF && state != ACC_ON && state != ACC_OFF_DELAY ) { return; } + if ( state == ACC_ON || state == ACC_OFF_DELAY ) { + Intent newIntent = new Intent( "com.freedom.ser.ACTION" ); + newIntent.putExtra( "acc", true ); + newIntent.addFlags( Intent.FLAG_INCLUDE_STOPPED_PACKAGES ); + context.sendBroadcast( newIntent ); + Logger.d( TAG, "发送广播：com.freedom.ser.ACTION" ); + } boolean accOn = state == ACC_ON; if ( MarkerServiceHandler.getMogoStatusManager().isAccOn() == accOn ) { return; diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AppOperationIntentHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AppOperationIntentHandler.java index e02c90a89e..b97dcb12fc 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AppOperationIntentHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AppOperationIntentHandler.java @@ -4,11 +4,9 @@ import android.content.Context; import android.content.Intent; import android.text.TextUtils; -import com.mogo.module.service.ServiceConst; import com.mogo.utils.LaunchUtils; import com.mogo.utils.TipToast; -import org.json.JSONException; import org.json.JSONObject; import java.util.HashMap; @@ -25,7 +23,7 @@ public class AppOperationIntentHandler implements IntentHandler { public final Map< String, String > sAppPackages = new HashMap<>(); public AppOperationIntentHandler() { - sAppPackages.put( "车聊聊", "com.zhidao.imdemo" ); +// sAppPackages.put( "车聊聊", "com.zhidao.imdemo" ); } @Override diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java index d1a58c38c1..a6bd55cd38 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/launchercard/LauncherCardRefresher.java @@ -129,6 +129,7 @@ class LauncherCardRefresher { switch ( msg.what ) { case MSG_WAIT_NETWORK: trtRequestNetworkConfigStrategy(); + break; case MSG_LOAD_NET_CONFIG: loadNetworkConfigStrategy(); break; @@ -526,9 +527,18 @@ class LauncherCardRefresher { } else if ( datum instanceof TtsConfigData.NearRoads ) { result = handleNearRoadsTtsConfig( ( ( TtsConfigData.NearRoads ) datum ) ); } else if ( datum instanceof TtsConfigData.OnlineCarVsExplorerWay ) { - result = handleExplorerWayTtsConfig( ( ( TtsConfigData.OnlineCarVsExplorerWay ) datum ) ); - if ( !result ) { + if ( node.type == LauncherCardRefreshType.ExplorerWay ) { + result = handleExplorerWayTtsConfig( ( ( TtsConfigData.OnlineCarVsExplorerWay ) datum ) ); + if ( !result ) { + node.type = LauncherCardRefreshType.OnlineCar; + result = handleOnlineCarTtsConfig( ( ( TtsConfigData.OnlineCarVsExplorerWay ) datum ) ); + } + } else if( node.type == LauncherCardRefreshType.OnlineCar ){ result = handleOnlineCarTtsConfig( ( ( TtsConfigData.OnlineCarVsExplorerWay ) datum ) ); + if ( !result ) { + node.type = LauncherCardRefreshType.ExplorerWay; + result = handleExplorerWayTtsConfig( ( ( TtsConfigData.OnlineCarVsExplorerWay ) datum ) ); + } } } if ( result ) { @@ -594,7 +604,7 @@ class LauncherCardRefresher { String tts = mContext.getString( R.string.module_service_launcher_card_tips ); String info = mContext.getString( R.string.module_service_launcher_card_info ); speakTTS( String.format( tts, explorerWay.poiTotal, LauncherCardRefreshType.ExplorerWay.getDesc() ), false ); - notifyRefreshChanged( String.format( info, explorerWay.poiTotal, LauncherCardRefreshType.ExplorerWay ), explorerWay.poiTotal, tts ); + notifyRefreshChanged( String.format( info, explorerWay.poiTotal, LauncherCardRefreshType.ExplorerWay.getDesc() ), explorerWay.poiTotal, tts ); return true; } @@ -611,7 +621,7 @@ class LauncherCardRefresher { String tts = mContext.getString( R.string.module_service_launcher_card_tips ); String info = mContext.getString( R.string.module_service_launcher_card_info ); speakTTS( String.format( tts, onlineCar.carTotal, LauncherCardRefreshType.OnlineCar.getDesc() ), false ); - notifyRefreshChanged( String.format( info, onlineCar.carTotal, LauncherCardRefreshType.OnlineCar ), onlineCar.carTotal, tts ); + notifyRefreshChanged( String.format( info, onlineCar.carTotal, LauncherCardRefreshType.OnlineCar.getDesc() ), onlineCar.carTotal, tts ); return true; } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java index 1d748b46eb..222bd61acf 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java @@ -7,20 +7,15 @@ import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; -import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; import androidx.annotation.Nullable; -import androidx.constraintlayout.widget.ConstraintLayout; -import com.facebook.drawee.backends.pipeline.PipelineDraweeControllerBuilder; -import com.facebook.drawee.interfaces.DraweeController; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.MogoMarkerOptions; import com.mogo.module.common.entity.MarkerShowEntity; -import com.mogo.module.common.marker.PoiWrapper; import com.mogo.module.service.MarkerServiceHandler; import com.mogo.module.service.R; import com.mogo.service.imageloader.IMogoImageLoaderListener; @@ -108,7 +103,6 @@ public abstract class MapMarkerBaseView extends LinearLayout implements IMarkerV @Override public void onCompleted(Bitmap bitmap) { - Logger.d(TAG, "loadImageWithMarker loaded."); // 使用view渲染地图marker，刷新纹理的时候，需要重新用view生成纹理，然后在设置 if (mMarker != null) { mMarker.setIcon(fromView(MapMarkerBaseView.this)); @@ -117,7 +111,6 @@ public abstract class MapMarkerBaseView extends LinearLayout implements IMarkerV @Override public void onFailure(Exception e) { - Logger.e(TAG, "loadImageWithMarker onFailure."); } }); } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index 4900de38da..d6788b73e7 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -36,12 +36,10 @@ import com.mogo.module.service.utils.ViewUtils; import com.mogo.service.adas.IMogoADASControlStatusChangedListener; import com.mogo.service.connection.IMogoOnMessageListener; import com.mogo.service.module.IMogoBizActionDoneListener; -import com.mogo.utils.AppUtils; import com.mogo.utils.ResourcesHelper; import com.mogo.utils.ThreadPoolService; import com.mogo.utils.UiThreadHandler; import com.mogo.utils.WorkThreadHandler; -import com.mogo.utils.logger.Logger; import com.zhidao.carchattingprovider.ICallChatResponse; import org.json.JSONArray; @@ -105,8 +103,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, return; } - Logger.d( TAG, "初始化" ); - mContext = context.getApplicationContext(); mRefreshModel = new RefreshModel( mContext ); CloudPoiManager.getInstance().updateFromConfig(context); @@ -140,7 +136,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, */ @Override public boolean onMarkerClicked( IMogoMarker marker ) { - Logger.d( TAG, "onMarkerClicked 点击了大而全中的Marker：" + marker ); try { boolean result = switchMarkerOpenStatus( marker ); if ( !result ) { @@ -181,7 +176,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, if ( mLastCheckMarker != null ) { // 判断点击的是否是同一个 if ( marker.equals( mLastCheckMarker ) ) { - Logger.d( TAG, "onMarkerClicked 与上一次点击的Marker一样，不做处理：" + marker ); return false; } // 将上次选中 Marker 设置为未选中状态 @@ -235,7 +229,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, MarkerOnlineCar onlineCar = ( MarkerOnlineCar ) ( ( MarkerShowEntity ) marker.getObject() ).getBindObj(); CallChatApi.getInstance().showUserWindow( mContext, onlineCar ); } catch ( Exception e ) { - Logger.e( TAG, e, "openMarker" ); } } } @@ -406,7 +399,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, } int size = getAppropriateSize( maxAmount, exploreWayList ); Map< String, IMogoMarker > existCarMap = purgeMarkerData( exploreWayList, ModuleNames.CARD_TYPE_ROAD_CONDITION ); - Logger.i( TAG, "existCarMap: size = %d", existCarMap.size() ); for ( int i = 0; i < size; i++ ) { MarkerExploreWay markerExploreWay = exploreWayList.get( i ); if ( !markerExploreWay.getCanLive() ) { @@ -449,7 +441,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, marker.startScaleAnimationWithAlpha( 0, 1.2f, 0, 1.2f, 0f, 1f, 300, new LinearInterpolator(), new OnMarkerAnimationListener() { @Override public void onAnimStart() { - Logger.d( TAG, " onAnimStart ---1----> " ); } @Override @@ -641,7 +632,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, return; } try { - Logger.d( TAG, "dispatch data to %s", biz ); MarkerServiceHandler.getDataManager().syncData( biz, object ); } catch ( Exception e ) { e.printStackTrace(); @@ -689,7 +679,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, try { return drawMapMarkerImpl( markerShowEntity, zIndex ); } catch ( Exception e ) { - Logger.e( TAG, e, "drawMapMarker" ); return null; } } @@ -730,7 +719,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, if ( ignoreDrawRequest() ) { return; } - Logger.d( TAG, "接收到了地图大而全数据" ); runOnTargetThread( () -> { drawMapMarker( response ); } ); @@ -925,7 +913,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, if ( points.size() >= 1 ) { iMogoMarker.startSmooth( points, SMOOTH_DURATION ); } else { - Logger.d( TAG, "静止小车，但是有相同的连续坐标" ); } } @@ -947,7 +934,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, double lat2 = Double.valueOf( end.getCoordinates().get( 1 ) + "" ); double lng2 = Double.valueOf( end.getCoordinates().get( 0 ) + "" ); if ( Utils.calculateLineDistance( new MogoLatLng( lat1, lng1 ), new MogoLatLng( lat2, lng2 ) ) >= 500 ) { - Logger.d( TAG, "filter point" ); return true; } } catch ( Exception e ) { @@ -975,7 +961,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, @Override public void onBizActionDone( String biz, int position, Object data ) { - Logger.d( TAG, "biz = %s, position = %s", biz, position ); if ( data instanceof MarkerShowEntity && ( ( MarkerShowEntity ) data ).getMarker() != null ) { switchMarkerOpenStatus( ( ( MarkerShowEntity ) data ).getMarker() ); } else { @@ -986,7 +971,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoMarker marker = markers.get( position ); switchMarkerOpenStatus( marker ); } catch ( Exception e ) { - Logger.e( TAG, e, "occur error." ); } } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/receiver/MogoReceiver.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/receiver/MogoReceiver.java index b6294cb3e6..2133a299a1 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/receiver/MogoReceiver.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/receiver/MogoReceiver.java @@ -72,11 +72,9 @@ public class MogoReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { final String action = intent.getAction(); - Logger.i(TAG, "receive intent action: %s", action); if (TextUtils.equals(VOICE_ACTION, action)) { String cmd = intent.getStringExtra(PARAM_COMMAND); if (!TextUtils.isEmpty(cmd)) { - Logger.d( TAG, "receive command: %s", cmd ); mMogoIntentManager.invoke(cmd, intent); } } else { diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java index 691fbe525f..36f6a706b2 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/unwake/GlobalUnwakeManager.java @@ -96,6 +96,7 @@ public class GlobalUnwakeManager implements IProvider, IMogoIntentListener, IMog * @param type 面板位置索引 */ private void showPanelByStatus(String target, int type){ + MogoApisHandler.getInstance().getApis().getAdasControllerApi().setSettingStatus(false); if ( MogoApisHandler.getInstance().getApis().getStatusManagerApi().isMainPageOnResume() ) { MogoApisHandler.getInstance().getApis().getEventPanelManager().showPanelWithSelectedItem(type); } else { diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_close.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_close.png deleted file mode 100755 index c1381dc44c..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_close.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_marker_bkg.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_marker_bkg.png index f12819ecfc..79d163824d 100644 Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_marker_bkg.png and b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_services_marker_bkg.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_close.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_close.png deleted file mode 100755 index c1381dc44c..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_close.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_marker_bkg.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_marker_bkg.png old mode 100755 new mode 100644 index 2dff68497d..79d163824d Binary files a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_marker_bkg.png and b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_services_marker_bkg.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_close.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_close.png deleted file mode 100755 index bb3e2b1195..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_close.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_marker_bkg.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_marker_bkg.png index acdb4d7063..8679746dc7 100644 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_marker_bkg.png and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_services_marker_bkg.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable/module_services_close.png b/modules/mogo-module-service/src/main/res/drawable/module_services_close.png deleted file mode 100755 index c1381dc44c..0000000000 Binary files a/modules/mogo-module-service/src/main/res/drawable/module_services_close.png and /dev/null differ diff --git a/modules/mogo-module-service/src/main/res/drawable/selector_service_car_panel_call.xml b/modules/mogo-module-service/src/main/res/drawable/selector_service_car_panel_call.xml deleted file mode 100644 index f24ebf2862..0000000000 --- a/modules/mogo-module-service/src/main/res/drawable/selector_service_car_panel_call.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml b/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml index 1a5729e252..d4db9fff7c 100644 --- a/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml +++ b/modules/mogo-module-service/src/main/res/layout/module_services_fragment_online_car_panel.xml @@ -28,7 +28,7 @@ android:layout_height="wrap_content" android:layout_gravity="end" android:layout_marginTop="@dimen/module_services_online_car_panel_close_margin_top" - android:src="@drawable/module_services_close" /> + android:src="@drawable/module_common_close_selector" /> 16dp - 2dp - 56px - 65px + 2px + 70px + 76px 35px 35px 4px diff --git a/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml index 6feb909906..4a29170957 100644 --- a/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml @@ -1,9 +1,9 @@ 16dp - 2dp - 56px - 65px + 2px + 70px + 76px 35px 35px 4px diff --git a/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml index fb1ea406df..f210b727f5 100644 --- a/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -1,9 +1,9 @@ 20dp - 4dp - 100px - 117px + 4px + 120px + 130px 60px 60px 8px diff --git a/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml index 316b89ce91..f0d8afe799 100644 --- a/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml @@ -1,9 +1,9 @@ 20dp - 4dp - 100px - 117px + 4px + 120px + 130px 60px 60px 8px @@ -23,8 +23,8 @@ 120px 20px - 13px - 13px + 18px + 18px 13px 43px 28px diff --git a/modules/mogo-module-service/src/main/res/values/dimens.xml b/modules/mogo-module-service/src/main/res/values/dimens.xml index d5bbe4d08b..39993d0f54 100644 --- a/modules/mogo-module-service/src/main/res/values/dimens.xml +++ b/modules/mogo-module-service/src/main/res/values/dimens.xml @@ -1,9 +1,9 @@ 20dp - 4dp - 100px - 117px + 4px + 120px + 130px 60px 60px 8px diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt index ab742b4709..2a15148a56 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/StrategyShareProvider.kt @@ -48,7 +48,7 @@ class StrategyShareProvider : IProvider { // adas返回前车距离，单位是米 val frontDistanceItem = GsonUtil.objectFromJson(it, AdasFrontCarDistanceY::class.java) frontDistanceItem.result.distanceY?.apply { - blockStrategy.refreshFrontDistance(it.toDouble().toInt()) + blockStrategy.refreshFrontDistance(this.toDouble().toInt()) } } } catch (e: Exception) { diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java index 7aaf538804..49cf3c74f9 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluManager.java @@ -568,7 +568,9 @@ public class TanluManager implements IMogoMarkerClickListener, @Override public void onAnimEnd() { UiThreadHandler.postDelayed( () -> { - mogoAnimationMarker.destroy(); + if (mogoAnimationMarker != null) { + mogoAnimationMarker.destroy(); + } }, 1_200L ); } }); diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt index 59658be08a..6c47af485f 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/GridFixableShareDialog.kt @@ -105,22 +105,10 @@ class GridFixableShareDialog(context: Context) : BaseFloatDialog(context) { } override fun show() { - Logger.d(TAG, "onShow====") - if (!DebugConfig.isLauncher()) { - mApis.adasControllerApi.closeADAS() - } gridBtnManager.showShareButton() super.show() } - override fun dismiss() { - Logger.d(TAG, "onDismiss=====") - if (!DebugConfig.isLauncher() && mApis.statusManagerApi.isMainPageOnResume) { - mApis.adasControllerApi.showADAS() - } - super.dismiss() - } - companion object { private const val TAG = "GridFixableShareDialog" } diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt index 9f7b9cc036..19a7b967f5 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt @@ -136,7 +136,7 @@ class BlockStrategy(private val context: Context, private val apis: IMogoService if (current - startRecordDistanceTime >= DISTANCE_RECORD_TIME) { // 超过阈值，准备判断是否拥堵 startRecordDistanceTime = 0L - if (tripDistance in 30..1000 && isClose() && currentSpeed < 40) { + if (tripDistance in 100..1000 && isClose() && currentSpeed < 40) { Logger.d(TAG, "根据距离，判定为拥堵，准备上报, tripDistance: $tripDistance, frontDistance: $frontDistance, currentSpeed: $currentSpeed") val p = TanluUploadParams(IMogoTanluProvider.TYPE_BLOCK, IMogoTanluProvider.UPLOAD_FROM_STRATEGY_BLOCK_AUTO) val latLon = MogoLatLng(lat, lon) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java index 1ef623aac8..d02de41af6 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java @@ -15,7 +15,6 @@ import com.mogo.map.navi.IMogoNaviListener; import com.mogo.module.v2x.fragment.V2XEventPanelFragment; import com.mogo.service.eventpanel.IEventPanelProvider; import com.mogo.service.module.IMogoModuleLifecycle; -import com.mogo.service.module.IMogoModuleProvider; import com.mogo.service.module.ModuleType; import com.mogo.utils.logger.Logger; @@ -35,6 +34,7 @@ public class V2XEventPanelModuleProvider implements @Override public Fragment createFragment(Context context, Bundle data) { + Logger.e(MODULE_NAME, "事件模版 createFragment。。。。"); V2XServiceManager.init(context); return V2XEventPanelFragment.Companion.getInstance(); } @@ -92,6 +92,7 @@ public class V2XEventPanelModuleProvider implements @Override public void init(Context context) { + V2XServiceManager.init(context); Logger.e(MODULE_NAME, "事件模版 模块初始化。。。。"); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java index 53f0c88824..6828c691cf 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java @@ -189,13 +189,13 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter { + TextView share = itemView.findViewById(R.id.share_event_button); + share.setOnClickListener(view -> { V2XEventPanelFragment.Companion.getInstance().hidePanel(); mApis.getShareManager().showShareDialog(); }); - Button refresh = itemView.findViewById(R.id.refresh_button); + TextView refresh = itemView.findViewById(R.id.refresh_button); refresh.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java index fa111adadc..9514f894ce 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java @@ -10,11 +10,13 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; +import com.mogo.commons.voice.AIAssist; import com.mogo.module.common.entity.MarkerPoiTypeEnum; import com.mogo.module.v2x.R; import com.mogo.module.v2x.adapter.holder.V2XSurroundingViewHolder; import com.mogo.module.v2x.entity.panel.SurroundingConstruction; import com.mogo.module.v2x.listener.SurroundingItemClickListener; +import com.mogo.module.v2x.utils.V2XUtils; import java.util.List; diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java index 08c4d3abe2..69dac71345 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java @@ -16,6 +16,7 @@ import com.mogo.module.v2x.R; import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.adapter.holder.V2XSurroundingDetailVH; import com.mogo.module.v2x.entity.panel.SurroundingConstruction; +import com.mogo.module.v2x.listener.SurroundingDetailItemListener; import com.mogo.module.v2x.utils.RoadConditionUtils; import com.mogo.module.v2x.view.HeartLikeView; import com.mogo.module.v2x.view.HeartUnLikeView; @@ -39,10 +40,12 @@ public class V2XSurroundingDetailAdapter extends RecyclerView.Adapter list) { + public V2XSurroundingDetailAdapter(Context context, List list, SurroundingDetailItemListener listener) { mContext = context; markerExploreWays = list; + mListener = listener; } @Override @@ -77,18 +80,19 @@ public class V2XSurroundingDetailAdapter extends RecyclerView.Adapter() { +class V2XEventPanelFragment : MvpFragment(), SurroundingDetailItemListener { private val TAG = "EventPanelFragment" @@ -239,6 +240,8 @@ class V2XEventPanelFragment : MvpFragment { try { + mRbScenarioHistory?.isChecked = true mV2XScenarioHistoryFragment.fromVoice = true - if (mRbScenarioHistory?.isChecked == true) { - mV2XScenarioHistoryFragment.ttsForVoiceCheckout() - } else { - mRbScenarioHistory?.isChecked = true - } } catch (e: java.lang.Exception) { e.printStackTrace() } } 1 -> { try { - mV2XSurroundingFragment.fromVoice = true if (mRbSurroundingEvent?.isChecked == true) { mV2XSurroundingFragment.ttsForVoiceCheckout() } else { mRbSurroundingEvent?.isChecked = true + mV2XSurroundingFragment.fromVoice = true } } catch (e: java.lang.Exception) { e.printStackTrace() @@ -370,11 +377,11 @@ class V2XEventPanelFragment : MvpFragment { try { - mV2XShareEventsFragment.fromVoice = true if (mRbShareEvents?.isChecked == true) { mV2XShareEventsFragment.ttsForVoiceCheckout() } else { mRbShareEvents?.isChecked = true + mV2XShareEventsFragment.fromVoice = true } } catch (e: java.lang.Exception) { e.printStackTrace() diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java index 1ce7baece4..2d394ff5fd 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XScenarioHistoryFragment.java @@ -128,11 +128,11 @@ public class V2XScenarioHistoryFragment mClHistoryList.setVisibility(View.GONE); } mV2XScenarioHistoryAdapter.notifyDataSetChanged(); - if (fromVoice == true){ + ttsForHistoryFirstToday(); + if (fromVoice == true) { ttsForVoiceCheckout(); fromVoice = false; } - ttsForHistoryFirstToday(); } }); } @@ -155,9 +155,9 @@ public class V2XScenarioHistoryFragment } /* - * 语音查询出行动态 TTS播报 - * */ - public void ttsForVoiceCheckout(){ + * 语音查询出行动态 TTS播报 + * */ + public void ttsForVoiceCheckout() { if (mV2XHistoryScenarioData.size() > 0) { AIAssist.getInstance(V2XUtils.getApp()). speakTTSVoice("为您找到以下动态请查看", null); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java index 58ee3fa1a9..ddb5c38c6b 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XSurroundingFragment.java @@ -34,6 +34,7 @@ import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.anim.OnMarkerAnimationListener; import com.mogo.module.common.entity.MarkerExploreWay; import com.mogo.module.common.entity.MarkerLocation; +import com.mogo.module.common.entity.MarkerPoiTypeEnum; import com.mogo.module.common.entity.MarkerShowEntity; import com.mogo.module.service.ServiceConst; import com.mogo.module.v2x.R; @@ -197,6 +198,8 @@ public class V2XSurroundingFragment extends MvpFragment 0) { + if (!hasBroadTts) { + if (eventCount > 0) { AIAssist.getInstance(V2XUtils.getApp()). - speakTTSVoice("发现周边" + poiInfosList.size() + "条交通信息", null); + speakTTSVoice("发现周边" + eventCount + "条交通信息", null); } else { + Logger.e(TAG,"周边没有发现交通信息"); } } } @@ -382,10 +385,14 @@ public class V2XSurroundingFragment extends MvpFragment coordinates = message.getCoordinates(); List entityList = new ArrayList<>(); - // 移除上一次的数据 - //Context context = V2XServiceManager.getContext(); for (V2XMarkerEntity coordinate : coordinates) { //故障车机 if (coordinate.getTargetId() == V2XPoiTypeEnum.ALERT_CAR_TROUBLE_WARNING) { - //V2XMarkerEntity.UserInfoBean userInfoBean = coordinate.getUserInfo(); - //if (userInfoBean != null) { entityList.add(coordinate); - //} - //绘制 - //V2XServiceManager - // .getMoGoV2XMarkerManager() - // .drawableSpecialCarPOI(context, coordinate, V2XMarkerClickListener.getInstance()); } } if (!entityList.isEmpty()) { - //V2XUtils.runOnUiThread(() -> V2XServiceManager.getMoGoV2XScenarioManager().showOtherSeekHelpWindow(entityList)); V2XUtils.runOnUiThread(() -> { V2XMessageEntity> v2XMessageEntity = new V2XMessageEntity<>(); v2XMessageEntity.setType(V2XMessageEntity.V2XTypeEnum.ALERT_SEEK_WARNING); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java index a81d3afe76..5c9bfbafe2 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java @@ -56,66 +56,70 @@ public class V2XScenarioManager implements IV2XScenarioManager { @Override public void handlerMessage(V2XMessageEntity v2XMessageEntity) { //Logger.d(MODULE_NAME, "处理V2X场景：" + GsonUtil.jsonFromObject(v2XMessageEntity)); - synchronized (V2XScenarioManager.class) { - // 展示 - V2XUtils.runOnUiThread(() -> { - // 提取之前存储的场景 - if (v2XMessageEntity != null) { + try { + synchronized (V2XScenarioManager.class) { + // 展示 + V2XUtils.runOnUiThread(() -> { + // 提取之前存储的场景 + if (v2XMessageEntity != null) { - // 广播给应用内部其它模块 - Intent intent = new Intent(V2XConst.BROADCAST_SCENE_ACTION); - intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity); - LocalBroadcastManager.getInstance(V2XUtils.getApp()).sendBroadcast(intent); + // 广播给应用内部其它模块 + Intent intent = new Intent(V2XConst.BROADCAST_SCENE_ACTION); + intent.putExtra(V2XConst.BROADCAST_SCENE_EXTRA_KEY, v2XMessageEntity); + LocalBroadcastManager.getInstance(V2XUtils.getApp()).sendBroadcast(intent); - mV2XScenario = mV2XScenarioSet.get(v2XMessageEntity.getType()); - // 如果没有拿到之前的，根据类型分发 - if (mV2XScenario == null) { - switch (v2XMessageEntity.getType()) { - case V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING: - mV2XScenario = V2XRoadEventScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_SEEK_WARNING: - mV2XScenario = V2XSeekHelpScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_FATIGUE_DRIVING: - mV2XScenario = V2XFatigueDrivingScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_WINDOW_WARNING: - mV2XScenario = V2XPushEventScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_LIVE_CAR_WARNING: - mV2XScenario = V2XPushLiveCarScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_ANIMATION_WARNING: - mV2XScenario = V2XAnimationScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP: - mV2XScenario = V2XCarForHelpScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_ILLEGAL_PARK_WARNING: - mV2XScenario = V2XIllegalParkScenario.getInstance(); - break; - case V2XMessageEntity.V2XTypeEnum.ALERT_EVENT_UGC_WARNING: - mV2XScenario = V2XEventUgcScenario.getInstance(); - break; - default: - Logger.e(MODULE_NAME, "当前V2X消息类型未定义。"); - TipToast.tip("当前V2X消息类型未定义"); - return; + mV2XScenario = mV2XScenarioSet.get(v2XMessageEntity.getType()); + // 如果没有拿到之前的，根据类型分发 + if (mV2XScenario == null) { + switch (v2XMessageEntity.getType()) { + case V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING: + mV2XScenario = V2XRoadEventScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_SEEK_WARNING: + mV2XScenario = V2XSeekHelpScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_FATIGUE_DRIVING: + mV2XScenario = V2XFatigueDrivingScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_WINDOW_WARNING: + mV2XScenario = V2XPushEventScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_LIVE_CAR_WARNING: + mV2XScenario = V2XPushLiveCarScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_ANIMATION_WARNING: + mV2XScenario = V2XAnimationScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP: + mV2XScenario = V2XCarForHelpScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_ILLEGAL_PARK_WARNING: + mV2XScenario = V2XIllegalParkScenario.getInstance(); + break; + case V2XMessageEntity.V2XTypeEnum.ALERT_EVENT_UGC_WARNING: + mV2XScenario = V2XEventUgcScenario.getInstance(); + break; + default: + Logger.e(MODULE_NAME, "当前V2X消息类型未定义。"); + TipToast.tip("当前V2X消息类型未定义"); + return; + } + } + + // 展示最新的消息 + if (mV2XScenario != null) { + if (v2XMessageEntity.getType() != V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP) { + hidOtherPanel(); + } + mV2XScenario.init(v2XMessageEntity); + mV2XScenarioSet.put(v2XMessageEntity.getType(), mV2XScenario); } } - - // 展示最新的消息 - if (mV2XScenario != null) { - if (v2XMessageEntity.getType() != V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP) { - hidOtherPanel(); - } - mV2XScenario.init(v2XMessageEntity); - mV2XScenarioSet.put(v2XMessageEntity.getType(), mV2XScenario); - } - } - }); + }); + } + } catch (Exception e) { + e.printStackTrace(); } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java index 9717742fe9..a969aa78d1 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java @@ -20,8 +20,6 @@ import com.mogo.utils.network.utils.GsonUtil; import java.util.HashMap; import java.util.Map; -import static com.mogo.module.v2x.V2XConst.MODULE_NAME; - /** * author : donghongyu * e-mail : 1358506549@qq.com @@ -93,9 +91,6 @@ public class V2XRoadEventScenario extends AbsV2XScenario imp getV2XMessageEntity().getContent()); } - saveLocalStory(V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING, - getV2XMessageEntity().getContent().getNoveltyInfo()); - if (V2XServiceManager.getMoGoStatusManager().isMainPageOnResume()) { showWindow(); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java index bf65720439..e0c344ca6a 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java @@ -170,12 +170,6 @@ public class V2XRoadEventWindow extends RelativeLayout // 道路事件行驶到了50米附近，弹出事件纠错框给用户 //Logger.d(MODULE_NAME, "V2X===道路事件：" + v2XRoadEventEntity); - //如果poiType是道路拥堵，则调用接口查询拥堵状态 - String poiType = v2XRoadEventEntity.getPoiType(); - if(poiType != null && poiType.equals(FOURS_BLOCK_UP)){ - V2XServiceManager.getIMogoTrafficUploadProvider().verifyCurrentTrafficStatus(); - } - // 进行类型分发 switch (v2XRoadEventEntity.getPoiType()) { case V2XPoiTypeEnum.TRAFFIC_CHECK: // 交通检查 diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XListEmptyView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XListEmptyView.java index e6c4717760..4301964bd1 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XListEmptyView.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/V2XListEmptyView.java @@ -21,8 +21,8 @@ public class V2XListEmptyView extends LinearLayout { private ImageView mIvEmptyView; private TextView mTvTrip; - private Button mBtnShear; - private Button mBtnRefresh; + private TextView mBtnShear; + private TextView mBtnRefresh; private OnControlListener mOnControlListener; diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_event_panel_more.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_event_panel_more.png index c3372edaf2..c7c8180c9c 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_event_panel_more.png and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_event_panel_more.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml index dd1f94d092..88fd3e48c6 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml @@ -1,7 +1,7 @@ - + - - - - - \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_nav_normal.png b/modules/mogo-module-v2x/src/main/res/drawable/v2x_nav_normal.png new file mode 100644 index 0000000000..dad9f9ebad Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable/v2x_nav_normal.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_close.xml b/modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_close.xml deleted file mode 100644 index 2da39af66d..0000000000 --- a/modules/mogo-module-v2x/src/main/res/drawable/v2x_selector_close.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml b/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml index b524ced9c9..9fc434c82f 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/footer_nomore_view.xml @@ -10,34 +10,32 @@ diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video.xml index abf4977234..016747c2d4 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video.xml @@ -18,5 +18,5 @@ android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp_20" android:layout_marginTop="@dimen/dp_20" - android:src="@drawable/v2x_panel_close" /> + android:src="@drawable/module_common_close_selector" /> \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml index 43783d6c62..97e0aceb59 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history.xml @@ -49,7 +49,7 @@ android:id="@+id/tagEventType" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="@dimen/dp_36" + android:layout_marginStart="@dimen/dp_40" android:layout_marginTop="@dimen/dp_12" android:layout_marginBottom="@dimen/dp_36" android:background="@drawable/bg_v2x_event_type_read" @@ -87,7 +87,7 @@ android:id="@+id/llIllegalParkingLike" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="@dimen/dp_40" + android:layout_marginRight="@dimen/dp_40" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingUnLike" app:layout_constraintTop_toTopOf="parent" @@ -97,7 +97,7 @@ android:id="@+id/llIllegalParkingUnLike" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="26px" + android:layout_marginRight="@dimen/dp_40" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml index 8d055540e7..c975f7af0a 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml @@ -14,18 +14,17 @@ android:layout_alignParentEnd="true" android:layout_alignParentBottom="true" android:layout_marginStart="@dimen/dp_40" - android:layout_marginTop="@dimen/dp_21" android:layout_marginEnd="@dimen/dp_31" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="parent" app:layout_constraintTop_toTopOf="parent" - app:miv_borderColor="#4cffffff" + app:miv_borderColor="#3381A4DC" 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" - app:miv_shapeBorderWidth="@dimen/dp_4" /> + app:miv_shapeBorderWidth="@dimen/dp_5" /> @@ -92,7 +92,7 @@ android:layout_marginTop="@dimen/module_v2x_surrounding_empty_tv_margin_top" android:gravity="center_horizontal" android:text="周边5公里，暂无交通事件" - android:textColor="@color/v2x_FFF_333" + android:textColor="@color/v2x_FFF_666" android:textSize="@dimen/module_v2x_surrounding_top_textsize" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml index d3bb0f90c1..b8d06d3216 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_empty.xml @@ -9,7 +9,7 @@ android:id="@+id/no_share_image" android:layout_width="@dimen/share_empty_icon_width" android:layout_height="@dimen/share_empty_icon_width" - android:layout_marginTop="30px" + android:layout_marginTop="@dimen/share_empty_margin_top" android:src="@drawable/icon_share_empty" /> -