From 98642960347d6e703be6e4cca66ea6ae6ed13d46 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Tue, 4 Jul 2023 16:46:40 +0800 Subject: [PATCH 01/18] =?UTF-8?q?[3.3.0]=20bus=E4=B9=98=E5=AE=A2=E5=B1=8F?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=B8=83=E5=B1=80=E9=97=AE=E9=A2=98=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/jinlvvan/res/layout/bus_p_route_fragment.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml index a99b9ec46e..a92d7350f4 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml @@ -41,7 +41,8 @@ android:id="@+id/driver_info_bg" android:layout_width="@dimen/bus_p_route_info_panel_width" android:layout_height="0dp" - app:layout_constraintBottom_toTopOf="@+id/busPLineMapView" + android:layout_marginBottom="@dimen/bus_p_route_line_map_view_height" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent"> From da00e4dce54184a20a8114a7e86cd09e404afe46 Mon Sep 17 00:00:00 2001 From: aibingbing Date: Tue, 4 Jul 2023 17:16:48 +0800 Subject: [PATCH 02/18] =?UTF-8?q?[Bus=20Passenger]=20feat:=20Bus=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F-=E9=87=91=E6=97=85=E6=98=9F=E8=BE=B0=E8=BD=A6-?= =?UTF-8?q?=E4=B9=98=E5=AE=A2=E5=B1=8F=20=E5=A2=9E=E5=8A=A0=E5=AE=A3?= =?UTF-8?q?=E4=BC=A0=E8=A7=86=E9=A2=91=E5=A4=9A=E5=B1=8F=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=EF=BC=88=E7=9B=AE=E5=89=8D=E4=B8=BB=E8=A6=81=E4=B8=BA=E8=A1=A1?= =?UTF-8?q?=E9=98=B3=E6=BC=94=E7=A4=BA=E8=BD=A6=EF=BC=89=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bus/passenger/MogoOCHBusPassenger.java | 5 + app/config/tempConfig.json | 208 ++++++++++++++++++ 2 files changed, 213 insertions(+) diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java index 0969ca9ad4..3690ed62c9 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java @@ -46,6 +46,11 @@ public class MogoOCHBusPassenger implements IMogoOCH { this.mActivity = activity; this.mContainerId = containerId; showFragment(); + + if (AppIdentityModeUtils.isJL(FunctionBuildConfig.appIdentityMode)) { + MultiDisplayUtils.INSTANCE.startActWithSecond(activity, VideoPlayerActivity.class); + } + return null; } diff --git a/app/config/tempConfig.json b/app/config/tempConfig.json index 87f52a3f09..438c1f8b68 100644 --- a/app/config/tempConfig.json +++ b/app/config/tempConfig.json @@ -64,6 +64,70 @@ } ] }, + "buspassengerochjl": { + "ads": [ + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg", + "type": 0, + "cacheImgPath": "", + "title": "1" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", + "type": 0, + "cacheImgPath": "", + "title": "2" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357557335/3.mp4", + "type": 1, + "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", + "title": "3" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "type": 0, + "cacheImgPath": "", + "title": "4" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v", + "type": 0, + "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "title": "5" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676358660379/6.m4v", + "type": 1, + "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "title": "6" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360154589/7.jpg", + "type": 0, + "cacheImgPath": "", + "title": "7" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360185500/8.jpg", + "type": 0, + "cacheImgPath": "", + "title": "8" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", + "type": 0, + "cacheImgPath": "", + "title": "9" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360274126/10.mp4", + "type": 1, + "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", + "title": "10" + } + ] + }, "shuttlepassengerochm2": { "ads": [ { @@ -146,6 +210,70 @@ } ] }, + "buspassengerochjl": { + "ads": [ + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg", + "type": 0, + "cacheImgPath": "", + "title": "1" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", + "type": 0, + "cacheImgPath": "", + "title": "2" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357557335/3.mp4", + "type": 1, + "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", + "title": "3" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "type": 0, + "cacheImgPath": "", + "title": "4" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v", + "type": 0, + "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "title": "5" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676358660379/6.m4v", + "type": 1, + "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "title": "6" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360154589/7.jpg", + "type": 0, + "cacheImgPath": "", + "title": "7" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360185500/8.jpg", + "type": 0, + "cacheImgPath": "", + "title": "8" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", + "type": 0, + "cacheImgPath": "", + "title": "9" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360274126/10.mp4", + "type": 1, + "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", + "title": "10" + } + ] + }, "shuttlepassengerochm2": { "ads": [ { @@ -180,6 +308,22 @@ } ] }, + "buspassengerochjl": { + "ads": [ + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210971943/yangmadou.mp4", + "type": 1, + "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1680774790614/yangmadao_photo.jpg", + "title": "1" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210971943/yangmadou.mp4", + "type": 1, + "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1680774790614/yangmadao_photo.jpg", + "title": "2" + } + ] + }, "shuttlepassengerochm2": { "ads": [ { @@ -262,6 +406,70 @@ } ] }, + "buspassenger": { + "ads": [ + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg", + "type": 0, + "cacheImgPath": "", + "title": "1" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", + "type": 0, + "cacheImgPath": "", + "title": "2" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357557335/3.mp4", + "type": 1, + "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", + "title": "3" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "type": 0, + "cacheImgPath": "", + "title": "4" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v", + "type": 0, + "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "title": "5" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676358660379/6.m4v", + "type": 1, + "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "title": "6" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360154589/7.jpg", + "type": 0, + "cacheImgPath": "", + "title": "7" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360185500/8.jpg", + "type": 0, + "cacheImgPath": "", + "title": "8" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", + "type": 0, + "cacheImgPath": "", + "title": "9" + }, + { + "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360274126/10.mp4", + "type": 1, + "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", + "title": "10" + } + ] + }, "shuttlepassengerm2": { "ads": [ { From 09a9a8c56c48ccbc9bb5cefe0414b1243d490790 Mon Sep 17 00:00:00 2001 From: aibingbing Date: Tue, 4 Jul 2023 17:19:53 +0800 Subject: [PATCH 03/18] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E8=A7=86=E9=A2=91]=20?= =?UTF-8?q?fix:=20=E7=AC=AC5=E4=B8=AA=E5=AE=A3=E4=BC=A0=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E6=92=AD=E6=94=BE=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/config/tempConfig.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/config/tempConfig.json b/app/config/tempConfig.json index 438c1f8b68..6b5b6e6a76 100644 --- a/app/config/tempConfig.json +++ b/app/config/tempConfig.json @@ -28,7 +28,7 @@ }, { "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v", - "type": 0, + "type": 1, "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", "title": "5" }, @@ -92,7 +92,7 @@ }, { "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v", - "type": 0, + "type": 1, "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", "title": "5" }, @@ -174,7 +174,7 @@ }, { "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v", - "type": 0, + "type": 1, "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", "title": "5" }, @@ -238,7 +238,7 @@ }, { "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v", - "type": 0, + "type": 1, "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", "title": "5" }, @@ -370,7 +370,7 @@ }, { "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v", - "type": 0, + "type": 1, "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", "title": "5" }, @@ -434,7 +434,7 @@ }, { "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v", - "type": 0, + "type": 1, "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", "title": "5" }, From b36fc3794b97d9c670d1b212c1beae106acc8227 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Tue, 4 Jul 2023 17:49:24 +0800 Subject: [PATCH 04/18] =?UTF-8?q?[3.3.0]=E8=B0=83=E6=95=B4=E7=BA=A2?= =?UTF-8?q?=E7=BB=BF=E7=81=AF=E5=80=92=E8=AE=A1=E6=97=B6=E6=96=87=E5=AD=97?= =?UTF-8?q?=E9=97=B4=E8=B7=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/hmi_view_traffic_light.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_traffic_light.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_traffic_light.xml index cd31442233..b7667cf45c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_traffic_light.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_view_traffic_light.xml @@ -32,7 +32,7 @@ android:textStyle="bold" app:layout_constraintTop_toTopOf="parent" app:layout_constraintLeft_toRightOf="@id/hmi_traffic_light_iv" - android:layout_marginStart="-30dp" + android:layout_marginStart="-40dp" /> Date: Wed, 5 Jul 2023 11:36:32 +0800 Subject: [PATCH 05/18] =?UTF-8?q?[3.3.0]=20UI=20fix=20@=E9=92=9F=E8=B6=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eagle/core/function/hmi/ui/setting/SOPSettingView.kt | 2 +- .../eagle/core/function/hmi/ui/widget/StatusBarView.kt | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt index 5fde15f7d2..ed2100a492 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt @@ -196,9 +196,9 @@ internal class SOPSettingView @JvmOverloads constructor( return@setOnCheckedChangeListener } hmiAction("SOP 雨天模式开关, ",isChecked) + FunctionBuildConfig.isRainMode = isChecked CallerAutoPilotControlManager.setRainMode(isChecked) CallerHmiViewControlListenerManager.invokeFuncMode(FUNC_MODE_RAIN, isChecked) - FunctionBuildConfig.isRainMode = isChecked } //雨天模式按钮只在司机屏生效，乘客屏不显示 if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/StatusBarView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/StatusBarView.kt index 827928b818..3f261ace4a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/StatusBarView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/StatusBarView.kt @@ -15,6 +15,7 @@ import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager import com.mogo.eagle.core.function.hmi.R +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.util.BarUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils import kotlinx.android.synthetic.main.view_status_bar.view.* @@ -54,8 +55,10 @@ class StatusBarView @JvmOverloads constructor( //将状态窗口中的状态移到状态栏上 CallerDevaToolsManager.showStatusBar(context, status_container) - updateStatusBarLeftView(true, FUNC_MODE_DEMO, DemoModeView(this.context)) - updateStatusBarLeftView(true, FUNC_MODE_RAIN, RainModeView(this.context)) + if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){ + updateStatusBarLeftView(true, FUNC_MODE_DEMO, DemoModeView(this.context)) + updateStatusBarLeftView(true, FUNC_MODE_RAIN, RainModeView(this.context)) + } } override fun onSkinModeChange(skinMode: Int) { From d3b03c00dbf337b3c389784119e2bb0fec28c181 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 5 Jul 2023 15:26:34 +0800 Subject: [PATCH 06/18] =?UTF-8?q?[3.3.0]=201=E3=80=81taxi=20=E4=B9=98?= =?UTF-8?q?=E5=AE=A2=E5=B1=8F=E6=B8=85=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=202=E3=80=81taxi=E6=97=A0=E8=AE=A2=E5=8D=95=E5=90=8E?= =?UTF-8?q?=E6=B8=85=E9=99=A4=E5=85=A8=E8=A7=88=E8=B7=AF=E7=BA=BF=E8=BD=A8?= =?UTF-8?q?=E8=BF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/presenter/BaseTaxiPassengerPresenter.java | 8 -------- .../com/mogo/och/taxi/passenger/ui/OverviewFragment.kt | 1 + 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java index 3a0e4215c1..655a1a1f6c 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java @@ -172,7 +172,6 @@ public class BaseTaxiPassengerPresenter extends Presenter Date: Wed, 5 Jul 2023 17:12:37 +0800 Subject: [PATCH 07/18] =?UTF-8?q?[3.3.0][Fix]=E5=B7=B2=E8=B5=B0=E8=BF=87?= =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E6=9B=BF=E6=8D=A2=E6=96=B0=E7=BA=B9=E7=90=86?= =?UTF-8?q?=E4=B8=8D=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/eagle/core/function/view/OverMapView.kt | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt index 656285f640..cd64f3d899 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt @@ -130,9 +130,6 @@ class OverMapView @JvmOverloads constructor( @Volatile private var lastTime = 0L - @Volatile - private var isPointsChanged = false - /** * 高频的 */ @@ -808,10 +805,7 @@ class OverMapView @JvmOverloads constructor( if (mCoveredPolyline != null) { mCoveredPolyline!!.options.customTextureList = textureList mCoveredPolyline!!.options.customTextureIndex = texIndexList - if (isPointsChanged) { - mCoveredPolyline!!.points = coordinates - isPointsChanged = false - } + mCoveredPolyline!!.points = coordinates return } @@ -1090,7 +1084,6 @@ class OverMapView @JvmOverloads constructor( lastTime = System.currentTimeMillis() } MarkerDrawerManager.stopLoopCalCarLocation() - isPointsChanged = true globalPathResp?.let { ThreadUtils.getSinglePool().execute { handlePlanningData(it.wayPointsList) From a8c4543a08086526639da4d570ba5dff3a27b163 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 5 Jul 2023 18:53:10 +0800 Subject: [PATCH 08/18] =?UTF-8?q?taxi=20=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/taxi/passenger/ui/OverviewFragment.kt | 30 +++++++------------ .../res/layout/taxi_p_overmap_fragment.xml | 13 ++++++++ 2 files changed, 24 insertions(+), 19 deletions(-) create mode 100644 OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_overmap_fragment.xml diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/OverviewFragment.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/OverviewFragment.kt index f915c37987..7fdd99ff80 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/OverviewFragment.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/OverviewFragment.kt @@ -10,6 +10,7 @@ import com.mogo.eagle.core.function.view.OverMapView import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.UiThreadHandler +import com.mogo.och.taxi.passenger.R import com.mogo.och.taxi.passenger.constant.TaxiPassengerOrderStatusEnum import com.mogo.och.taxi.passenger.model.TaxiPassengerModel import io.reactivex.Observable @@ -26,23 +27,6 @@ class OverviewFragment : BaseFragment() { private var subscribe: Disposable?=null - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View { - if (overmapview == null) { - overmapview = OverMapView(requireContext()) - } else { - val viewGroup = overmapview?.parent as ViewGroup - viewGroup.removeView(overmapview) - } - overmapview?.onCreateView(savedInstanceState) - CallerLogger.d(SceneConstant.M_TAXI_P + TAG,"onCreateView") - statusChange(TaxiPassengerModel.getInstance().curOrderStatus) - return overmapview!! - } - override fun onResume() { super.onResume() overmapview?.onResume() @@ -80,7 +64,6 @@ class OverviewFragment : BaseFragment() { if(finalVisable2User){ CallerLogger.d(SceneConstant.M_TAXI_P + TAG,"已经隐藏") finalVisable2User = false - stopAndClear() } } } @@ -117,7 +100,7 @@ class OverviewFragment : BaseFragment() { override fun getLayoutId(): Int { - return 0 + return R.layout.taxi_p_overmap_fragment } override fun getTagName(): String { @@ -128,6 +111,15 @@ class OverviewFragment : BaseFragment() { } + override fun initViews(savedInstanceState: Bundle?) { + super.initViews(savedInstanceState) + overmapview = findViewById(R.id.overMapView) + overmapview?.onCreateView(savedInstanceState) + + CallerLogger.d(SceneConstant.M_TAXI_P + TAG,"onCreateView") + statusChange(TaxiPassengerModel.getInstance().curOrderStatus) + } + companion object{ private const val TAG = "OverviewFragment" @JvmStatic diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_overmap_fragment.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_overmap_fragment.xml new file mode 100644 index 0000000000..c4ddac6349 --- /dev/null +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_overmap_fragment.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file From 933d5ed968675ca9768256bde09329f7d126df57 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 5 Jul 2023 18:56:35 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E8=B7=AF=E8=B7=9D=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E6=9C=80=E5=A4=A7=E8=B7=9D=E7=A6=BB?= =?UTF-8?q?=E9=99=90=E5=88=B6=E3=80=81=20bus=20=E8=AE=BE=E7=BD=AE=E7=AB=99?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bus/passenger/model/BusPassengerModel.kt | 6 +-- .../TrajectoryAndDistanceManager.kt | 47 ++++++++++++++++++- 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt index 8a3c91eb77..9830a0f93b 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt @@ -229,11 +229,11 @@ object BusPassengerModel{ mRouteLineInfoCallback!!.updateStationsInfo(stations, i + 1, false) if (mNextStationIndex != i + 1) { mTwoStationsRouts.clear() - val startStation = mStations[i] - val endStation = mStations[i + 1] - setTrajectoryStation(startStation, endStation, result.lineId) } mNextStationIndex = i + 1 + val startStation = mStations[i] + val endStation = mStations[i + 1] + setTrajectoryStation(startStation, endStation, result.lineId) updateAutopilotControlParameters(result, i) return } else if (station.drivingStatus == BusPassengerConst.STATION_STATUS_STOPPED && !station.isLeaving) { //到站 diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt index fffccac800..ac917a8802 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt @@ -56,6 +56,8 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{ @Volatile private var mRoutePoints: MutableList? = ArrayList() + private var mRoutePointsDistance: MutableList? = ArrayList() + private var maxDistanceAllPoint:Double = 0.0 @Volatile private var lineId:Long? = null @@ -99,9 +101,26 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{ private fun updateRoutePoints(routePoints: List?) { mRoutePoints = null + mRoutePointsDistance = null val latLngModels = CoordinateCalculateRouteUtil .coordinateConverterWgsToGcjLocations(AbsMogoApplication.getApp(), routePoints!!) mRoutePoints = latLngModels + + mRoutePointsDistance = ArrayList() + maxDistanceAllPoint = 0.0 + mRoutePoints?.forEachIndexed { index, current -> + if (mRoutePoints!!.last()!=current) { + val next = mRoutePoints!![index + 1] + val distanceItem = CoordinateUtils.calculateLineDistance( + current.longitude, + current.latitude, + next.longitude, + next.latitude + ) + mRoutePointsDistance?.add(distanceItem) + maxDistanceAllPoint += distanceItem + } + } } private fun removeTempData() { @@ -262,12 +281,27 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{ preCarLocationIndexInTrajectory = 0 return } + + var maxDisatance = 0.0f + if(carLocationInfo.second==true){ + if(carLocationInfo.first>0) { + maxDisatance = mRoutePointsDistance?.get(carLocationInfo.first - 1)?:0f + } + }else{ + maxDisatance = mRoutePointsDistance?.get(carLocationInfo.first)?:0f + } + if(carLocationInfo.third>maxDisatance){ + preCarLocationIndexInTrajectory = 0 + writeLog("到点的距离${carLocationInfo.third},最大距离${maxDisatance}",locationInfo) + return + } + preCarLocationIndexInTrajectory = carLocationInfo.first // 距离回调 try { if(distanceListeners.size>0) { - invokeDistance(carLocationInfo, location) + invokeDistance(carLocationInfo, location,locationInfo) } }catch (e:Exception){ e(M_OCHCOMMON+ TAG,"距离计算错误") @@ -293,7 +327,11 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{ } - private fun invokeDistance(carLocationInfo:Triple,location: MogoLocation){ + private fun invokeDistance( + carLocationInfo: Triple, + location: MogoLocation, + locationInfo: String + ){ var lastSumLength = 0f val stationIndex = endStationInfo.index?:0 @@ -321,6 +359,11 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{ ) } d(M_OCHCOMMON+ TAG,"距离终点：$lastSumLength") + if(lastSumLength>maxDistanceAllPoint){ + // 大于最大值需要需要删除此次计算 + writeLog("距离终点：$lastSumLength",locationInfo) + return + } if(distanceListeners.size>0) { distanceListeners.forEach { //val tag = it.key From 34defdde360d49f2f0940b0164546a17be8f21f7 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 5 Jul 2023 19:00:24 +0800 Subject: [PATCH 10/18] =?UTF-8?q?[3.3.0]=20=E6=B6=88=E6=81=AF=E7=9B=92?= =?UTF-8?q?=E5=AD=90UI=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/bus/passenger/model/BusPassengerModel.kt | 2 +- .../src/jinlvvan/res/layout/bus_p_base_fragment.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt index 8a3c91eb77..915972e82c 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt @@ -184,7 +184,7 @@ object BusPassengerModel{ mRoutePoints.clear() return } - if (routesResult != null && data.result == routesResult) { + if (routesResult != null && data.result.equals(routesResult)) { d(M_BUS_P + TAG, "order = queryDriverSiteByCoordinate = not update") return } diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml index 339efd6fc5..13974b5df3 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml @@ -67,9 +67,9 @@ From fe9b46716e3d62802ee0aaf016dd005ff5a30c8d Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 5 Jul 2023 21:03:08 +0800 Subject: [PATCH 11/18] =?UTF-8?q?[3.3.0][V2X]=20=E6=94=BE=E5=BC=80V2X?= =?UTF-8?q?=E7=9A=84=E9=93=BE=E8=B7=AF=E6=97=A5=E5=BF=97=E4=B8=AD=E7=9A=84?= =?UTF-8?q?Log=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/eagle/function/biz/v2x/V2XBizTrace.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/V2XBizTrace.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/V2XBizTrace.kt index 0317364f70..5eec21a195 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/V2XBizTrace.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/V2XBizTrace.kt @@ -1,8 +1,10 @@ package com.mogo.eagle.function.biz.v2x +import android.util.* import com.mogo.eagle.core.data.deva.chain.ChainConstant import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X +import com.mogo.eagle.core.utilcode.util.* import com.zhjt.service.chain.ChainLog class V2XBizTrace { @@ -16,7 +18,7 @@ class V2XBizTrace { paramIndexes = [0, 1] ) fun onAck(data: Any, data1: Any) { - CallerLogger.d("$M_V2X${data.toString()}", data1) + Log.d("V2X", "tag:$data, msg: $data1") } } } \ No newline at end of file From e2bdc246386e840db48e26c31f9727da21df34d7 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 5 Jul 2023 21:05:25 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B5=B7=E7=BB=88?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/taxi_p_overmap_fragment.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_overmap_fragment.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_overmap_fragment.xml index c4ddac6349..725167d00c 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_overmap_fragment.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_overmap_fragment.xml @@ -8,6 +8,8 @@ android:id="@+id/overMapView" android:layout_width="match_parent" android:layout_height="match_parent" + app:startPointDrawable="@drawable/taxi_p_map_view_dir_start" + app:endPointDrawable="@drawable/taxi_p_map_view_dir_end" app:mapStyleExtraPath="map_style_extra.data" app:mapStylePath="map_style.data" /> \ No newline at end of file From 76d77950585b0cc1cbd74293568cb94b6a1133f0 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 6 Jul 2023 11:38:50 +0800 Subject: [PATCH 13/18] [3.3.0] fix bug of log npt --- .../logcatch/MogoLogCatchManager.kt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt index 19edc0f1b3..01c89acbde 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt @@ -218,8 +218,11 @@ object MogoLogCatchManager : IMogoOnMessageListener, Handl */ private fun openLoggerLevel() { Logger.init(LogLevel.DEBUG) - MoGoAiCloudClient.getInstance().aiCloudClientConfig.isShowDebugLog = true - MoGoAiCloudClient.getInstance().aiCloudClientConfig.isShowNetDebugLog = true + val config = MoGoAiCloudClient.getInstance().aiCloudClientConfig + if(config != null){ + config.isShowDebugLog = true + config.isShowNetDebugLog = true + } CallerAutoPilotControlManager.setEnableLog(true) } @@ -228,8 +231,11 @@ object MogoLogCatchManager : IMogoOnMessageListener, Handl */ private fun closeLoggerLevel() { Logger.init(if (DebugConfig.isDebug()) LogLevel.DEBUG else LogLevel.OFF) - MoGoAiCloudClient.getInstance().aiCloudClientConfig.isShowDebugLog = false - MoGoAiCloudClient.getInstance().aiCloudClientConfig.isShowNetDebugLog = false + val config = MoGoAiCloudClient.getInstance().aiCloudClientConfig + if(config != null){ + config.isShowDebugLog = false + config.isShowNetDebugLog = false + } CallerAutoPilotControlManager.setEnableLog(false) } From 341026b78da802d0c2542dcab237a177551b61a6 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 6 Jul 2023 11:54:42 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=AB=99=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/distancemamager/TrajectoryAndDistanceManager.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt index ac917a8802..261238971b 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt @@ -145,6 +145,7 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{ * 设置或清理站点坐标 */ fun setStationPoint(startStationInfo: MogoLocation?,endStationInfo: MogoLocation?,lineId:Long?) { + d(M_OCHCOMMON+ TAG,"线路id:${lineId}设置站点：开始站点${startStationInfo}、结束站点：${endStationInfo}") if (startStationInfo == null || endStationInfo == null || lineId == -1L) { removeTempData() endCalculateDistanceLoop() From 32ec189dde79b70411664c58986e8330a9b737a5 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 6 Jul 2023 12:05:47 +0800 Subject: [PATCH 15/18] clear data --- .../manager/distancemamager/TrajectoryAndDistanceManager.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt index 261238971b..9b75f040cc 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt @@ -139,6 +139,7 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{ fun cleanRoutePoints() { mRoutePoints = null + mRoutePointsDistance = null } /** @@ -150,6 +151,9 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{ removeTempData() endCalculateDistanceLoop() cleanRoutePoints() + this.endStationInfo.stationPoint = null + this.startStationInfo.stationPoint = null + this.lineId = null }else{ if(isSameStation(this.startStationInfo.stationPoint,startStationInfo)&& isSameStation(this.endStationInfo.stationPoint,endStationInfo)){ From d293baaa67bdcc30e0d0ffe36638eeb1a49a27a0 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 6 Jul 2023 14:53:02 +0800 Subject: [PATCH 16/18] =?UTF-8?q?[bugfix]=20=E7=BC=93=E5=AD=98=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/bus/passenger/model/BusPassengerModel.kt | 11 ++++++----- .../distancemamager/TrajectoryAndDistanceManager.kt | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt index 188f5fc064..f90176c027 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.kt @@ -177,7 +177,7 @@ object BusPassengerModel{ routesResult = null mNextStationIndex = 0 } - cleanStation() + cleanStation("queryDriverSiteByCoordinate") if (mRouteLineInfoCallback != null) { mRouteLineInfoCallback!!.showNoTaskView() } @@ -206,7 +206,7 @@ object BusPassengerModel{ } if (code == 1003) { routesResult = null - cleanStation() + cleanStation("queryDriverSiteByCoordinate 1003") return } } @@ -238,7 +238,7 @@ object BusPassengerModel{ return } else if (station.drivingStatus == BusPassengerConst.STATION_STATUS_STOPPED && !station.isLeaving) { //到站 if (i == stations.size - 1) { - cleanStation() + cleanStation("updatePassengerRouteInfo最后一个站点") } suspendCalculate() @@ -309,7 +309,7 @@ object BusPassengerModel{ fun release() { releaseListeners() - cleanStation() + cleanStation("release") startOrStopOrderLoop(false) } @@ -600,7 +600,8 @@ object BusPassengerModel{ setStationPoint(startStation, endStation, lineId.toLong()) } - fun cleanStation() { + fun cleanStation(type:String) { + d(M_BUS_P + TAG, "清理站点 $type") setStationPoint(null, null, -1L) } diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt index 9b75f040cc..72a72bd85e 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/distancemamager/TrajectoryAndDistanceManager.kt @@ -84,7 +84,7 @@ object TrajectoryAndDistanceManager: IMoGoPlanningRottingListener{ if (it.size > 0) { d(M_OCHCOMMON + TAG, "收到轨迹:${it.size}第一个点${it[0]}最后一个点:${it.last()}") if(globalPathResp.lineId!=null) { - if (globalPathResp.lineId == lineId) { + if (globalPathResp.lineId == lineId && !mRoutePoints.isNullOrEmpty()) { d(M_OCHCOMMON + TAG, "重复轨迹") startCalculateDistanceLoop() return From c391171ac45122f213337692f037d30347d115a9 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 6 Jul 2023 16:28:23 +0800 Subject: [PATCH 17/18] =?UTF-8?q?[3.3.0]=20=E5=81=B6=E7=8E=B0=E8=87=AA?= =?UTF-8?q?=E9=A9=BE=E7=8A=B6=E6=80=81=E6=97=A0=E6=9B=B4=E6=96=B0=EF=BC=8C?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E4=BD=BF=E7=94=A8=E9=B9=B0=E7=9C=BC=E8=BF=94?= =?UTF-8?q?=E5=9B=9Estate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/bus/fragment/BaseBusTabFragment.java | 6 +- .../mogo/och/bus/presenter/BusPresenter.java | 59 +++---------------- 2 files changed, 11 insertions(+), 54 deletions(-) diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java index 7a584acfbb..e0775f569f 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java @@ -462,9 +462,9 @@ public abstract class BaseBusTabFragment * 展示【自动驾驶】按钮 */ public void showAutopilotBiz() { - getActivity().runOnUiThread(() -> { - ctvAutopilotStatus.setVisibility(View.VISIBLE); - }); +// getActivity().runOnUiThread(() -> { +// ctvAutopilotStatus.setVisibility(View.VISIBLE); +// }); } public SlidePanelView.OnSlidePanelMoveToEndListener getSlidePanelOnEndListener() { diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java index c823b12043..5198e4dbca 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java @@ -50,7 +50,6 @@ public class BusPresenter extends Presenter private static final String TAG = "BusPresenter"; - private volatile int currentAutopilotStatus = -1; private final List mStationList = new ArrayList<>(); private int mCurrentStation = 0; @@ -97,16 +96,12 @@ public class BusPresenter extends Presenter } public void autoDriveToNextStation() { - currentAutopilotStatus = -1; OrderModel.getInstance().autoDriveToNextStation(); -// isRestartAutopilot = false; } public void restartAutopilot() { if (OrderModel.getInstance().isGoingToNextStation()){ - currentAutopilotStatus = -1; OrderModel.getInstance().restartAutopilot(); -// isRestartAutopilot = true; } } @@ -167,49 +162,7 @@ public class BusPresenter extends Presenter public void onAutopilotStatusResponse(int state) { switch (state) { case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE: - if (currentAutopilotStatus != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) { - // 设置UI【自动驾驶】按钮是否展示 - runOnUIThread(() -> mView.onAutopilotEnableChange(true)); - } - if (FunctionBuildConfig.isDemoMode - && ( - (mCurrentStation >= 0 && mCurrentStation <= mStationList.size() - 1) - && OrderModel.getInstance().isGoingToNextStation() - ) - ) { - CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel=", "有美化功能"); - return; - } - if (currentAutopilotStatus != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) { - currentAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE; - } - // 改变UI自动驾驶状态 - runOnUIThread(() -> mView.onAutopilotStatusChanged(currentAutopilotStatus)); - break; - case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING: - if (currentAutopilotStatus != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { - currentAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING; - OrderModel.getInstance().triggerStartServiceEvent( - OrderModel.getInstance().isRestartAutopilot(), true); - } - // 改变UI自动驾驶状态 - runOnUIThread(() -> mView.onAutopilotStatusChanged(currentAutopilotStatus)); - break; case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE: - if (FunctionBuildConfig.isDemoMode - && ( - (mCurrentStation >= 0 && mCurrentStation <= mStationList.size() - 1) - && OrderModel.getInstance().isGoingToNextStation() - ) - ) { - CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel=", "有美化功能"); - return; - } - if (currentAutopilotStatus != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE) { - currentAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE; - } - runOnUIThread(() -> mView.onAutopilotStatusChanged(currentAutopilotStatus)); - break; case IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING: if (FunctionBuildConfig.isDemoMode && ( @@ -220,10 +173,14 @@ public class BusPresenter extends Presenter CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel=", "有美化功能"); return; } - if (currentAutopilotStatus != IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING) { - currentAutopilotStatus = IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING; - } - runOnUIThread(() -> mView.onAutopilotStatusChanged(currentAutopilotStatus)); + // 改变UI自动驾驶状态 + runOnUIThread(() -> mView.onAutopilotStatusChanged(state)); + break; + case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING: + OrderModel.getInstance().triggerStartServiceEvent( + OrderModel.getInstance().isRestartAutopilot(), true); + // 改变UI自动驾驶状态 + runOnUIThread(() -> mView.onAutopilotStatusChanged(state)); break; default: runOnUIThread(() -> mView.onAutopilotEnableChange(false)); From 47275eab1e70e3de5b01734d5d14ba404380ee07 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 6 Jul 2023 18:24:58 +0800 Subject: [PATCH 18/18] [3.3.0] change the logic of autopilot --- .../call/autopilot/CallerAutoPilotStatusListenerManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt index eab537cb60..2e2df750e4 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotStatusListenerManager.kt @@ -116,8 +116,8 @@ object CallerAutoPilotStatusListenerManager : CallerBase