From 960702c46b361229c978f318db95d5fd7d35b4b6 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 19 May 2023 11:55:38 +0800 Subject: [PATCH 1/5] =?UTF-8?q?[buffix]=20[1.15.0]=20[=E5=A4=9A=E8=BF=9B?= =?UTF-8?q?=E7=A8=8B=E5=88=9D=E5=A7=8B=E5=8C=96]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/commons/AbsMogoApplication.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 2a20de5691..5126c87f36 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 @@ -41,15 +41,14 @@ public abstract class AbsMogoApplication extends Application { @Override public void onCreate() { super.onCreate(); + AutoSize.checkAndInit(this); + ScreenHelper.setScreenConfig(this); if (!shouldInit()) { return; } AppStateManager.INSTANCE.init(this); initRxJavaErrorHandler(); FinalizeCrashFixer.fix(); - AutoSize.checkAndInit(this); - - ScreenHelper.setScreenConfig(this); Utils.init(this); MogoServices.getInstance().init(this); } From 1be0a392ca962a0fb771149578826a9a88e8faf1 Mon Sep 17 00:00:00 2001 From: renwj Date: Fri, 19 May 2023 14:12:14 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[=E4=B8=8B=E8=BD=BD=E5=B7=A5=E5=85=B7]=20?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=B8=8B=E8=BD=BD=E5=B7=A5=E5=85=B7=E7=9A=84?= =?UTF-8?q?=E7=89=88=E6=9C=AC=EF=BC=8C=E4=BC=98=E5=8C=96=E6=96=AD=E7=82=B9?= =?UTF-8?q?=E7=BB=AD=E4=BC=A0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.gradle b/config.gradle index e610b3e01f..f0867bb959 100644 --- a/config.gradle +++ b/config.gradle @@ -28,7 +28,7 @@ ext { amapsearch : "com.amap.api:search:9.5.0", amaplocation : "com.amap.api:location:6.2.0", - downloader : "com.mogo.core.net:downloader:1.0.5_stable", + downloader : "com.mogo.core.net:downloader:1.0.6.1", // json 转换 gson : "com.google.code.gson:gson:2.8.4", From 04d48b2ad5abc2fc5d26933c6aa8aeb010ef5c61 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 19 May 2023 14:28:21 +0800 Subject: [PATCH 3/5] [3.2.0] add func of track loc opt has under the 310 verision --- .../function/business/identify/TrackObj.java | 31 +++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackObj.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackObj.java index 55ef457a88..bd2fd9eecb 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackObj.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackObj.java @@ -1,13 +1,19 @@ package com.mogo.eagle.core.function.business.identify; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_ADAS_MESSAGE_RECT_DATA; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_ADAS; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED; import static com.mogo.eagle.core.function.business.identify.TrackManager.LIMIT_SPEED; import android.annotation.SuppressLint; import com.mogo.eagle.core.data.enums.TrafficTypeEnum; +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.utilcode.geometry.S2CellId; import com.mogo.eagle.core.utilcode.geometry.S2LatLng; import com.mogo.eagle.core.utilcode.util.CoordinateUtils; +import com.mogo.eagle.core.utilcode.util.ParseVersionUtils; +import com.zhjt.service.chain.ChainLog; import java.util.Arrays; import java.util.Comparator; @@ -45,9 +51,30 @@ public class TrackObj { private void correct() { calAverageSpeedAndType(); + String dockerVersion = CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getDockVersion(); + if (dockerVersion != null && !dockerVersion.isEmpty()) { + try { + int version = ParseVersionUtils.parseVersion(true, dockerVersion); + if (version >= 310) { + return; + } + } catch (Exception e) { + logErrorOfVersion(dockerVersion); + } + } calLoc(); } + @ChainLog(linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED, + linkCode = CHAIN_LINK_ADAS, + endpoint = 4, + nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_RECT_DATA, + paramIndexes = {0}, + clientPkFileName = "sn") + private void logErrorOfVersion(String version) { + + } + @SuppressLint("NewApi") private void calAverageSpeedAndType() { if (circleQueue.size() >= 3) { @@ -68,7 +95,7 @@ public class TrackObj { } speedAverage = cal / objQueueList.size(); } - if(typeArray.length > 0){ + if (typeArray.length > 0) { typeArray = Arrays.stream(typeArray).sorted().toArray(); typeWeight = typeArray[typeArray.length / 2] == 0 ? cacheData.getType() : typeArray[typeArray.length / 2]; } @@ -166,7 +193,7 @@ public class TrackObj { return d; } - public void clear(){ + public void clear() { circleQueue.clear(); s2CellId = null; s2LatLng = null; From 979a070fa19195d5ae0be988ff53c20f74e9111c Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Fri, 19 May 2023 14:32:21 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[3.2.0]=20bus/taxi/=E6=8E=A5=E9=A9=B3?= =?UTF-8?q?=E4=B9=98=E5=AE=A2=E5=B1=8F=E5=A2=9E=E5=8A=A0=E4=B8=BB=E5=8A=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=BD=A8=E8=BF=B9=E4=B8=80=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/bus/passenger/model/BusPassengerModel.java | 10 ++++++++-- .../och/bus/passenger/model/BusPassengerModel.java | 6 +++++- .../och/taxi/passenger/model/TaxiPassengerModel.java | 2 ++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java index 9e2bd8577a..5f386b5de0 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java @@ -29,6 +29,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener; import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningRottingListener; import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener; +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager; @@ -59,7 +60,6 @@ import com.mogo.och.bus.passenger.network.BusPassengerServiceManager; import com.mogo.och.common.module.bean.dpmsg.AppConnectMsg; import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg; import com.mogo.och.common.module.bean.dpmsg.DPMsgType; -import com.mogo.och.common.module.bean.dpmsg.LoginCacheStatus; import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager; import com.mogo.och.common.module.biz.constant.OchCommonConst; import com.mogo.och.common.module.biz.network.OchCommonServiceCallback; @@ -189,13 +189,16 @@ public class BusPassengerModel { if (routesResult != null) { routesResult = null; mNextStationIndex = 0; - startOrStopCalculateRouteInfo(false); } + startOrStopCalculateRouteInfo(false); + if (mRouteLineInfoCallback != null){ mRouteLineInfoCallback.showNoTaskView(); } + mRoutePoints.clear(); + return; } if (routesResult != null && data.getResult().equals(routesResult)){ @@ -464,6 +467,9 @@ public class BusPassengerModel { int state = autopilotStatusInfo.getState(); if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { //2022.7.20 自动驾驶更换成带档位的 + if(state != mPreAutoStatus && null != routesResult){ + CallerAutoPilotControlManager.INSTANCE.getGlobalPath(); + } if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning(); } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) { if(state != mPreAutoStatus){ diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java index 5ca3230d04..b32f39aa8e 100644 --- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java +++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java @@ -21,6 +21,7 @@ import com.mogo.commons.module.intent.IntentManager; import com.mogo.commons.module.status.IMogoStatusChangedListener; import com.mogo.commons.module.status.MogoStatusManager; import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener; +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager; import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager; import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager; import com.mogo.eagle.core.utilcode.mogo.logger.Logger; @@ -262,7 +263,7 @@ public class BusPassengerModel { } mNextStationIndex = 0; startOrStopCalculateRouteInfo(false); - + mRoutePoints.clear(); if (mRouteLineInfoCallback != null){ mRouteLineInfoCallback.showNoTaskView(); } @@ -473,6 +474,9 @@ public class BusPassengerModel { int state = autopilotStatusInfo.getState(); if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { //2022.7.20 自动驾驶更换成带档位的 + if(state != mPreAutoStatus && null != routesResult){ + CallerAutoPilotControlManager.INSTANCE.getGlobalPath(); + } if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning(); } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) { if(state != mPreAutoStatus){ 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 daaf6b231c..fafbe54a2a 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 @@ -531,6 +531,8 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback // 当高频返回autopilot 2时，不重复调用订单状态变更 mPrevAPStatus = state; // 每个状态单独赋值，解决无订单时已经是2的状态导致的新订单来时无法进入此逻辑更新状态 startServicePilotDone(); + + CallerAutoPilotControlManager.INSTANCE.getGlobalPath(); } } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) { mPrevAPStatus = state; From a8261e8ffba9794d7ab69ea3f47fd8d5195b063d Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 19 May 2023 14:45:31 +0800 Subject: [PATCH 5/5] [3.2.0] add safey policy of lineid within aiCloud roma --- .../core/function/business/ai/AiCloudIdentifyDataManager.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt index 992849ae5e..f01a19ef74 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt @@ -166,6 +166,8 @@ class AiCloudIdentifyDataManager : IMogoMapListener, super.onAutopilotRouteLineId(lineId) if (lineId == 0L) { updateRomaStyle(true) + }else{ + CallerAutoPilotControlManager.getGlobalPath() } }