diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java index 4f1cf1a254..b191a1e1eb 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java @@ -15,7 +15,6 @@ import com.mogo.commons.voice.AIAssist; import com.mogo.eagle.core.data.BaseData; import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; import com.mogo.eagle.core.data.config.FunctionBuildConfig; -import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; @@ -41,7 +40,6 @@ import com.mogo.och.bus.net.OCHBusServiceManager; import com.mogo.och.bus.net.OCHServiceCallback; import com.mogo.och.bus.util.OchBusAnalyticsUtil; import com.mogo.och.bus.util.PinYinUtil; -import com.mogo.service.IMogoServiceApis; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.StatusDescriptor; @@ -289,27 +287,8 @@ public class OchBusOrderModel { @Override public void onCarLocationChanged2( Location location ) { // CallerLogger.INSTANCE.d(M_BUS + TAG,"location = "+location.getLongitude()+","+location.getLatitude()); - IMogoServiceApis apis = MogoApisHandler.getInstance().getApis(); - MogoLocation mogoLocation = new MogoLocation(); - mogoLocation.setAccuracy(location.getAccuracy()); - mogoLocation.setProvider(location.getProvider()); - mogoLocation.setLongitude(location.getLongitude()); - mogoLocation.setLatitude(location.getLatitude()); - mogoLocation.setSpeed(location.getSpeed()); - mogoLocation.setBearing(location.getBearing()); - // TODO: 2021/9/2 因0830新版server后台只能过滤locType=1&&satellites>=4的定位数据，暂固化值，后续优化 - mogoLocation.setLocType(1); - mogoLocation.setSatellite(4); - /** - * TODO: 2021/10/20 - * 因ALocationClient实际无坐标返回，所以此处从custom map中AMapViewWrapper获取坐标并反馈回用于坐标上传 - * {@link com.mogo.map.impl.custom.location.ALocationClient} - */ - apis.getLocationInfoApi().provideLocation(mogoLocation); - mLongitude = location.getLongitude(); mLatitude = location.getLatitude(); - if (mControllerStatusCallback != null) { mControllerStatusCallback.onCarLocationChanged(location); } diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java index e3453380e0..a873785d54 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java @@ -16,7 +16,6 @@ import com.mogo.commons.voice.AIAssist; import com.mogo.eagle.core.data.autopilot.ADASTrajectoryInfo; import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo; import com.mogo.eagle.core.data.config.FunctionBuildConfig; -import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.api.v2x.LimitingVelocityListener; @@ -43,7 +42,6 @@ import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst; import com.mogo.och.taxi.passenger.constant.TaxiPassengerOrderStatusEnum; import com.mogo.och.taxi.passenger.network.TaxiPassengerServiceCallback; import com.mogo.och.taxi.passenger.network.TaxiPassengerServiceManager; -import com.mogo.service.IMogoServiceApis; import com.mogo.service.cloud.socket.IMogoLifecycleListener; import com.mogo.service.intent.IMogoIntentListener; import com.mogo.service.statusmanager.IMogoStatusChangedListener; @@ -433,23 +431,10 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback }; // 自车定位 - private IMogoCarLocationChangedListener2 mCarLocationChangedListener2 = new IMogoCarLocationChangedListener2() { + private final IMogoCarLocationChangedListener2 mCarLocationChangedListener2 = new IMogoCarLocationChangedListener2() { @Override public void onCarLocationChanged2( Location location ) { - IMogoServiceApis apis = MogoApisHandler.getInstance().getApis(); - MogoLocation mogoLocation = new MogoLocation(); - mogoLocation.setAccuracy(location.getAccuracy()); - mogoLocation.setProvider(location.getProvider()); - mogoLocation.setLongitude(location.getLongitude()); - mogoLocation.setLatitude(location.getLatitude()); - mogoLocation.setSpeed(location.getSpeed()); - mogoLocation.setBearing(location.getBearing()); - // TODO: 2021/9/2 因0830新版server后台只能过滤locType=1&&satellites>=4的定位数据，暂固话值，后续优化 - mogoLocation.setLocType(1); - mogoLocation.setSatellite(4); - - apis.getLocationInfoApi().provideLocation(mogoLocation); //位置变化时，通过围栏判断是否到达x点 if (location != null && checkCurrentOCHOrder()) { if (getCurOrderStatus() == TaxiPassengerOrderStatusEnum.OnTheWayToEndStation) { @@ -464,7 +449,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback } }; - private IMoGoAutopilotStatusListener mGoAutopilotStatusListener = new IMoGoAutopilotStatusListener(){ + private final IMoGoAutopilotStatusListener mGoAutopilotStatusListener = new IMoGoAutopilotStatusListener(){ @Override public void onAutopilotGuardian(@Nullable MogoReportMsg.MogoReportMessage guardianInfo) { diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java index 1e20d6555f..b44baa66a8 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java @@ -19,7 +19,6 @@ import com.mogo.eagle.core.data.autopilot.ADASTrajectoryInfo; import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo; import com.mogo.eagle.core.data.config.FunctionBuildConfig; -import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager; @@ -54,7 +53,6 @@ import com.mogo.och.taxi.network.OCHTaxiServiceManagerNew; import com.mogo.och.taxi.utils.OchTaxiAnalyticsUtil; import com.mogo.och.taxi.utils.OrderUtil; import com.mogo.och.taxi.utils.PinYinUtil; -import com.mogo.service.IMogoServiceApis; import com.mogo.service.cloud.socket.IMogoLifecycleListener; import com.mogo.service.intent.IMogoIntentListener; import com.mogo.service.statusmanager.IMogoStatusChangedListener; @@ -929,19 +927,6 @@ public class MogoOCHTaxiModelNew { @Override public void onCarLocationChanged2(Location location) { - IMogoServiceApis apis = MogoApisHandler.getInstance().getApis(); - MogoLocation mogoLocation = new MogoLocation(); - mogoLocation.setAccuracy(location.getAccuracy()); - mogoLocation.setProvider(location.getProvider()); - mogoLocation.setLongitude(location.getLongitude()); - mogoLocation.setLatitude(location.getLatitude()); - mogoLocation.setSpeed(location.getSpeed()); - mogoLocation.setBearing(location.getBearing()); - // TODO: 2021/9/2 因0830新版server后台只能过滤locType=1&&satellites>=4的定位数据，暂固话值，后续优化 - mogoLocation.setLocType(1); - mogoLocation.setSatellite(4); - - apis.getLocationInfoApi().provideLocation(mogoLocation); //位置变化时，通过围栏判断是否到达x点 if (location != null && checkCurrentOCHOrder()) { if (getCurOrderStatus() == OrderStatusEnum.OnTheWayToStartStation) { diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt index 5baadf1dc3..641b77d024 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt @@ -13,6 +13,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_NETWORK import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OLD_ROUTE +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OTHER import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI_P import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X @@ -35,6 +36,7 @@ class SceneManager { private const val BUS = "BUS" private const val TAXI = "TAXI" private const val TAXI_P = "TAXI-P" + private const val OTHER = "OTHER" val sceneManager: SceneManager by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { SceneManager() @@ -57,6 +59,7 @@ class SceneManager { sceneModuleTAG.map[BUS] = SceneModule(false, M_BUS) sceneModuleTAG.map[TAXI] = SceneModule(false, M_TAXI) sceneModuleTAG.map[TAXI_P] = SceneModule(false, M_TAXI_P) + sceneModuleTAG.map[OTHER] = SceneModule(false, M_OTHER) sceneLogTAG.map[TAXI] = SceneTAG(false) sceneLogTAG.map[BUS] = SceneTAG(false) 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 21a25409f3..66a9dda270 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 @@ -845,6 +845,8 @@ class DebugSettingView @JvmOverloads constructor( SceneConstant.M_TAXI -> cbTaxiLog.isChecked = log //TAXI_P日志标签 SceneConstant.M_TAXI_P -> cbTaxiPLog.isChecked = log + //其他模块日志(暂未区分具体模块) + SceneConstant.M_OTHER -> cbOtherLog.isChecked = log } } } @@ -942,6 +944,12 @@ class DebugSettingView @JvmOverloads constructor( sceneMap[SceneConstant.M_TAXI_P] = taxiPModule CallerDevaToolsManager.updateModuleTAG(sceneMap) } + //其他未分类模块日志 + cbOtherLog.setOnCheckedChangeListener { _, isChecked -> + val otherModule = SceneModule(isChecked, SceneConstant.M_OTHER) + sceneMap[SceneConstant.M_OTHER] = otherModule + CallerDevaToolsManager.updateModuleTAG(sceneMap) + } //开始停止抓取全量日志 tbLogCatch.isChecked = diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index a0f9958855..fe5719b2b0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml @@ -1368,7 +1368,15 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:checked="false" - android:text="TAXI_P日志" /> + android:text="乘客屏日志" /> + + diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/Scene.kt b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/Scene.kt index b674df7fce..7df7080426 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/Scene.kt +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/scene/Scene.kt @@ -44,7 +44,7 @@ class Scene { val routeMap = SceneLogCache(mutableMapOf(), true) sceneCache[M_OLD_ROUTE] = routeMap //初始化其他模块，方便定位索引 - val otherMap = SceneLogCache(mutableMapOf(), true) + val otherMap = SceneLogCache(mutableMapOf(), false) sceneCache[M_OTHER] = otherMap //初始化TAXI val taxiMap = SceneLogCache(mutableMapOf(), false)