diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java index 1e235f6565..d78109fed5 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java @@ -160,6 +160,7 @@ public class BusPassengerModel { || data.getResult() == null || data.getResult().getSites() == null) { routesResult = null; + mNextStationIndex = 0; startOrStopCalculateRouteInfo(false); if (mRouteLineInfoCallback != null){ mRouteLineInfoCallback.showNoTaskView(); diff --git a/app/build.gradle b/app/build.gradle index 9ce3326429..1548f70962 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -201,6 +201,8 @@ android { buildConfigField 'String', 'WORKING_BRANCH_NAME', getWorkingBranchName() buildConfigField 'String', 'WORKING_BRANCH_HASH', getWorkingBranchHash() buildConfigField 'String', 'APP_BUILD_TIME', getBuildTime() + buildConfigField 'String', 'MAP_SDK_VERSION', "\"${MAP_SDK_VERSION}\"" + buildConfigField 'String', 'MAP_SDK_OPT_VERSION', "\"${MAP_SDK_OPERATION_VERSION}\"" } // 配置网络环境，QA、线上、演示 qa { diff --git a/app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt b/app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt index 64166537b2..dbdbc21a98 100644 --- a/app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt +++ b/app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt @@ -55,6 +55,8 @@ class ConfigStartUp : AndroidStartup() { DebugConfig.setCarMachineType(BuildConfig.CAR_MACHINE_TYPE) DebugConfig.setProductFlavor(BuildConfig.FLAVOR_product) DebugConfig.setSocketAppId(BuildConfig.SOCKET_APP_ID) + DebugConfig.setMapVersion(BuildConfig.MAP_SDK_VERSION) + DebugConfig.setMapOptVersion(BuildConfig.MAP_SDK_OPT_VERSION) DebugConfig.setNeedUploadCoordinatesInTime(BuildConfig.IS_NEED_UPLOAD_COORDINATES_IN_TIME) } diff --git a/app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/utils/CrashHandler.java b/app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/utils/CrashHandler.java index a1fbf50402..9424dfa55a 100644 --- a/app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/utils/CrashHandler.java +++ b/app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/utils/CrashHandler.java @@ -134,7 +134,7 @@ public class CrashHandler implements UncaughtExceptionHandler { // 获取设备参数信息 getDeviceInfo(mContext); // mLogInfo.put("versionName", String.valueOf(BuildConfig.VERSION_CODE)); -// mLogInfo.put("versionCode", BuildConfig.VERSION_NAME); +// mLogInfo.put("versionCode", BuildConfig.`VERSION_NAME`); // 保存日志文件 String result = saveCrashLogToFile(paramThrowable); mDefaultHandler.uncaughtException(paramThread, paramThrowable); diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarManager.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarManager.java deleted file mode 100644 index 775077088e..0000000000 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarManager.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.mogo.eagle.core.function.bindingcar; - -import android.content.Context; - -import com.mogo.eagle.core.function.api.bindingcar.BindingcarCallBack; -import com.mogo.eagle.core.function.bindingcar.network.BindingcarNetWorkManager; -import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; - -/** - * @author lixiaopeng - * @description - * @since: 10/27/21 - */ -public class BindingcarManager { - private String TAG = "BindingcarManager"; - private static BindingcarManager mBindingcarManager; - private Context mContext; - - public static synchronized BindingcarManager getInstance() { - synchronized (BindingcarManager.class) { - if (mBindingcarManager == null) { - mBindingcarManager = new BindingcarManager(); - } - } - return mBindingcarManager; - } - - protected void getBindingcarInfo() { - } - - protected void modifyCarInfo(BindingcarCallBack callBack) { - } - - - -} - diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java index 1e61715f12..f484c74f53 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java @@ -4,6 +4,7 @@ import android.content.Context; import android.util.Log; import com.alibaba.android.arouter.facade.annotation.Route; +import com.mogo.eagle.core.data.bindingcar.ModifyBindingcarInfo; import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.data.config.HmiBuildConfig; import com.mogo.eagle.core.data.constants.MogoServicePaths; @@ -12,9 +13,11 @@ import com.mogo.eagle.core.function.api.bindingcar.IMoGoBindingcarProvider; import com.mogo.eagle.core.function.appupgrade.network.UpgradeAppNetWorkManager; import com.mogo.eagle.core.function.bindingcar.network.BindingcarNetWorkManager; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager; +import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager; import com.mogo.eagle.core.function.ipcupgrade.IPCUpgradeManager; import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils; import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; +import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import org.jetbrains.annotations.NotNull; diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarApiService.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarApiService.java index 0dde914f8b..803fc96ee7 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarApiService.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarApiService.java @@ -31,7 +31,7 @@ public interface BindingcarApiService { * @return {@link ModifyBindingcarInfo} */ @Headers("Content-Type:application/json;charset=UTF-8") - @POST("eagleEye-mis/cmdbapi/pad/updatePadByMac") + @POST("eagleEye-mis/cmdbapi/pad/v2/updatePadByMac") Observable modifyBindingcarInfo(/*@Header("access_token") String access_token,*/ @Body RequestBody requestBody); } diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java index d9c1726171..b687adde48 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java @@ -1,5 +1,7 @@ package com.mogo.eagle.core.function.bindingcar.network; +import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BINDING; + import android.content.Context; import android.util.Log; @@ -7,8 +9,11 @@ import com.mogo.commons.constants.HostConst; import com.mogo.commons.constants.SharedPrefsConstants; import com.mogo.eagle.core.data.bindingcar.BindingcarInfo; import com.mogo.eagle.core.data.bindingcar.ModifyBindingcarInfo; +import com.mogo.eagle.core.data.config.HdMapBuildConfig; import com.mogo.eagle.core.function.api.bindingcar.BindingcarCallBack; +import com.mogo.eagle.core.function.bindingcar.R; import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; +import com.mogo.eagle.core.function.call.map.CallerHDMapManager; import com.mogo.eagle.core.network.MoGoRetrofitFactory; import com.mogo.eagle.core.network.utils.GsonUtil; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; @@ -57,9 +62,8 @@ public class BindingcarNetWorkManager { * @param macAddress mac地址 */ public void getBindingcarInfo(Context context, String macAddress, String widevineIDWithMd5, int screenType) { -// String macAddress1 = "48:b0:2d:3a:bc:78"; -// String macAddress1 = "48:b0:2d:4d:b9:63"; -// String sn = "X20202203105S688HZ"; +// String macAddress1 = "48:b0:2d:4d:33:40"; +// String sn = "X2020220417KA94QIN"; BindingcarRequest request = new BindingcarRequest(macAddress, widevineIDWithMd5, screenType); RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request)); @@ -74,36 +78,27 @@ public class BindingcarNetWorkManager { @Override public void onNext(@NonNull BindingcarInfo info) { if (info != null && info.getData() != null) { - CallerLogger.INSTANCE.d(TAG, "getBindingcarInfo onNext info.getData() =" + info.getData().toString()); - Log.d(TAG, "getBindingcarInfo onNext info.getData() =" + info.getData().toString()); - if (info.getData().getCompare().equals("0")) { - CallerHmiManager.INSTANCE.showBindingcarDialog(); - } else if (info.getData().getCompare().equals("3")) { - CallerHmiManager.INSTANCE.showModifyBindingcarDialog(); - } else if (info.getData().getCompare().equals("null")) { - TipToast.shortTip("当前工控机没有入库"); - } - + CallerLogger.INSTANCE.d(M_BINDING + TAG, "getBindingcarInfo onNext info.getData() =" + info.getData().toString()); //根据车辆类型切换不同的车辆模型,只针对红旗做处理 -// if (info.getData().getVendor().equals("一汽红旗")) { //TODO -// CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.hq_h9); -// } - -// else if (info.getData().getVendor().equals("东风汽车集团")) { -// CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.chuzuche); -// } else if (info.getData().getVendor().equals("金旅星辰")) { -// CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.xiaobache); -// } else { -// CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.chuzuche); -// } - + updateCarVrIconRes(info.getData().getBrandId()); + switch (info.getData().getCompare()) { + case "0": + CallerHmiManager.INSTANCE.showBindingcarDialog(); + break; + case "3": + CallerHmiManager.INSTANCE.showModifyBindingcarDialog(); + break; + case "null": + TipToast.shortTip("当前工控机没有入库"); + break; + } SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.CAR_INFO, GsonUtils.toJson(info.getData())); } } @Override public void onError(@NonNull Throwable e) { - CallerLogger.INSTANCE.e(TAG, "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); + CallerLogger.INSTANCE.e(M_BINDING + TAG, "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); } @Override @@ -118,6 +113,8 @@ public class BindingcarNetWorkManager { * mac: 48:b0:2d:3a:9c:19 */ public void modifyBindingcar(String macAddress, String widevineIDWithMd5, BindingcarCallBack callBack, int screenType) { +// String macAddress1 = "48:b0:2d:4d:33:40"; +// String sn = "X2020220417KA94QIN"; BindingcarRequest request = new BindingcarRequest(macAddress, widevineIDWithMd5, screenType); RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request)); mBindingcarApiService.modifyBindingcarInfo(requestBody) @@ -132,14 +129,14 @@ public class BindingcarNetWorkManager { public void onNext(@NonNull ModifyBindingcarInfo info) { if (info != null) { callBack.callBackResult(info); - Log.d(TAG, "modifyBindingcar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString()); - CallerLogger.INSTANCE.d(TAG, "modifyBindingcar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString()); + CallerLogger.INSTANCE.d(M_BINDING + TAG, "modifyBindingcar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString()); + updateCarVrIconRes(info.getData().getBrandId()); } } @Override public void onError(@NonNull Throwable e) { - CallerLogger.INSTANCE.e(TAG, "modifyBindingcar onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); + CallerLogger.INSTANCE.e(M_BINDING + TAG, "modifyBindingcar onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); } @Override @@ -149,4 +146,30 @@ public class BindingcarNetWorkManager { } + private void updateCarVrIconRes(String brandId){ + if(brandId == null || brandId.isEmpty()){ + return; + } + CallerLogger.INSTANCE.d(M_BINDING + TAG,"updateCarVrIconRes : " + brandId); + switch (brandId){ + case "1": + CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.chuzuche); + HdMapBuildConfig.currentCarVrIconRes =R.raw.chuzuche; + break; + case "2": + CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.hq_h9); + HdMapBuildConfig.currentCarVrIconRes =R.raw.hq_h9; + break; + case "3": + CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.xiaobache); + HdMapBuildConfig.currentCarVrIconRes =R.raw.xiaobache; + break; + default: + CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.chuzuche); + HdMapBuildConfig.currentCarVrIconRes =R.raw.chuzuche; + break; + } + + } + } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/SyncConfig.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/SyncConfig.kt index a47fe42f12..51ca529e18 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/SyncConfig.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/SyncConfig.kt @@ -13,7 +13,6 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA import com.mogo.eagle.core.utilcode.util.NetworkUtils -import com.mogo.map.MogoMap import com.zhjt.mogo_core_function_devatools.trace.network.StartUpTraceNetWorkModel import com.zhjt.service.chain.ChainLog import com.zhjt.service.chain.TracingConstants @@ -35,9 +34,8 @@ object SyncConfig { AppConfigInfo.mogoToken = MoGoAiCloudClient.getInstance().aiCloudClientConfig.token } AppConfigInfo.netMode = DebugConfig.getNetMode() - if (MogoMap.getInstance().mogoMap != null) { - AppConfigInfo.mapSdkVersion = MogoMap.getInstance().mogoMap.mapVersion - } + AppConfigInfo.mapSdkVersion = DebugConfig.getMapVersion() + AppConfigInfo.mapSdkOptVersion = DebugConfig.getMapOptVersion() AppConfigInfo.isConnectNet = NetworkUtils.isConnected(context) AppConfigInfo.isConnectSocket = MogoStatusManager.getInstance().isSocketOnLine when { @@ -69,7 +67,7 @@ object SyncConfig { startUpTraceModel.report(traceId, { traceId = it }, { - CallerLogger.e("$M_DEVA${"SyncConfig"}","error : $it") + CallerLogger.e("$M_DEVA${"SyncConfig"}", "error : $it") }) } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XWarningBroadcastReceiver.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XWarningBroadcastReceiver.kt index 244d170bfa..6207e5eb1b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XWarningBroadcastReceiver.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XWarningBroadcastReceiver.kt @@ -3,6 +3,7 @@ package com.mogo.eagle.core.function.hmi.receiver import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.util.Log import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.hmi.WaringConst import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger @@ -77,6 +78,9 @@ class V2XWarningBroadcastReceiver : BroadcastReceiver() { if (EventTypeEnum.TYPE_USECASE_ID_IVP.poiType == v2xType.toString()) { CallerHmiManager.showLimitingVelocity(1) } + if (alertContent.isNullOrEmpty() || ttsContent.isNullOrEmpty()) { + Log.d("MsgBox-V2XWarningBR", "alertContent或ttsContent为空!") + } CallerMsgBoxManager.saveMsgBox( MsgBoxBean( MsgBoxType.V2X, diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index 8ce2536cf9..1313c9a343 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -9,6 +9,7 @@ import android.os.Build.VERSION_CODES import android.os.Bundle import android.text.TextUtils import android.transition.* +import android.util.* import android.view.Gravity import android.view.View import android.view.ViewGroup @@ -60,8 +61,8 @@ import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager import com.mogo.eagle.core.function.call.check.CallerCheckManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.eagle.core.function.call.hmi.CallerHmiManager -import com.mogo.eagle.core.function.call.map.CallerMapDataCollectorManager -import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager +import com.mogo.eagle.core.function.call.map.* +import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager.Scene.Turning import com.mogo.eagle.core.function.call.monitor.CallerMonitorManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager @@ -98,6 +99,7 @@ import com.mogo.eagle.core.utilcode.reminder.api.* import com.mogo.eagle.core.utilcode.reminder.api.IReminder.IStateChangeListener import com.mogo.eagle.core.utilcode.reminder.api.impl.* import com.mogo.eagle.core.utilcode.util.* +import com.mogo.eagle.core.utilcode.util.TimeUtils import com.mogo.eagle.core.utilcode.util.TimeUtils.millis2String import com.mogo.map.MogoMap import com.zhidao.support.adas.high.common.MogoReport.Code.Error.EMAP.* @@ -1372,12 +1374,26 @@ class MoGoHmiFragment : MvpFragment(), private var isRightLight: Boolean = false private var isDisappare: Boolean = false + @Volatile + private var isVisualAngleChanged = false + /** * 显示转向灯效果 if (HmiBuildConfig.isShowBadCaseView) { */ override fun showTurnLight(light: Int) { if (HmiBuildConfig.isShowTurnLightView) { ThreadUtils.runOnUiThread { + if (light == 1 || light == 2) { + if (!isVisualAngleChanged) { + isVisualAngleChanged = true + CallerVisualAngleManager.changeVisualAngle(Turning(true)) + } + } else { + if (isVisualAngleChanged) { + isVisualAngleChanged = false + CallerVisualAngleManager.changeVisualAngle(Turning(false)) + } + } if (light == 1) { if (!isLeftLight) { isLeftLight = true diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index b36220de4e..d29227f462 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -73,13 +73,11 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr import com.mogo.eagle.core.utilcode.mogo.toast.TipToast import com.mogo.eagle.core.utilcode.util.* -import com.mogo.map.MogoMap import com.mogo.map.MogoMapUIController import com.mogo.map.uicontroller.VisualAngleMode import com.mogo.map.uicontroller.VisualAngleMode.* import com.mogo.eagle.core.function.business.routeoverlay.* import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager -import com.mogo.eagle.core.function.v2x.vip.VipCarManager import com.zhidao.easysocket.utils.L import com.zhidao.support.adas.high.other.permission.BackgrounderPermission import com.zhjt.mogo_core_function_devatools.env.* @@ -1691,8 +1689,8 @@ class DebugSettingView @JvmOverloads constructor( } tvIpcVersionInfo.text = "MAP：${mAutoPilotStatusInfo?.dockVersion}" tvIpcVersionInfoKey.text = "MAP：${mAutoPilotStatusInfo?.dockVersion}" - tvMoGoMapVersion.text = "HD-Map版本：${MogoMap.getInstance().mogoMap.mapVersion}" - tvMoGoMapVersionKey.text = "HD-Map版本：${MogoMap.getInstance().mogoMap.mapVersion}" + tvMoGoMapVersion.text = "HD-Map版本：${DebugConfig.getMapVersion()}" + tvMoGoMapVersionKey.text = "HD-Map版本：${DebugConfig.getMapVersion()}" tvGitBranchInfo.text = "Git分支：${AppConfigInfo.workingBranchName}" tvAppBuildTimeInfo.text = "版本构建时间：${AppConfigInfo.appBuildTime}" diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/MogoMapService.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/MogoMapService.java index 8bd5018572..671ec4b65e 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/MogoMapService.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/MogoMapService.java @@ -8,7 +8,6 @@ import com.mogo.eagle.core.function.api.map.marker.IMogoMarkerService; import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager; import com.mogo.map.MogoGeoSearch; import com.mogo.map.MogoLocationClient; -import com.mogo.map.MogoMap; import com.mogo.map.MogoMapUIController; import com.mogo.map.MogoMarkerManager; import com.mogo.map.MogoOverlayManager; @@ -79,15 +78,6 @@ public class MogoMapService implements IMogoMapService { return new MogoTrafficSearch(); } - @Override - public String getMapVersion() { - if (MogoMap.getInstance().getMogoMap() != null) { - return MogoMap.getInstance().getMogoMap().getMapVersion(); - } else { - return "0"; - } - } - @Override public void init(Context context) { CallerVisualAngleManager.INSTANCE.init(context); diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt index 1be115a6a7..66988e4d97 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt @@ -375,6 +375,9 @@ class MogoPrivateObuManager private constructor() { ObuConstants.STATUS.ADD -> { //不显示弹框，其它保留 CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_OBU}", "old onCvxRtiThreatIndInfo ------> appId = $appId --- alertContent = $alertContent --- ttsContent = $ttsContent ") + if (alertContent.isNullOrEmpty() || ttsContent.isNullOrEmpty()) { + Log.d("MsgBox-PriObuManager4", "alertContent或ttsContent为空!") + } CallerMsgBoxManager.saveMsgBox( MsgBoxBean( MsgBoxType.OBU, @@ -508,6 +511,9 @@ class MogoPrivateObuManager private constructor() { //显示警告红边 CallerHmiManager.showWarning(direction) CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_OBU}", "old onCvxPtcThreatIndInfo ------> v2xType = $v2xType --- alertContent = $alertContent --- ttsContent = $ttsContent ") + if (alertContent.isNullOrEmpty() || ttsContent.isNullOrEmpty()) { + Log.d("MsgBox-PriObuManager5", "alertContent或ttsContent为空!") + } CallerMsgBoxManager.saveMsgBox( MsgBoxBean( MsgBoxType.OBU, @@ -729,6 +735,9 @@ class MogoPrivateObuManager private constructor() { ttsContent = EventTypeEnum.getWarningTts(appId.toString()) alertContent = EventTypeEnum.getWarningContent(appId.toString()) CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_OBU}", "old changeTrafficLightStatus ------> appId.toString() = ${appId.toString()} --- alertContent = $alertContent --- ttsContent = $ttsContent ") + if (alertContent.isNullOrEmpty() || ttsContent.isNullOrEmpty()) { + Log.d("MsgBox-PriObuManager1", "alertContent或ttsContent为空!") + } CallerMsgBoxManager.saveMsgBox( MsgBoxBean( MsgBoxType.OBU, @@ -803,6 +812,9 @@ class MogoPrivateObuManager private constructor() { val maxSpeed = currentLight.glosa_suggested_speed_max.toInt() if (maxSpeed > 0) { CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_OBU}", "old changeTrafficLightStatus ------> TYPE_USECASE_ID_IVP_GREEN --- alertContent = $alertContent --- ttsContent = $ttsContent ") + if (alertContent.isNullOrEmpty() || ttsContent.isNullOrEmpty()) { + Log.d("MsgBox-PriObuManager2", "alertContent或ttsContent为空!") + } CallerMsgBoxManager.saveMsgBox( MsgBoxBean( MsgBoxType.OBU, @@ -938,6 +950,9 @@ class MogoPrivateObuManager private constructor() { CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_OBU}", "old handleSdkObu appId2 = $appId --- level = $level ---ttsContent = $ttsContent --- alertContent = $alertContent --- direction = $direction" ) + if (alertContent.isNullOrEmpty() || ttsContent.isNullOrEmpty()) { + Log.d("MsgBox-PriObuManager3", "alertContent或ttsContent为空!") + } CallerMsgBoxManager.saveMsgBox( MsgBoxBean( MsgBoxType.OBU, diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt index fcae6b1da0..aa11c494a1 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt @@ -1,6 +1,7 @@ package com.mogo.eagle.core.function.obu.mogo import android.content.Context +import android.util.Log import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.config.HmiBuildConfig import com.mogo.eagle.core.data.config.HmiBuildConfig.isShowObuLimitSpeedView @@ -407,6 +408,9 @@ class MogoPrivateObuNewManager private constructor() { //显示警告红边 // CallerHmiManager.showWarning(direction) //不显示弹框，语音提示,数据在消息盒子里面展示，此处不在处理弹框 + if (alertContent.isNullOrEmpty() || ttsContent.isNullOrEmpty()) { + Log.d("MsgBox-PriObuNewMana1", "alertContent或ttsContent为空!") + } CallerMsgBoxManager.saveMsgBox( MsgBoxBean( MsgBoxType.OBU, @@ -509,6 +513,9 @@ class MogoPrivateObuNewManager private constructor() { // if (level == 2 || level == 3) { //不考虑level //显示警告红边 CallerHmiManager.showWarning(direction) + if (alertContent.isNullOrEmpty() || ttsContent.isNullOrEmpty()) { + Log.d("MsgBox-PriObuNewMana2", "alertContent或ttsContent为空!") + } CallerMsgBoxManager.saveMsgBox( MsgBoxBean( MsgBoxType.OBU, @@ -738,6 +745,9 @@ class MogoPrivateObuNewManager private constructor() { "new handleSdkObu appId2 = $appId --- level = $level ---ttsContent = $ttsContent --- alertContent = $alertContent --- direction = $direction" ) if (level == 2 || level == 3) { + if (alertContent.isNullOrEmpty() || ttsContent.isNullOrEmpty()) { + Log.d("MsgBox-PriObuNewManager2", "alertContent或ttsContent为空!") + } //不显示弹框，其它保留 CallerMsgBoxManager.saveMsgBox( MsgBoxBean( @@ -888,6 +898,9 @@ class MogoPrivateObuNewManager private constructor() { val maxSpeed = currentLight.suggestMaxSpeed if (maxSpeed > 0) { + if (alertContent.isNullOrEmpty() || ttsContent.isNullOrEmpty()) { + Log.d("MsgBox-PriObuNewManager1", "alertContent或ttsContent为空!") + } CallerMsgBoxManager.saveMsgBox( MsgBoxBean( MsgBoxType.OBU, diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt index 759be5b25f..86c0e3b634 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt @@ -557,7 +557,7 @@ object V2XEventManager : IMoGoMapLocationListener, IMoGoTokenCallback, IV2XCallb tempContent = EventTypeEnum.TYPE_USECASE_ID_IVP.content } 2001 -> { - // 最优车道 + // 最优车道100061 EventTypeHelper.getOptLine{ appId, tts, content -> tempAppId = appId tempTts = tts @@ -574,6 +574,9 @@ object V2XEventManager : IMoGoMapLocationListener, IMoGoTokenCallback, IV2XCallb } } // 不显示弹框，其它保留 + if (tempContent.isNullOrEmpty() || tempTts.isNullOrEmpty()) { + Log.d("MsgBox-V2XEventManager", "alertContent或ttsContent为空!") + } CallerMsgBoxManager.saveMsgBox( MsgBoxBean( MsgBoxType.V2X, diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventScenario.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventScenario.java index 8d1031e440..cf448413a1 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventScenario.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventScenario.java @@ -2,6 +2,8 @@ package com.mogo.eagle.core.function.v2x.events.scenario.scene.road; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X; +import android.util.Log; + import com.mogo.commons.analytics.AnalyticsUtils; import com.mogo.eagle.core.data.enums.WarningDirectionEnum; import com.mogo.eagle.core.data.map.entity.MarkerExploreWay; @@ -72,7 +74,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario imp boolean onlyShow = getV2XMessageEntity().isOnlyShow(); if (!onlyShow) { // 设置TTS - getV2XMessageEntity().getContent().getTts(); + getV2XMessageEntity().getContent().getTts(false); } showWindow(); String poiType = getV2XMessageEntity().getContent().getPoiType(); @@ -98,6 +100,10 @@ public class V2XRoadEventScenario extends AbsV2XScenario imp V2XRoadEventEntity content = entity != null ? entity.getContent() : null; if (content != null) { // //显示警告红边 + if (content.getAlarmContent() == null || content.getAlarmContent().isEmpty() + || content.getTts() == null || content.getTts().isEmpty()) { + Log.d("MsgBox-V2XRoadScenario", "alertContent或ttsContent为空!"); + } CallerMsgBoxManager.INSTANCE.saveMsgBox( new MsgBoxBean( MsgBoxType.V2X, diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/warning/V2XFrontWarningScenario.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/warning/V2XFrontWarningScenario.java index b53b27f6ea..c4d1d6f357 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/warning/V2XFrontWarningScenario.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/warning/V2XFrontWarningScenario.java @@ -6,6 +6,8 @@ import android.graphics.Color; import android.text.Spannable; import android.text.SpannableStringBuilder; import android.text.style.ForegroundColorSpan; +import android.util.Log; + import androidx.annotation.Nullable; import com.mogo.eagle.core.data.enums.WarningDirectionEnum; import com.mogo.eagle.core.data.map.MogoLocation; @@ -63,6 +65,11 @@ public class V2XFrontWarningScenario extends AbsV2XScenario implements IMoGoMapL int v2xType = getV2XTypeForFrontWarning(mMarkerEntity); V2XMessageEntity entity = getV2XMessageEntity(); if (v2xType != 0) { + if (getAlertContentForFrontWarning(mMarkerEntity).toString() == null + || getAlertContentForFrontWarning(mMarkerEntity).toString().isEmpty() + || mMarkerEntity.getTts() == null || mMarkerEntity.getTts().isEmpty()) { + Log.d("MsgBox-FrontWarScenario", "alertContent或ttsContent为空!"); + } CallerMsgBoxManager.INSTANCE.saveMsgBox( new MsgBoxBean( MsgBoxType.V2X, diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt index 40c412f93e..49004bae3e 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt @@ -1,5 +1,6 @@ package com.mogo.eagle.core.function.v2x.redlightwarning +import android.util.Log import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_IVP import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_IVP_GREEN import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.V2I @@ -239,6 +240,9 @@ class RedLightWarningManager : IMoGoTrafficLightListener, IMoGoVipSetListener, EventTypeEnum.getWarningTts(EventTypeEnum.TYPE_USECASE_ID_IVP_GREEN.poiType), speed ) + if (content.isNullOrEmpty() || tts.isNullOrEmpty()) { + Log.d("MsgBox-RedLightWarManaG", "alertContent或ttsContent为空!") + } CallerMsgBoxManager.saveMsgBox( MsgBoxBean( MsgBoxType.V2X, diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt index f4659f54ab..61bd434cb7 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt @@ -4,6 +4,7 @@ import android.content.Context import android.os.Handler import android.os.Looper import android.os.Message +import android.util.Log import com.mogo.aicloud.services.socket.IMogoOnMessageListener import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager import com.mogo.cloud.passport.MoGoAiCloudClientConfig @@ -275,6 +276,9 @@ class VipCarManager : IMogoOnMessageListener, IMoGoTrafficLightListe ttsContent: String, tag: String ) { + if (alertContent.toString().isNullOrEmpty() || ttsContent.isNullOrEmpty()) { + Log.d("MsgBox-VipCarManager", "alertContent或ttsContent为空!") + } CallerMsgBoxManager.saveMsgBox( MsgBoxBean(MsgBoxType.V2X, V2XMsg(v2xType, alertContent.toString(), ttsContent)) ) diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt index 3daf32d036..1a43eab9b8 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt @@ -28,6 +28,8 @@ object AppConfigInfo { // 高精地图版本 var mapSdkVersion: String? = null + // 高精地图采集版本 + var mapSdkOptVersion: String? = null var adasSdkVersion: String? = null var obuSdkVersion: String? = null @@ -92,6 +94,7 @@ object AppConfigInfo { "Git分支HASH：${workingBranchHash}
" + "------------------依赖信息---------------------
" + "MAP-SDK版本：${mapSdkVersion}
" + + "MAP-OPT-SDK版本：${mapSdkOptVersion}
" + "ADAS-SDK版本：${adasSdkVersion}
" + "OBU-SDK版本：${obuSdkVersion}
" + "------------------鉴权信息---------------------
" + @@ -187,6 +190,7 @@ fun AppConfigInfo.toConfigUpload():ConfigUpload{ configUpload.isConnectSocket = isConnectSocket configUpload.isConnectedNetty = isConnectedNetty configUpload.mapSdkVersion = mapSdkVersion + configUpload.mapSdkOptVersion = mapSdkOptVersion configUpload.mogoSN = mogoSN configUpload.mogoToken = mogoToken configUpload.netMode = netMode diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/ConfigUpload.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/ConfigUpload.kt index 508e4e2e58..04870277a0 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/ConfigUpload.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/ConfigUpload.kt @@ -14,6 +14,7 @@ class ConfigUpload( var uniqueDeviceId: String? = null, var widevineIDMd5: String? = null, var mapSdkVersion: String? = null, + var mapSdkOptVersion: String? = null, var adasSdkVersion: String? = null, var obuSdkVersion: String? = null, var mogoToken: String? = null, diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/bindingcar/CarInfo.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/bindingcar/CarInfo.java index b4a5b2201d..e7f11b187e 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/bindingcar/CarInfo.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/bindingcar/CarInfo.java @@ -21,6 +21,7 @@ public class CarInfo implements Serializable { private String model; //款式 private String new_version; private String brand; //品牌 + private String brandId; //品牌 private String energy_type; //驱动类型 private List passenger; //乘客数量 private String number_plate; //车牌号 @@ -105,6 +106,14 @@ public class CarInfo implements Serializable { this.number_plate = number_plate; } + public String getBrandId() { + return brandId; + } + + public void setBrandId(String brandId) { + this.brandId = brandId; + } + @Override public String toString() { return "CarInfo{" + @@ -115,6 +124,7 @@ public class CarInfo implements Serializable { ", model='" + model + '\'' + ", new_version='" + new_version + '\'' + ", brand='" + brand + '\'' + + ", brandId='" + brandId + '\'' + ", energy_type='" + energy_type + '\'' + ", passenger=" + passenger + ", number_plate='" + number_plate + '\'' + diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/bindingcar/ModifyBindingcarInfo.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/bindingcar/ModifyBindingcarInfo.java index 768abc35aa..564d3bf959 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/bindingcar/ModifyBindingcarInfo.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/bindingcar/ModifyBindingcarInfo.java @@ -8,20 +8,61 @@ import com.mogo.eagle.core.data.BaseData; * @since: 3/16/22 */ public class ModifyBindingcarInfo extends BaseData { - public String data; - public String getData() { + private BindMsg data; + + public BindMsg getData() { return data; } - public void setData(String data) { + public void setData(BindMsg data) { this.data = data; } @Override public String toString() { return "ModifyBindingcarInfo{" + - "data='" + data + '\'' + + "data=" + data + '}'; } + + public class BindMsg { + private String result; + private String brand; //品牌 + private String brandId; + + public String getResult() { + return result; + } + + public void setResult(String result) { + this.result = result; + } + + public String getBrand() { + return brand; + } + + public void setBrand(String brand) { + this.brand = brand; + } + + public String getBrandId() { + return brandId; + } + + public void setBrandId(String brandId) { + this.brandId = brandId; + } + + @Override + public String toString() { + return "BindMsg{" + + "result='" + result + '\'' + + ", brand='" + brand + '\'' + + ", brandId='" + brandId + '\'' + + '}'; + } + + } } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HdMapBuildConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HdMapBuildConfig.kt index cd0ac043de..e6937704fb 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HdMapBuildConfig.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HdMapBuildConfig.kt @@ -13,7 +13,7 @@ object HdMapBuildConfig { * 可以指定，R.raw.chuzuche，R.raw.xiaobache，R.raw.hongqi */ @JvmField - var currentCarVrIconRes = R.raw.chuzuche + var currentCarVrIconRes = R.raw.hq_h9 /** * 地图是否加载成功 diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/V2XRoadEventEntity.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/V2XRoadEventEntity.java index b6ea46986b..eea9b6b93e 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/V2XRoadEventEntity.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/entity/V2XRoadEventEntity.java @@ -3,6 +3,8 @@ package com.mogo.eagle.core.data.map.entity; import android.text.TextUtils; +import com.mogo.eagle.core.data.enums.EventTypeEnum; + import java.io.Serializable; import java.util.Objects; @@ -54,6 +56,33 @@ public class V2XRoadEventEntity implements Serializable { this.poiType = poiType; } + public String getTts(boolean haveLiveCar) { + if (EventTypeEnum.GHOST_PROBE.getPoiType().equals(poiType)) { + tts = EventTypeEnum.GHOST_PROBE.getTts(); + return tts; + } + tts = "前方#" + (int) getDistance() + "米#"; + tts += EventTypeEnum.getTts(getPoiType()); + if (haveLiveCar) { + tts += "，查看实况请说确定。"; + setShowEventButton(true); + } else { + tts += "，请注意躲避。"; + setShowEventButton(false); + } + return tts; + } + + /** + * 检测到附近#道路施工#，确认该信息是否正确？您可以说“正确”或“错误”帮助其他车友。 + */ + public String getTtsWithFeedback() { + tts = "检测到附近"; + tts += EventTypeEnum.getTtsWithFeedback(getPoiType()); + tts += "，确认该信息是否正确？您可以说“正确”或“错误”帮助其他车友。"; + return tts; + } + public String getTts() { return tts; } @@ -70,7 +99,8 @@ public class V2XRoadEventEntity implements Serializable { isShowEventButton = showEventButton; } - public String getAlarmContent(){ //todo 缺少 + public String getAlarmContent() { + alarmContent = EventTypeEnum.getAlarmContent(getPoiType()); return alarmContent; } diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/IMogoMapService.java b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/IMogoMapService.java index d760fbeec0..f677a42147 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/IMogoMapService.java +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/IMogoMapService.java @@ -90,9 +90,4 @@ public interface IMogoMapService extends IProvider { */ IMogoTrafficSearch getTrafficSearchApi(); - /** - * 获取地图版本号 - * @return - */ - String getMapVersion(); } diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt index d6709a65ff..c412fee003 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt @@ -15,7 +15,7 @@ import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager.Scene.* import com.mogo.eagle.core.utilcode.kotlin.lifeCycleOwner import com.mogo.eagle.core.utilcode.kotlin.safeCancel import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.mogo.logger.* import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA import com.mogo.map.uicontroller.VisualAngleMode import kotlinx.coroutines.* @@ -199,30 +199,30 @@ object CallerVisualAngleManager { } val triggerTime = SystemClock.elapsedRealtime() scope.launch { - CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 1 ---") + Logger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 1 ---") val displayed = getDisplayed() if (displayed == null) { - CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 2 ---") + Logger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 2 ---") val top = getTop() //堆顶 if (top != null) { if (top.target.priority >= scene.priority) { - CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 3 ---") + Logger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 3 ---") top.triggerTime = triggerTime doChangeAngle(top) synchronized(heap){ heap += Record(scene, triggerTime = -1) } } else { - CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 4 ---") + Logger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 4 ---") doChangeAngle(Record(scene, triggerTime = triggerTime)) } } else { - CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 4 ---") + Logger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 4 ---") doChangeAngle(Record(scene, triggerTime = triggerTime)) } } else { if (scene.javaClass == displayed.target.javaClass) { - CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 5 ---") + Logger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 5 ---") defaultDelayJob?.safeCancel() return@launch } @@ -242,32 +242,32 @@ object CallerVisualAngleManager { return@launch } } - if (prev.priority >= scene.priority && (prev is RoadEvent || prev is TooClose)) { + if (scene !is Default && prev.priority >= scene.priority && (prev is RoadEvent || prev is TooClose)) { val displayDuration = triggerTime - prevTriggerTime if (displayDuration < prev.displayThreshold) { return@launch } } if (scene is Default) { - CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 6 ---") + Logger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 6 ---") defaultDelayJob?.safeCancel() launch { val delay = scene.unit.toMillis(scene.delay) - CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 7 ---") + Logger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 7 ---") delay(delay) - CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 8 ---") + Logger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 8 ---") doChangeAngle(Record(scene, triggerTime = triggerTime)) heap -= displayed }.also { itx -> itx.invokeOnCompletion { if (it is CancellationException) { - CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 9 ---") + Logger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 9 ---") } } defaultDelayJob = itx } } else { - CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 10 ---") + Logger.d("${M_DEVA}${TAG}", "触发场景:${scene} --- 10 ---") defaultDelayJob?.safeCancel() if (displayed.target.priority < scene.priority) { doChangeAngle(Record(scene, triggerTime = triggerTime)) @@ -281,14 +281,14 @@ object CallerVisualAngleManager { private fun doChangeAngle(record: Record) { val angle = record.target.angle CallerMapUIServiceManager.getMapUIController()?.also { - CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${record.target} --- 13 ---") + Logger.d("${M_DEVA}${TAG}", "触发场景:${record.target} --- 13 ---") if (record.target !is Default) { record.isDisplay = true synchronized(heap) { heap += record } } - CallerLogger.d("${M_DEVA}${TAG}", "触发场景:${record.target} --- 15 ---> angle: $angle") + Logger.d("${M_DEVA}${TAG}", "触发场景:${record.target} --- 15 ---> angle: $angle") it.changeMapVisualAngle(angle, null) } } 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 3ccc96c83c..86cb3a727c 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 @@ -148,6 +148,26 @@ public class DebugConfig { return sSocketAppId; } + private static String mapVersion; + + public static void setMapVersion(String mapVersion) { + DebugConfig.mapVersion = mapVersion; + } + + public static String getMapVersion() { + return mapVersion; + } + + private static String mapOptVersion; + + public static void setMapOptVersion(String mapOptVersion) { + DebugConfig.mapOptVersion = mapOptVersion; + } + + public static String getMapOptVersion() { + return mapOptVersion; + } + /** * 是否需要实时上报坐标位置 */ diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java index 9f3713f8fa..baec754e0c 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java @@ -171,12 +171,6 @@ public interface IMogoMap { */ IMogoPolyline addPolyline( MogoPolylineOptions options ); - /** - * 获取地图版本 - * @return - */ - String getMapVersion(); - /** * 获取行驶方向一定长度的中心线 * @param lon 经度 diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java index e94abde8ee..a9866d4f6e 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java @@ -19,7 +19,6 @@ import android.location.Location; import android.os.Bundle; import android.os.Handler; import android.os.Looper; -import android.os.SystemClock; import android.os.Trace; import android.text.TextUtils; import android.util.Log; @@ -45,7 +44,6 @@ import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; -import com.mogo.eagle.core.utilcode.util.GsonUtils; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.map.listener.MogoMapListenerHandler; import com.mogo.map.navi.MogoCarLocationChangedListenerRegister; diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java index f71f453a74..d2a1c9ab79 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java @@ -302,11 +302,6 @@ public class AMapWrapper implements IMogoMap { return null; } - @Override - public String getMapVersion() { - return MapAutoApi.INSTANCE.getSDKVersion(); - } - private boolean checkAMap() { mAMap = mMapView.getMapAutoViewHelper(); sAMap = mAMap;