From 633212a9fec77a1b50020655c8d4d0e93c99ce0d Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Tue, 8 Nov 2022 14:30:58 +0800 Subject: [PATCH 1/6] =?UTF-8?q?[2.12.0]=20taxi=E5=8F=B8=E6=9C=BA=E7=AB=AF?= =?UTF-8?q?=E5=89=8D=E5=BE=80=E7=9B=AE=E7=9A=84=E5=9C=B0=E8=BD=A8=E8=BF=B9?= =?UTF-8?q?=E9=87=8C=E9=87=8C=E7=A8=8B=E6=92=AD=E6=8A=A5=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/taxi/model/TaxiModel.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index 59fb2c2462..eff7f1e255 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -31,6 +31,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; import com.mogo.eagle.core.utilcode.util.NetworkUtils; import com.mogo.eagle.core.utilcode.util.ToastUtils; +import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.map.navi.IMogoCarLocationChangedListener2; import com.mogo.module.common.MogoApisHandler; import com.mogo.och.common.module.biz.constant.LoginStatusManager; @@ -1585,10 +1586,15 @@ public class TaxiModel { if (mOrderStatusCallback != null){ mOrderStatusCallback.onNaviToEnd(false,isVoicePlay); } - }else {//使用高德导航 - if (mOrderStatusCallback != null){ - mOrderStatusCallback.onNaviToEnd(true,isVoicePlay); - } + }else {//2s后若无轨迹数据使用高德导航 + UiThreadHandler.postDelayed(new Runnable() { + @Override + public void run() { + if (mRoutePoints.size() == 0 && mOrderStatusCallback != null){ + mOrderStatusCallback.onNaviToEnd(true,isVoicePlay); + } + } + },2000l); } } } From 620d1f8c3c1952d66d68b14a263ed7f4959d861e Mon Sep 17 00:00:00 2001 From: lianglihui Date: Tue, 8 Nov 2022 16:41:11 +0800 Subject: [PATCH 2/6] =?UTF-8?q?2.12.0=20fix=20ADCU=20=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E6=95=B0=E6=8D=AE=E5=92=8C=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E7=8A=B6=E6=80=81=E4=B8=8D=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=20=E5=B0=8F=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E8=A2=AB=E6=B8=85=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eagle/core/function/smp/SmallMapFragment.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java index 17227329ec..cdc563718e 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java @@ -15,7 +15,10 @@ import com.mogo.eagle.core.data.map.MogoLatLng; 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.map.smp.IMogoSmallMapProvider; +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager; +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPlanningListenerManager; +import com.mogo.eagle.core.function.call.map.CallerMapLocationListenerManager; import com.mogo.eagle.core.function.map.R; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; @@ -38,6 +41,7 @@ public class SmallMapFragment extends BaseFragment IMoGoAutopilotStatusListener { private final String TAG = "SmallMapFragment"; protected SmallMapDirectionView mSmallMapDirectionView; + private int autoPilotStatus = 0; @Override public void onAttach(Context context) { @@ -139,8 +143,11 @@ public class SmallMapFragment extends BaseFragment @Override public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autoPilotStatusInfo) { - if (autoPilotStatusInfo.getPilotmode() != 1) { + autoPilotStatus = autoPilotStatusInfo.getPilotmode(); + if (autoPilotStatus != 1) { clearPolyline(); + }else if (autoPilotStatus == 1){ + CallerAutoPilotManager.INSTANCE.getGlobalPath(); } } @@ -172,7 +179,7 @@ public class SmallMapFragment extends BaseFragment for (MessagePad.Location routeModel : globalPathResp.getWayPointsList()) { latLngList.add(new MogoLatLng(routeModel.getLatitude(), routeModel.getLongitude())); } - if (latLngList.size() > 0) { + if (latLngList.size() > 0 && autoPilotStatus ==1) { drawablePolyline(latLngList); } else { clearPolyline(); From 594859bf019a7491e2e69c091edf94694306bb4b Mon Sep 17 00:00:00 2001 From: lianglihui Date: Tue, 8 Nov 2022 16:41:32 +0800 Subject: [PATCH 3/6] =?UTF-8?q?2.12.0=20fix=20ADCU=20=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E6=95=B0=E6=8D=AE=E5=92=8C=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E7=8A=B6=E6=80=81=E4=B8=8D=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=20=E5=B0=8F=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E8=A2=AB=E6=B8=85=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/eagle/core/function/smp/SmallMapFragment.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java index cdc563718e..03c81f5bc1 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java @@ -16,9 +16,7 @@ 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.map.smp.IMogoSmallMapProvider; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager; -import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPlanningListenerManager; -import com.mogo.eagle.core.function.call.map.CallerMapLocationListenerManager; import com.mogo.eagle.core.function.map.R; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; From d4b800e89ea76daef5dfc526ce5fdc660800df2c Mon Sep 17 00:00:00 2001 From: lianglihui Date: Tue, 8 Nov 2022 16:55:18 +0800 Subject: [PATCH 4/6] =?UTF-8?q?2.12.0=20fix=20ADCU=20=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E6=95=B0=E6=8D=AE=E5=92=8C=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E7=8A=B6=E6=80=81=E4=B8=8D=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=20=E5=B0=8F=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E8=A2=AB=E6=B8=85=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/eagle/core/function/smp/SmallMapFragment.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java index 03c81f5bc1..bb8ff56c04 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapFragment.java @@ -141,12 +141,13 @@ public class SmallMapFragment extends BaseFragment @Override public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autoPilotStatusInfo) { - autoPilotStatus = autoPilotStatusInfo.getPilotmode(); - if (autoPilotStatus != 1) { + int tempStatus = autoPilotStatusInfo.getPilotmode(); + if (tempStatus != 1) { clearPolyline(); - }else if (autoPilotStatus == 1){ + }else if (tempStatus == 0 && autoPilotStatus == 1){ CallerAutoPilotManager.INSTANCE.getGlobalPath(); } + autoPilotStatus = tempStatus; } @Override From 2225fed83aca2b35d61211a708457ea674cfa876 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Tue, 8 Nov 2022 17:57:18 +0800 Subject: [PATCH 5/6] =?UTF-8?q?[2.12.0]=20taxi=E9=A2=84=E7=BA=A6=E5=8D=95?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=97=B6=E5=80=99=E4=B8=AD=E6=96=AD=E8=AF=AD?= =?UTF-8?q?=E9=9F=B3=E6=92=AD=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/common/module/voice/VoiceNotice.kt | 10 ++++++++++ .../com/mogo/och/taxi/ui/TaxiGrabOrderFragment.java | 1 + 2 files changed, 11 insertions(+) diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/voice/VoiceNotice.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/voice/VoiceNotice.kt index f57f4c3648..43ef0ffb30 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/voice/VoiceNotice.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/voice/VoiceNotice.kt @@ -36,4 +36,14 @@ object VoiceNotice { } } } + + /** + * 中断当前在播语音 + */ + @JvmStatic + fun stopCurrentTts(){ + UiThreadHandler.post { + AIAssist.getInstance(AbsMogoApplication.getApp()).stopTts() + } + } } \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiGrabOrderFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiGrabOrderFragment.java index 46b36f9bd9..4ddc217b6a 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiGrabOrderFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiGrabOrderFragment.java @@ -78,6 +78,7 @@ public class TaxiGrabOrderFragment extends BaseTaxiUIFragment implements View.On if (null != countDownTimer){ countDownTimer.cancel(); } + VoiceNotice.stopCurrentTts();//中断当前在播语音 getOchTaxiFragment().cancelNewBookingOrder(); }else if (v.getId() == R.id.grab_order_tv){ if (!mOrderGrabBt.getText().toString().equals("抢单中...")){ From 6cb5ff049a095e1dd8a70b218f7f2ac32a48afa8 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Tue, 8 Nov 2022 18:23:23 +0800 Subject: [PATCH 6/6] =?UTF-8?q?[Fix]=E8=A7=A3=E5=86=B3=E9=AB=98=E7=B2=BE?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=9C=A8NUC=E8=AE=BE=E5=A4=87=E4=B8=8A?= =?UTF-8?q?=E5=B4=A9=E6=BA=83=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 46e3e34c1b..3d4b65f124 100644 --- a/gradle.properties +++ b/gradle.properties @@ -85,7 +85,7 @@ MOGO_LOCATION_VERSION=1.4.3.26 MOGO_TELEMATIC_VERSION=1.4.3.26 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=2.7.0.9 +MAP_SDK_VERSION=2.7.0.10 MAP_SDK_OPERATION_VERSION=1.1.3.5 # websocket WEBSOCKET_VERSION=1.1.7