From f6a1f6f2542ed1bac3da0400dd1eb7f7164937c6 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 10 Jun 2022 16:12:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B7=B3=E8=BF=87=E4=B9=98=E5=AE=A2?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=20=E6=A0=B9=E6=8D=AE=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=B5=81=E8=BD=AC=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/presenter/BaseTaxiPassengerPresenter.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 86f529c5fb..c50b08cfe7 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 @@ -169,7 +169,12 @@ public class BaseTaxiPassengerPresenter extends Presenter mView.showOrHideServingOrderFragment(true)); + runOnUIThread(() -> { + mView.showOrHideArrivedEndLayout(false,"",""); + mView.showOrHidePressengerCheckPager(false, "", + "", "", "", ""); + mView.showOrHideServingOrderFragment(true); + }); return; } // 50 到达终点 乘客可以评价 From 35985948d75ec3bf81ac49e32ffd88094668e4c7 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Fri, 10 Jun 2022 16:28:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[taxi=20-d=20280,=20taxi=20-p=20130]=201?= =?UTF-8?q?=E3=80=81taxi=20=E4=B9=98=E5=AE=A2=E5=B1=8F"=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=BC=80=E5=A7=8B"=E5=8A=9F=E8=83=BD=202=E3=80=81taxi=20?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=BC=80=E5=A7=8B=E6=9C=8D=E5=8A=A1=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presenter/BaseTaxiPassengerPresenter.java | 11 ++++++++ .../ui/TaxiPassengerBaseFragment.java | 24 ++++++++++++++++ .../taxi_p_start_autopilot_txt_btn_bg.xml | 11 ++++++++ .../main/res/layout/taxi_p_base_fragment.xml | 28 +++++++++++++++++++ .../src/main/res/values-sw320dp/dimens.xml | 4 +++ .../res/values-xhdpi-2560x1440/dimens.xml | 4 +++ .../src/main/res/values/colors.xml | 1 + .../src/main/res/values/dimens.xml | 4 +++ .../src/main/res/values/strings.xml | 2 ++ .../och/taxi/bean/OrderQueryRespBean.java | 8 ++++++ .../ui/TaxiBeingServerdOrdersFragment.java | 10 +++---- .../src/main/res/values/strings.xml | 5 ++-- 12 files changed, 104 insertions(+), 8 deletions(-) create mode 100644 OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_p_start_autopilot_txt_btn_bg.xml 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 86f529c5fb..bc3b67dfcf 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 @@ -149,6 +149,7 @@ public class BaseTaxiPassengerPresenter extends Presenter { mView.showOrHideServingOrderFragment(false); + mView.showOrHideStartAutopilotBtn(false); mView.showOrHidePressengerCheckPager(false, "", "", "", "", ""); mView.showOrHideArrivedEndLayout(false,"",""); @@ -165,6 +166,15 @@ public class BaseTaxiPassengerPresenter extends Presenter mView.showOrHideServingOrderFragment(true)); return; } + // 50 到达终点 乘客可以评价 if (TaxiPassengerOrderStatusEnum.ArriveAtEnd.getCode() == order.orderStatus){ TaxiPassengerModel.getInstance().recoverNaviInfo(); diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java index fc1e9c5c6f..f74e961db2 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java @@ -5,6 +5,7 @@ import android.os.Looper; import android.view.View; import android.widget.FrameLayout; import android.widget.ImageView; +import android.widget.TextView; import androidx.annotation.NonNull; import androidx.fragment.app.FragmentTransaction; @@ -16,12 +17,14 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; import com.mogo.eagle.core.function.call.map.CallerSmpManager; import com.mogo.eagle.core.utilcode.util.OverlayViewUtils; +import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.map.MogoMapUIController; import com.mogo.map.MogoMarkerManager; import com.mogo.map.listener.IMogoMapListener; import com.mogo.map.uicontroller.VisualAngleMode; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.constants.DataTypes; +import com.mogo.och.common.module.wigets.OCHBorderShadowLayout; import com.mogo.och.taxi.passenger.R; import com.mogo.och.taxi.passenger.presenter.BaseTaxiPassengerPresenter; @@ -45,6 +48,8 @@ public class TaxiPassengerBaseFragment extends MvpFragment mArrivedEndView; @@ -72,6 +77,9 @@ public class TaxiPassengerBaseFragment extends MvpFragment { + ToastUtils.showShort("等待接口。。。。"); + }); } private void initArrivedView(){ @@ -264,6 +276,18 @@ public class TaxiPassengerBaseFragment extends MvpFragment + + + + + diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml index 0cfb6db266..cca6de087e 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -130,4 +130,32 @@ app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml index c9efef01f8..e7b95cf0a7 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/values-sw320dp/dimens.xml @@ -61,4 +61,8 @@ 50px 34px 28px + + 60px + 560px + 158px \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml index 6af3cfedd4..48ed2067f1 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -125,4 +125,8 @@ 34px 28px + 60px + 560px + 158px + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml index 343e9577d5..6e8c0e95ad 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml @@ -49,6 +49,7 @@ #B630347D #151937 + #80141D45 \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml index 91e49fe4e1..50b5ce589b 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/dimens.xml @@ -119,4 +119,8 @@ 50px 34px 28px + + 60px + 560px + 158px \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/strings.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/strings.xml index 09eea7fcc8..b5043ad377 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/values/strings.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/strings.xml @@ -31,4 +31,6 @@ 请输出手机号后4位: 小蘑菇 删除 + + 点击开始 \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryRespBean.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryRespBean.java index 2d1d588b4d..8a46cd8116 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryRespBean.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderQueryRespBean.java @@ -50,6 +50,14 @@ public class OrderQueryRespBean extends BaseData { //订单多少乘客 public String passengerNum; + //线路轨迹相关字段 + public long lineId; //路线id，默认-1 + public String trajUrl; //轨迹文件下载的cos url，默认“” + public String trajMd5; //轨迹文件md5，默认“” + public String stopUrl; //打点文件下载的cos url，默认“” + public String stopMd5; //轨迹文件md5，默认“” + public long timestamp; //上传轨迹完成时间戳ms：用于MEC本地手动导入轨迹验证时不会被云端轨迹覆盖 + public String vehicleModel; //[optional] 车型号（如红旗H9），默认“”，暂不加入校验逻辑、用于人工排查问题 // !!!接口中暂无此字段，仅用于本地实现逻辑使用：起始站目的站距离km public double travelDistance; diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java index cb44bb6d29..b79d0f57f6 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java @@ -406,13 +406,13 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement NaviToDestinationModel.getInstance(getContext()).destroyAmaNavi(); } - private void startOrEndService(String step) { - if (step.equals(getResources().getString(R.string.module_och_taxi_order_server_end))) {//点击了完成服务，结束订单并更新订单信息 -// isHaveBeingOrder(false); + private void startOrEndService() { + if (mCurrentOrder == null) return; + if (TaxiOrderStatusEnum.ArriveAtEnd.getCode() == mCurrentOrder.orderStatus) {//点击了完成服务，结束订单并更新订单信息 mTaxiFragment.completeOrderService(TaxiOrderStatusEnum.JourneyCompleted); showNotice(getResources().getString(R.string.module_och_taxi_order_server_completed_tip)); return; - } else if (step.equals(getResources().getString(R.string.module_och_taxi_order_server_start))) {//点击服务，开启自动驾驶 + } else if (TaxiOrderStatusEnum.UserArriveAtStart.getCode() == mCurrentOrder.orderStatus) {//点击服务，开启自动驾驶 mTaxiFragment.startAutoPilot(); showNotice(getResources().getString(R.string.module_och_taxi_order_server_start_auto_tip)); } @@ -524,7 +524,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement case "开始服务": case "服务完成": CallerLogger.INSTANCE.d(M_TAXI + TAG, mOrderServerStatus.getText().toString()); - startOrEndService(mOrderServerStatus.getText().toString().trim()); + startOrEndService(); break; } } else if (v.getId() == R.id.module_och_taxi_order_cancel_iv) { diff --git a/OCH/mogo-och-taxi/src/main/res/values/strings.xml b/OCH/mogo-och-taxi/src/main/res/values/strings.xml index 77bc52cd34..1db8ad4458 100644 --- a/OCH/mogo-och-taxi/src/main/res/values/strings.xml +++ b/OCH/mogo-och-taxi/src/main/res/values/strings.xml @@ -22,10 +22,9 @@ 等待乘客验证 服务完成 车辆已停稳，请携带好随身物品，下车请注意安全 - 无人驾驶已启动，请您系好安全带 + 您好，本次自动驾驶体验里程共%1$s公里，预计需要%2$d分钟，我们即将出发。出于安全考虑，建议您尽量不要与安全员交谈，后排落座，并系好安全带 即将到达目的地，请拿好随身物品，准备下车 - 已到达目的地，感谢乘坐\'蘑菇车联\'无人驾驶车，期待下次相遇 - + 您好，我们已到达目的地，本次体验结束。车辆停稳，请带好随身物品，谨防遗漏。感谢您的乘坐 自动驾驶状态为0不可用 网络异常，请稍后重试 From ca69a6ead7f7e3445f4dc00f2ff0b5caa235f8d9 Mon Sep 17 00:00:00 2001 From: renwj Date: Fri, 10 Jun 2022 19:16:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[V2X]V2X=E6=96=B0=E5=A2=9E=E9=81=93?= =?UTF-8?q?=E8=B7=AF=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/v2x/events/V2XEventManager.kt | 24 +++++++++++++++---- .../v2x/events/alarm/V2XAlarmServer.java | 7 +++--- gradle.properties | 20 ++++++++-------- 3 files changed, 34 insertions(+), 17 deletions(-) diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt index db691bed52..2b13a45f9e 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt @@ -64,10 +64,7 @@ import com.mogo.service.statusmanager.StatusDescriptor.SEEK_HELPING import com.mogo.v2x.V2XManager import com.mogo.v2x.callback.IV2XCallback import com.mogo.v2x.config.V2XConfig -import com.mogo.v2x.data.V2XAdvanceWarning -import com.mogo.v2x.data.V2XMarkerCardResult -import com.mogo.v2x.data.V2XOptimalRoute -import com.mogo.v2x.data.V2XWarningTarget +import com.mogo.v2x.data.* import com.mogo.v2x.event.V2XEvent import com.shuyu.gsyvideoplayer.GSYVideoManager import com.shuyu.gsyvideoplayer.cache.CacheFactory @@ -78,6 +75,7 @@ import com.shuyu.gsyvideoplayer.player.PlayerFactory import com.shuyu.gsyvideoplayer.utils.GSYVideoType import kotlinx.coroutines.* import kotlinx.coroutines.android.asCoroutineDispatcher +import roadwork.Road.RW_PB import tv.danmaku.ijk.media.player.IjkMediaPlayer import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicBoolean @@ -452,9 +450,27 @@ object V2XEventManager : IMoGoMapLocationListener, IMoGoTokenCallback, IV2XCallb is V2XEvent.Warning -> { handleWarningTargetEvent(event.data) } + is V2XEvent.RoadAI -> { + handleRoadMarkerEvent(event.data.toRoadMarker) + } } } + private val RW_PB.toRoadMarker: V2XMarkerCardResult + get() = V2XMarkerCardResult().also { l1 -> + l1.exploreWay = ArrayList().also { l2 -> + l2.add(V2XMarkerExploreWay().also { l3 -> + l3.poiType = this.roadwork?.poiType?.toString() + l3.generateTime = this.roadwork?.detectTime ?: 0L + l3.location = V2XMarkerLocation().also { l4 -> + l4.lat = this.roadwork?.center?.point?.lat ?: 0.0 + l4.lon = this.roadwork?.center?.point?.lon ?: 0.0 + l4.angle = -1.0 + } + }) + } + } + private fun handleWarningTargetEvent(data: V2XWarningTarget) { val v2xMessageEntity = V2XMessageEntity() v2xMessageEntity.type = V2XTypeEnum.ALERT_THE_FRONT_WEAKNESS diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/alarm/V2XAlarmServer.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/alarm/V2XAlarmServer.java index bd90c559af..df4fac4f22 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/alarm/V2XAlarmServer.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/alarm/V2XAlarmServer.java @@ -48,7 +48,8 @@ public class V2XAlarmServer { // 因为集合是按照距离排序后的所以这里检索出来第一个就发出警告 for (V2XRoadEventEntity v2XRoadEventEntity : v2XRoadEventEntityList) { // 0、道路事件必须有朝向，角度>=0; - if (v2XRoadEventEntity.getLocation().getAngle() >= 0) { + boolean ignoreAngle = v2XRoadEventEntity.getLocation().getAngle() < 0; + if (v2XRoadEventEntity.getLocation().getAngle() >= 0 || ignoreAngle) { // 计算车辆距离指定气泡的距离 MarkerLocation eventLocation = v2XRoadEventEntity.getLocation(); // 1、判断是否到达了触发距离,20 ~ 500, @@ -63,7 +64,7 @@ public class V2XAlarmServer { double carBearing = currentLocation.getBearing(); double eventBearing = eventLocation.getAngle(); double diffAngle = DrivingDirectionUtils.getAngleDiff(carBearing, eventBearing); - if (diffAngle < 20) { + if (ignoreAngle || diffAngle < 20) { // 3、计算当前车辆行驶方向与事件位置之间夹角《20度，保证道路事件在车辆前方 double eventAngle = DrivingDirectionUtils.getDegreeOfCar2Poi( currentLocation.getLongitude(), @@ -72,7 +73,7 @@ public class V2XAlarmServer { eventLocation.getLat(), (int) currentLocation.getBearing() ); - if (0 <= eventAngle && eventAngle <= 20) { + if (ignoreAngle || 0 <= eventAngle && eventAngle <= 20) { // 判断是否已经提示过道路事件 boolean isAlreadyAlert = false; String lastTime = mAlertRoadEventList.get(v2XRoadEventEntity); diff --git a/gradle.properties b/gradle.properties index 6e9a3f03c0..023b0f0e9f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -63,23 +63,23 @@ SERVICE_CHAIN_VERSION=1.1.0 LOGLIB_VERSION=1.3.0 ######## MogoAiCloudSDK Version ######## # 网络请求LOGLIB_VERSION -MOGO_NETWORK_VERSION=1.3.59 +MOGO_NETWORK_VERSION=1.4.1 # 鉴权 -MOGO_PASSPORT_VERSION=1.3.59 +MOGO_PASSPORT_VERSION=1.4.1 # 常链接 -MOGO_SOCKET_VERSION=1.3.59 +MOGO_SOCKET_VERSION=1.4.1 # 数据采集 -MOGO_REALTIME_VERSION=1.3.59 +MOGO_REALTIME_VERSION=1.4.1 # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.3.59 +MOGO_TANLU_VERSION=1.4.1 # 直播推流 -MOGO_LIVE_VERSION=1.3.59 +MOGO_LIVE_VERSION=1.4.1 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.3.59 +MOGO_TRAFFICLIVE_VERSION=1.4.1 # 定位服务 -MOGO_LOCATION_VERSION=1.3.59 +MOGO_LOCATION_VERSION=1.4.1 # 远程通讯模块 -MOGO_TELEMATIC_VERSION=1.3.59 +MOGO_TELEMATIC_VERSION=1.4.1 ######## MogoAiCloudSDK Version ######## # 自研地图 MAP_SDK_VERSION=2.2.0.7 @@ -155,7 +155,7 @@ MOGO_OCH_TAXI_VERSION=2.0.66 # mogoAiCloud sdk services MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.16.10 # v2x-sdk -MOGO_V2X_SDK_VERSION=1.3.59 +MOGO_V2X_SDK_VERSION=1.4.1 ################# 旧版本架构模块版本 #################