diff --git a/app/build.gradle b/app/build.gradle index 26c0a335f4..7c6106bd98 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -123,7 +123,8 @@ android { buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' - + // 是否需要实时上报坐标 + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' } // f系列-分体机 f80x { @@ -148,6 +149,8 @@ android { buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' + // 是否需要实时上报坐标 + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' } // f系列-分体机-高德 f8Amap { @@ -172,6 +175,8 @@ android { buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' + // 是否需要实时上报坐标 + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true' } // e系列，采用Launcher方案 e8xx { @@ -196,6 +201,8 @@ android { buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' + // 是否需要实时上报坐标 + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'false' } // 同上 em4 { @@ -220,6 +227,8 @@ android { buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' + // 是否需要实时上报坐标 + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'false' } // e系列-2+32，对标D系列2+32，采用独立app的形式 em3 { @@ -244,6 +253,8 @@ android { buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' + // 是否需要实时上报坐标 + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'false' } // e系列-1+16，对标D系列1+16，采用独立app形式 em1 { @@ -268,6 +279,8 @@ android { buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false' // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' + // 是否需要实时上报坐标 + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'false' } // e系列-1+16，对标D系列1+16，采用独立app形式 em2 { @@ -292,6 +305,8 @@ android { buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false' // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' + // 是否需要实时上报坐标 + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'false' } // d系列 d8xx { @@ -316,6 +331,8 @@ android { buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'true' + // 是否需要实时上报坐标 + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'false' } // d系列 2 + 32 d80x { @@ -340,6 +357,8 @@ android { buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'true' + // 是否需要实时上报坐标 + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'false' } // d系列 1+16 版本 d82x { @@ -364,6 +383,8 @@ android { buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false' // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'true' + // 是否需要实时上报坐标 + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'false' } // 比亚迪 bydauto { @@ -388,6 +409,8 @@ android { buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true' // 分享时是否隐藏 adas buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false' + // 是否需要实时上报坐标 + buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', '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 a8443faa26..47e247daa2 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -141,6 +141,7 @@ public class MogoApplication extends AbsMogoApplication { DebugConfig.setMapBased( BuildConfig.IS_MAP_BASED ); DebugConfig.setNeedLoadGuideModule( BuildConfig.IS_NEED_LOAD_GUIDE_MODULE ); DebugConfig.setNeedHideAdasWhenShare( BuildConfig.IS_NEED_HIDE_ADAS_WHEN_SHARE ); + DebugConfig.setNeedUploadCoordinatesInTime( BuildConfig.IS_NEED_UPLOAD_COORDINATES_IN_TIME ); // DebugConfig.setObuType( BuildConfig.OBU_TYPE ); } diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java index d9623194c2..b414122da7 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java @@ -1,6 +1,7 @@ package com.mogo.commons; import android.app.Application; +import android.content.Context; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -24,6 +25,7 @@ import com.mogo.commons.storage.SpStorage; import com.mogo.httpdns.IMogoHttpDns; import com.mogo.httpdns.MogoHttpDnsHandler; import com.mogo.utils.ThreadPoolService; +import com.mogo.utils.TipDrawable; import com.mogo.utils.TipToast; import com.mogo.utils.network.NetConfig; import com.mogo.utils.storage.SharedPrefsMgr; @@ -85,25 +87,33 @@ public abstract class AbsMogoApplication extends Application { if ( TextUtils.isEmpty( message ) ) { return null; } - View contentView; - if ( tipDrawable == null ) { - contentView = LayoutInflater.from( context ).inflate( R.layout.module_commons_layout_toast, null ); - TextView txt = contentView.findViewById( R.id.module_commons_toast_msg ); - txt.setText( message ); - } else { - // 有图片，使用带图片的布局，当前只实现了左侧图片 - contentView = LayoutInflater.from( context ).inflate( R.layout.module_commons_layout_toast_with_left_drawable, null ); - TextView txt = contentView.findViewById( R.id.module_commons_toast_msg ); - ImageView img = contentView.findViewById( R.id.module_commons_toast_left_drawable ); - img.setImageDrawable( tipDrawable.getDrawable() ); - ViewGroup.LayoutParams params = img.getLayoutParams(); - params.width = tipDrawable.getWidth(); - params.height = tipDrawable.getHeight(); - txt.setText( message ); + try { + View contentView = generateToastView( context, message, tipDrawable ); + return contentView; + } catch ( Exception e ) { } - return contentView; + return null; } ) ); - DebugConfig.setUseCustomMap( SharedPrefsMgr.getInstance( this ).getBoolean( "useCustomMap", false ) ); + } + + private View generateToastView( Context context, String message, TipDrawable tipDrawable){ + View contentView; + if(tipDrawable==null) { + contentView = LayoutInflater.from(context).inflate(R.layout.module_commons_layout_toast, null); + TextView txt = contentView.findViewById(R.id.module_commons_toast_msg); + txt.setText(message); + }else{ + // 有图片，使用带图片的布局，当前只实现了左侧图片 + contentView = LayoutInflater.from(context).inflate(R.layout.module_commons_layout_toast_with_left_drawable, null); + TextView txt = contentView.findViewById(R.id.module_commons_toast_msg); + ImageView img = contentView.findViewById(R.id.module_commons_toast_left_drawable); + img.setImageDrawable(tipDrawable.getDrawable()); + ViewGroup.LayoutParams params = img.getLayoutParams(); + params.width = tipDrawable.getWidth(); + params.height = tipDrawable.getHeight(); + txt.setText(message); + } + return contentView; } /** 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 338b878ce7..ee43f05a07 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 @@ -371,4 +371,17 @@ public class DebugConfig { public static void setNeedHideAdasWhenShare( boolean isNeedHideAdas ) { DebugConfig.isNeedHideAdasWhenShare = isNeedHideAdas; } + + /** + * 是否需要实时上报坐标位置 + */ + private static boolean sIsNeedUploadCoordinatesInTime = false; + + public static boolean isNeedUploadCoordinatesDurationInTime() { + return sIsNeedUploadCoordinatesInTime; + } + + public static void setNeedUploadCoordinatesInTime( boolean sIsNeedUploadCoordinatesInTime ) { + DebugConfig.sIsNeedUploadCoordinatesInTime = sIsNeedUploadCoordinatesInTime; + } } diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/MogoBaseMapView.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/MogoBaseMapView.java index 158e2b1d50..6e433843a1 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/MogoBaseMapView.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/MogoBaseMapView.java @@ -35,6 +35,7 @@ public abstract class MogoBaseMapView extends FrameLayout implements ILifeCycle private void init( Context context ) { addMapView( context ); + MogoMap.getInstance().init( getContext(), mMapView.getMap() ); } protected abstract void addMapView( Context context ); diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java index a8b4db6f96..efbc64f845 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/EventDispatchCenter.java @@ -19,6 +19,7 @@ import com.mogo.map.navi.MogoCongestionInfo; import com.mogo.map.navi.MogoNaviInfo; import com.mogo.map.navi.MogoTraffic; import com.mogo.map.uicontroller.EnumMapUI; +import com.mogo.module.common.MogoApisHandler; import com.mogo.module.main.registercenter.MogoRegisterCenterHandler; import com.mogo.service.adas.IMogoADASControlStatusChangedListener; import com.mogo.utils.logger.Logger; @@ -274,6 +275,13 @@ public class EventDispatchCenter implements } } } + if ( ui == EnumMapUI.Type_VR ) { + MogoApisHandler.getInstance().getApis().getStatusManagerApi() + .setVrMode( TAG, true ); + } else { + MogoApisHandler.getInstance().getApis().getStatusManagerApi() + .setVrMode( TAG, false ); + } } @Override diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java index fbefcf0fc9..b1402fee9b 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServiceProvider.java @@ -10,10 +10,12 @@ import androidx.fragment.app.Fragment; import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.commons.AbsMogoApplication; +import com.mogo.commons.debug.DebugConfig; import com.mogo.map.listener.IMogoMapListener; import com.mogo.map.location.IMogoLocationListener; import com.mogo.map.marker.IMogoMarkerClickListener; import com.mogo.map.navi.IMogoNaviListener; +import com.mogo.module.common.utils.CarSeries; import com.mogo.module.service.location.MogoRTKLocation; import com.mogo.service.module.IMogoModuleLifecycle; import com.mogo.service.module.IMogoModuleProvider; @@ -97,7 +99,9 @@ public class MogoServiceProvider implements IMogoModuleProvider { public void init( Context context ) { Logger.d( TAG, "init" ); MarkerServiceHandler.init( context ); - MogoRTKLocation.getInstance().init(); + if ( DebugConfig.isNeedUploadCoordinatesDurationInTime() ) { + MogoRTKLocation.getInstance().init(); + } MogoServices.getInstance().preInit( context ); UiThreadHandler.postDelayed( () -> { MogoServices.getInstance().init( AbsMogoApplication.getApp() ); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigApiService.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigApiService.java index bc153322dd..4bcd374a0a 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigApiService.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/ttsConfig/TtsConfigApiService.java @@ -1,15 +1,9 @@ package com.mogo.module.service.ttsConfig; -import com.mogo.commons.data.BaseData; import com.mogo.module.service.network.bean.TtsConfigEntity; -import java.util.Map; - import io.reactivex.Observable; -import retrofit2.http.FieldMap; -import retrofit2.http.FormUrlEncoded; import retrofit2.http.GET; -import retrofit2.http.POST; /** * @author ：zhuangyan