From 00c2239bdadd54de38c2adfa27b1d8e8f2365f98 Mon Sep 17 00:00:00 2001 From: aibingbing Date: Wed, 6 Dec 2023 17:24:28 +0800 Subject: [PATCH 1/8] =?UTF-8?q?[=E6=B8=85=E6=89=AB=E8=BD=A6]=20feat:?= =?UTF-8?q?=E6=B8=85=E6=89=AB=E8=BD=A6=20V6.2.4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index c911518c2c..d26edcef58 100644 --- a/gradle.properties +++ b/gradle.properties @@ -172,6 +172,6 @@ CHARTER_DRIVER_VERSION=6.2.0 # 包车模式乘客端端版本号 CHARTER_PASSENGER_VERSION=5.2.0 # 支持云控清扫车模式司机端版本号 -SWEEPERCLOUD_DRIVER_VERSION=6.2.0 +SWEEPERCLOUD_DRIVER_VERSION=6.2.4 # 清扫车模式司机端版本号 -SWEEPEROPERATE_DRIVER_VERSION=6.2.0 +SWEEPEROPERATE_DRIVER_VERSION=6.2.4 From 2d7d9ea25a36ce996fb840edee1f4c295536ab12 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 18 Dec 2023 12:01:23 +0800 Subject: [PATCH 2/8] [6.2.4] fix bug of sound play helper , devices extends lenovo , npl of map init --- .../och/common/module/utils/SoundPoolHelper.java | 9 ++++++++- .../v2n/scenario/scene/airoad/AiRoadMarker.kt | 5 +++++ .../eagle/core/function/impl/MogoMapService.kt | 2 +- .../eagle/core/utilcode/util/DeviceUtils.java | 12 +++++++++++- .../src/main/java/com/mogo/map/MogoMap.kt | 6 +++--- .../mogo/map/identify/MogoIdentifyManager.java | 16 +++++++++++++--- .../mogo/map/overlay/MoGoOverlayManagerImpl.kt | 6 +++--- 7 files changed, 44 insertions(+), 12 deletions(-) diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/SoundPoolHelper.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/SoundPoolHelper.java index 3d785f53dc..3fdb6980d9 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/SoundPoolHelper.java +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/SoundPoolHelper.java @@ -4,6 +4,7 @@ import android.annotation.SuppressLint; import android.media.*; import android.content.*; import android.app.*; +import android.util.Log; public class SoundPoolHelper { private SoundPool mSoundPool; @@ -38,7 +39,9 @@ public class SoundPoolHelper { //init settings private void init(){ // AudioManager audio settings for adjusting the volume - mAudioManager = (AudioManager)this.mContext. getSystemService(Context.AUDIO_SERVICE); + if(mAudioManager == null){ + mAudioManager = (AudioManager)this.mContext. getSystemService(Context.AUDIO_SERVICE); + } // Current volumn Index of particular stream type. float currentVolumeIndex = (float) mAudioManager.getStreamVolume(streamType); @@ -87,6 +90,10 @@ public class SoundPoolHelper { //play the sound res private void playSound(){ + if(mSoundPool == null){ + Log.e("SoundPoolHelper","playSound mSoundPool is null"); + return; + } float leftVolume = volume; float rightVolume = volume; // Play sound of gunfire. Returns the ID of the new stream. diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt index a421d6ea73..f002941989 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt @@ -119,6 +119,11 @@ class AiRoadMarker { countDown.incrementAndGet() realMark(marker, wrapper, l1, l2, location.heading) }) + }else{ + wrapper.onRemoved = { id -> + aiMakers.remove(id) + } + MarkerRemoveManager.addMarker(wrapper) } } } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/MogoMapService.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/MogoMapService.kt index 9f54c75167..38b2e75994 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/MogoMapService.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/MogoMapService.kt @@ -22,7 +22,7 @@ import com.mogo.map.location.IMogoGDLocationClient class MogoMapService : IMogoMapService { override fun getMapUIController(mapTag:String): IMogoMapUIController? { - return mapInstance.getMogoMap().uiController + return mapInstance.getMogoMap()?.uiController } override fun getOverlayManager(): IMoGoOverlayManager { diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java index a2dea6cc72..8c02fce617 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/DeviceUtils.java @@ -313,7 +313,7 @@ public final class DeviceUtils { } public static Boolean isLenovoModel(){ - return getModel().contains("Lenovo"); + return getModel().contains("Lenovo") || getBrand().contains("Lenovo"); } public static Boolean isEB5Model(){ @@ -336,6 +336,16 @@ public final class DeviceUtils { return model; } + public static String getBrand() { + String brand = Build.BRAND; + if (brand != null) { + brand = brand.trim().replaceAll("\\s*", ""); + } else { + brand = ""; + } + return brand; + } + /** * Return an ordered list of ABIs supported by this device. The most preferred ABI is the first * element in the list. diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/MogoMap.kt b/libraries/mogo-map-api/src/main/java/com/mogo/map/MogoMap.kt index b62777654d..da6ff519fa 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/MogoMap.kt +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/MogoMap.kt @@ -36,12 +36,12 @@ class MogoMap private constructor() { /** * 业务使用时根据地图是否加载来判定 是否获取IMogoMap实例 */ - fun getMogoMap(instance: String = DEFAULT): IMogoMap { + fun getMogoMap(instance: String = DEFAULT): IMogoMap? { return if (mapCache[instance] == null) { CallerLogger.e("$M_MAP$TAG", "getMogoMap func has error with no instance in mapCache") - mapCache[DEFAULT]!! + mapCache[DEFAULT] } else { - mapCache[instance]!! + mapCache[instance] } } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/identify/MogoIdentifyManager.java b/libraries/mogo-map/src/main/java/com/mogo/map/identify/MogoIdentifyManager.java index ed095f55a9..bfd1882488 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/identify/MogoIdentifyManager.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/identify/MogoIdentifyManager.java @@ -1,5 +1,6 @@ package com.mogo.map.identify; +import com.mogo.map.IMogoMap; import com.mogo.map.MogoMap; import com.mogo.map.identity.IMogoIdentifyManager; import java.util.HashMap; @@ -32,7 +33,10 @@ public class MogoIdentifyManager implements IMogoIdentifyManager { @Override public void removeMarker(String uuidString) { try { - MogoMap.Companion.getMapInstance().getMogoMap(MogoMap.DEFAULT).removeMarker(uuidString); + IMogoMap iMogoMap = MogoMap.Companion.getMapInstance().getMogoMap(MogoMap.DEFAULT); + if(iMogoMap != null){ + iMogoMap.removeMarker(uuidString); + } } catch (Exception e) { e.printStackTrace(); } @@ -44,7 +48,10 @@ public class MogoIdentifyManager implements IMogoIdentifyManager { @Override public void updateBatchMarkerPosition(HashMap optionsArrayList) { try { - MogoMap.Companion.getMapInstance().getMogoMap(MogoMap.DEFAULT).updateBatchMarkerPosition(optionsArrayList); + IMogoMap iMogoMap = MogoMap.Companion.getMapInstance().getMogoMap(MogoMap.DEFAULT); + if(iMogoMap != null){ + iMogoMap.updateBatchMarkerPosition(optionsArrayList); + } } catch (Exception e) { e.printStackTrace(); } @@ -53,7 +60,10 @@ public class MogoIdentifyManager implements IMogoIdentifyManager { @Override public void updateBatchAiMarkerPosition(HashMap optionsArrayList) { try { - MogoMap.Companion.getMapInstance().getMogoMap(MogoMap.DEFAULT).updateBatchAiMarkerPosition(optionsArrayList); + IMogoMap iMogoMap = MogoMap.Companion.getMapInstance().getMogoMap(MogoMap.DEFAULT); + if(iMogoMap != null){ + iMogoMap.updateBatchAiMarkerPosition(optionsArrayList); + } } catch (Exception e) { e.printStackTrace(); } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/overlay/MoGoOverlayManagerImpl.kt b/libraries/mogo-map/src/main/java/com/mogo/map/overlay/MoGoOverlayManagerImpl.kt index ee2cc14ff6..7a9a880957 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/overlay/MoGoOverlayManagerImpl.kt +++ b/libraries/mogo-map/src/main/java/com/mogo/map/overlay/MoGoOverlayManagerImpl.kt @@ -28,7 +28,7 @@ internal class MoGoOverlayManagerImpl: IMoGoOverlayManager { point.setOptions(options) return key } else { - val p = mapInstance.getMogoMap(mapTag).addPoint(options) + val p = mapInstance.getMogoMap(mapTag)?.addPoint(options) if (p != null) { p.onRemove { removed -> val keys = points.filterKeys { it.id == removed } @@ -232,7 +232,7 @@ internal class MoGoOverlayManagerImpl: IMoGoOverlayManager { line.setOptions(options) return key } else { - val newLine = mapInstance.getMogoMap(mapTag).addLine(options) + val newLine = mapInstance.getMogoMap(mapTag)?.addLine(options) if (newLine != null) { newLine.onRemove { removed -> val keys = lines.filterKeys { it.id == removed } @@ -259,7 +259,7 @@ internal class MoGoOverlayManagerImpl: IMoGoOverlayManager { private fun moveToCenter(mapTag:String, id: String, eventLon: Double, eventLat: Double, carLon: Double, carLat: Double) { try { - mapInstance.getMogoMap(mapTag).uiController?.showBounds( + mapInstance.getMogoMap(mapTag)?.uiController?.showBounds( id, MogoLatLng(carLat, carLon), listOf(MogoLatLng(eventLat, eventLon)), From 8ff2beb82433f506d533337e42c2161b25567328 Mon Sep 17 00:00:00 2001 From: aibingbing Date: Mon, 18 Dec 2023 16:15:49 +0800 Subject: [PATCH 3/8] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E8=A7=86=E9=A2=91]=20fi?= =?UTF-8?q?x:=20=E5=8A=A8=E7=94=BB=E4=B8=ADNPE=E9=97=AE=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/sweeper/common/view/TurnSignalView.kt | 50 +++++++++++-------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/TurnSignalView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/TurnSignalView.kt index 8c43d614a7..2a5d592cb6 100644 --- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/TurnSignalView.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/TurnSignalView.kt @@ -54,22 +54,26 @@ class TurnSignalView : LinearLayout { //根据左右进行显示和隐藏，实际要判断每个来的时间和频度 when (directionLight) { Chassis.LightSwitch.LIGHT_LEFT -> { //左转向 - leftSelectImage.visibility = View.VISIBLE - rightSelectImage.visibility = View.GONE - rightSelectImage.clearAnimation() - setAnimation(leftSelectImage) + leftSelectImage?.visibility = View.VISIBLE + rightSelectImage?.visibility = View.GONE + rightSelectImage?.clearAnimation() + leftSelectImage?.also { + setAnimation(it) + } } Chassis.LightSwitch.LIGHT_RIGHT -> { //右转向 - leftSelectImage.visibility = View.GONE - rightSelectImage.visibility = View.VISIBLE - leftSelectImage.clearAnimation() - setAnimation(rightSelectImage) + leftSelectImage?.visibility = View.GONE + rightSelectImage?.visibility = View.VISIBLE + leftSelectImage?.clearAnimation() + rightSelectImage?.also { + setAnimation(it) + } } else -> { //消失 - leftSelectImage.clearAnimation() - rightSelectImage.clearAnimation() - leftSelectImage.visibility = View.GONE - rightSelectImage.visibility = View.GONE + leftSelectImage?.clearAnimation() + rightSelectImage?.clearAnimation() + leftSelectImage?.visibility = View.GONE + rightSelectImage?.visibility = View.GONE } } } @@ -77,14 +81,18 @@ class TurnSignalView : LinearLayout { //实现图片闪烁效果 private fun setAnimation(imageView: ImageView) { - val animationSet = AnimatorSet() - val valueAnimator = ObjectAnimator.ofFloat(imageView, "alpha", 0f, 1.0f) - val valueAnimatorDisappare = ObjectAnimator.ofFloat(imageView, "alpha", 1.0f, 0f) - valueAnimator.duration = 1000 - valueAnimatorDisappare.duration = 800 - valueAnimator.repeatCount = -1 - valueAnimatorDisappare.repeatCount = -1 - animationSet.playTogether(valueAnimatorDisappare, valueAnimator) - animationSet.start() + try { + val animationSet = AnimatorSet() + val valueAnimator = ObjectAnimator.ofFloat(imageView, "alpha", 0f, 1.0f) + val valueAnimatorDisappare = ObjectAnimator.ofFloat(imageView, "alpha", 1.0f, 0f) + valueAnimator.duration = 1000 + valueAnimatorDisappare.duration = 800 + valueAnimator.repeatCount = -1 + valueAnimatorDisappare.repeatCount = -1 + animationSet.playTogether(valueAnimatorDisappare, valueAnimator) + animationSet.start() + } catch (e: Exception) { + e.printStackTrace() + } } } \ No newline at end of file From 8e130899a48d60888356e7b204623cb8eaa0e097 Mon Sep 17 00:00:00 2001 From: aibingbing Date: Mon, 18 Dec 2023 19:56:04 +0800 Subject: [PATCH 4/8] =?UTF-8?q?[Sweeper]=20fix:=20=E4=BF=AE=E5=A4=8DSonar?= =?UTF-8?q?=E4=B8=8A=E9=97=AE=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/och/sweeper/SweeperProvider.java | 8 ++++---- .../och/sweeper/cloud/model/SweeperCloudTaskModel.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/SweeperProvider.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/SweeperProvider.java index 17529023d4..2ccf94dc3b 100644 --- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/SweeperProvider.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/SweeperProvider.java @@ -57,14 +57,14 @@ public class SweeperProvider implements IMogoOCH, IMoGoSweeperModeListener { FragmentManager supportFragmentManager = activity.getSupportFragmentManager(); if (sweeperOperateFragment == null) { CallerLogger.d(TAG, "准备add fragment======"); - Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(sweeperOperateFragment.TAG); + Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(SweeperOperateFragment.TAG); if (fragmentByTag instanceof SweeperOperateFragment) { sweeperOperateFragment = (SweeperOperateFragment) fragmentByTag; } else { sweeperOperateFragment = new SweeperOperateFragment(); } if (!sweeperOperateFragment.isAdded()) { - supportFragmentManager.beginTransaction().add(containerId, sweeperOperateFragment, sweeperOperateFragment.TAG).commitAllowingStateLoss(); + supportFragmentManager.beginTransaction().add(containerId, sweeperOperateFragment, SweeperOperateFragment.TAG).commitAllowingStateLoss(); } return; } @@ -76,14 +76,14 @@ public class SweeperProvider implements IMogoOCH, IMoGoSweeperModeListener { FragmentManager supportFragmentManager = activity.getSupportFragmentManager(); if (sweeperCloudFragment == null) { CallerLogger.d(TAG, "准备add fragment======"); - Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(sweeperCloudFragment.TAG); + Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(SweeperCloudFragment.TAG); if (fragmentByTag instanceof SweeperCloudFragment) { sweeperCloudFragment = (SweeperCloudFragment) fragmentByTag; } else { sweeperCloudFragment = new SweeperCloudFragment(); } if (!sweeperCloudFragment.isAdded()) { - supportFragmentManager.beginTransaction().add(containerId, sweeperCloudFragment, sweeperCloudFragment.TAG).commitAllowingStateLoss(); + supportFragmentManager.beginTransaction().add(containerId, sweeperCloudFragment, SweeperCloudFragment.TAG).commitAllowingStateLoss(); } return; } diff --git a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java index 0c58b0d95a..e359f8d97f 100644 --- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java @@ -458,7 +458,7 @@ public class SweeperCloudTaskModel implements IMoGoSweeperFutianCloudTaskListene public void onSweeperFutianCloudTaskCloudSuspendResume(@NonNull AiCloudTask.MessageType messageType, @Nullable String reqNo, long sysTime, @Nullable SweeperTaskCloudSuspendResume.BigTaskActionPush bigTaskActionPush) { CallerLogger.d(M_SWEEPER + TAG, "messageType: " + messageType.getNumber() + " sysTime：" + sysTime + " reqNo：" + reqNo + " " + - "onSweeperFutianCloudTaskCloudSuspendResume：" + SweeperCloudTaskUtils.printMessage(bigTaskActionPush)); + "onSweeperFutianCloudTaskCloudSuspendResume：" + bigTaskActionPush == null ? "null" : SweeperCloudTaskUtils.printMessage(bigTaskActionPush)); DebugView.Companion.printInfoMsg("[云控]云端下发暂停/恢复指令，messageType=" + messageType.getNumber() + ", sysTime=" + sysTime + ", reqNo=" + reqNo From 68c3dce0a58c76bbaa996f051d048be76f0e9275 Mon Sep 17 00:00:00 2001 From: pangfan Date: Tue, 19 Dec 2023 12:04:29 +0800 Subject: [PATCH 5/8] =?UTF-8?q?[v6.2.5]MogoTaxi=E5=8F=B8=E6=9C=BAapp?= =?UTF-8?q?=EF=BC=9A=E5=8E=BB=E9=99=A4"=E5=AE=89=E5=85=A8/=E8=87=AA?= =?UTF-8?q?=E9=A9=BE"=E6=A8=A1=E5=BC=8F=E9=80=89=E6=8B=A9=EF=BC=8C?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=87=AA=E9=A9=BE=E6=A8=A1=E5=BC=8F=EF=BC=88?= =?UTF-8?q?server=E5=8E=BB=E9=99=A4=E5=BC=80=E5=90=AF=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=97=B6=E7=9A=84'=E5=AE=89=E5=85=A8=E7=A1=AE=E8=AE=A4'?= =?UTF-8?q?=E9=99=90=E5=88=B6=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/taxi/model/TaxiModel.java | 24 +++++++++++++++---- .../och/taxi/presenter/TaxiPresenter.java | 5 ++++ .../ui/TaxiBeingServerdOrdersFragment.java | 9 ++++++- .../com/mogo/och/taxi/ui/TaxiFragment.java | 5 ++++ 4 files changed, 38 insertions(+), 5 deletions(-) diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index 662e2aceaf..9a28d7f996 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -764,12 +764,20 @@ public class TaxiModel { @Override public void onSuccess(TaxiDataBaseRespBean data) { - updateAutopilotStatus(data.code == 0); + /** 2023.12.18 1.去除"自驾/安全"模式选择，默认自驾模式且无需点击； + * 2.server去除订单流转对"安全确认"的限制（读写接口默认反馈ok，但"开启自动驾驶成功"不再限制） + */ + // updateAutopilotStatus(data.code == 0); + updateAutopilotStatus(true); } @Override public void onFail(int code, String msg) { - updateAutopilotStatus(false); + /** 2023.12.18 1.去除"自驾/安全"模式选择，默认自驾模式且无需点击； + * 2.server去除订单流转对"安全确认"的限制（读写接口默认反馈ok，但"开启自动驾驶成功"不再限制） + */ + // updateAutopilotStatus(false); + updateAutopilotStatus(true); } }); } @@ -793,12 +801,20 @@ public class TaxiModel { @Override public void onSuccess(TaxiDataBaseRespBean data) { if (data != null && data.code == 0) - updateAutopilotStatus(data.data.equals(true)); + /** 2023.12.18 1.去除"自驾/安全"模式选择，默认自驾模式且无需点击； + * 2.server去除订单流转对"安全确认"的限制（读写接口默认反馈ok，但"开启自动驾驶成功"不再限制） + */ + // updateAutopilotStatus(data.data.equals(true)); + updateAutopilotStatus(true); } @Override public void onFail(int code, String msg) { - updateAutopilotStatus(false); + /** 2023.12.18 1.去除"自驾/安全"模式选择，默认自驾模式且无需点击； + * 2.server去除订单流转对"安全确认"的限制（读写接口默认反馈ok，但"开启自动驾驶成功"不再限制） + */ + // updateAutopilotStatus(false); + updateAutopilotStatus(true); } }); } diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java index 54007473e2..be5e671701 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java @@ -258,6 +258,11 @@ public class TaxiPresenter extends Presenter implements ITaxiADASS TaxiModel.getInstance().cleanLineMarker(); TaxiModel.getInstance().cleanStation(); runOnUIThread(() -> { + /** 2023.12.18 1.去除"自驾/安全"模式选择，默认自驾模式且无需点击； + * 2.server去除订单流转对"安全确认"的限制（读写接口默认反馈ok，但"开启自动驾驶成功"不再限制） + */ + mView.updateCtvAutopilotStatusTag(false); + if(TaxiOrderStatusEnum.ArriveAtEnd.getCode() == order.orderStatus){ CallerOrderListenerManager.INSTANCE.invokeOrderStatus(false); } diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java index 0fcc863c72..baa4517898 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java @@ -283,7 +283,14 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment Color.parseColor("#FF1D5EF3"), true); - showOrHideOrderModeBtn(true); + /** 2023.12.18 1.去除"自驾/安全"模式选择，默认自驾模式且无需点击； + * 2.server去除订单流转对"安全确认"的限制（读写接口默认反馈ok，但"开启自动驾驶成功"不再限制） + */ + // showOrHideOrderModeBtn(true); + showOrHideOrderModeBtn(false); + CallerLogger.d(M_TAXI + TAG, "自驾模式"); + mOrderStartModeBtn.setTag(0); + startOrEndService(); } }else if (TaxiModel.getInstance().checkCurrentOCHOrder()) { diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java index 1b3d2b1bf4..89f97e6b1d 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java @@ -230,6 +230,11 @@ public class TaxiFragment extends BaseTaxiTabFragment Date: Tue, 19 Dec 2023 15:04:15 +0800 Subject: [PATCH 6/8] =?UTF-8?q?[v6.2.5]MogoTaxi=E5=8F=B8=E6=9C=BAapp?= =?UTF-8?q?=EF=BC=9Arelease=20version=20v6.2.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index a996b0b75f..9d749d9f1b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -150,28 +150,28 @@ MATRIX_VERSION=2.0.8 # 测试模式司机端版本号 NOOP_DRIVER_VERSION=3.2.0 # 公交模式司机端版本号 -BUS_DRIVER_VERSION=6.2.4 +BUS_DRIVER_VERSION=6.2.5 # 公交模式乘客端端版本号 BUS_PASSENGER_VERSION=5.2.4 # 接驳模式司机端版本号 -SHUTTLE_DRIVER_VERSION=6.2.4 +SHUTTLE_DRIVER_VERSION=6.2.5 # 接驳模式乘客端端版本号 SHUTTLE_PASSENGER_VERSION=5.2.4 # 出租车模式司机端版本号 -TAXI_DRIVER_VERSION=6.2.4 +TAXI_DRIVER_VERSION=6.2.5 # 出租车模式乘客端端版本号 TAXI_PASSENGER_VERSION=5.2.4 # 出租车模式司机端版本号 -TAXIUNMANNED_DRIVER_VERSION=6.2.4 +TAXIUNMANNED_DRIVER_VERSION=6.2.5 # 出租车模式乘客端端版本号 TAXIUNMANNED_PASSENGER_VERSION=5.2.4 # 包车模式司机端版本号 -CHARTER_DRIVER_VERSION=6.2.4 +CHARTER_DRIVER_VERSION=6.2.5 # 包车模式乘客端端版本号 CHARTER_PASSENGER_VERSION=5.2.4 # 支持云控清扫车模式司机端版本号 -SWEEPERCLOUD_DRIVER_VERSION=6.2.4 +SWEEPERCLOUD_DRIVER_VERSION=6.2.5 # 清扫车模式司机端版本号 -SWEEPEROPERATE_DRIVER_VERSION=6.2.4 +SWEEPEROPERATE_DRIVER_VERSION=6.2.5 From 7a700d7b905c3be569ce60dd9a1b34cc49157364 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 19 Dec 2023 21:09:02 +0800 Subject: [PATCH 7/8] [6.2.5] update chain --- gradle/ext.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/ext.gradle b/gradle/ext.gradle index 7d1e8f2788..c363c59b68 100644 --- a/gradle/ext.gradle +++ b/gradle/ext.gradle @@ -2,6 +2,6 @@ ext { gradle_version = '3.5.3' kotlin_plugin_version = '1.5.30' plugin_version = '10.0.0_mogo' - service_chain_version = '5.3.8' + service_chain_version = '5.3.14' lancetx_plugin_version = '10.0.4_mogo' } \ No newline at end of file From cec123e0466448e2dbc3925c8f46b32105b28d46 Mon Sep 17 00:00:00 2001 From: pangfan Date: Wed, 20 Dec 2023 11:53:34 +0800 Subject: [PATCH 8/8] =?UTF-8?q?[v6.2.5]MogoTaxi=E4=B9=98=E5=AE=A2=EF=BC=9A?= =?UTF-8?q?version=20v5.2.5=EF=BC=88=E9=85=8D=E5=90=88=E5=8F=B8=E6=9C=BAap?= =?UTF-8?q?p=E6=9B=B4=E6=96=B0=E8=BD=A6=E6=A8=A1=EF=BC=89?= 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 9d749d9f1b..b4e941de07 100644 --- a/gradle.properties +++ b/gradle.properties @@ -160,7 +160,7 @@ SHUTTLE_PASSENGER_VERSION=5.2.4 # 出租车模式司机端版本号 TAXI_DRIVER_VERSION=6.2.5 # 出租车模式乘客端端版本号 -TAXI_PASSENGER_VERSION=5.2.4 +TAXI_PASSENGER_VERSION=5.2.5 # 出租车模式司机端版本号 TAXIUNMANNED_DRIVER_VERSION=6.2.5