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 44ef1d753a..2bfa74a594 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 @@ -966,7 +966,7 @@ public class TaxiModel { * 测试开始服务 */ public void setOnTheWayToEndStation() { - if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning(); +// if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning(); if (mCurrentOCHOrder == null || mCurrentOCHOrder.orderStatus != TaxiOrderStatusEnum.ArriveAtStart.getCode()) { TipToast.shortTip("订单状态不匹配该操作！"); 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 fedc7859b8..a32d01c771 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 @@ -190,8 +190,59 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement mTitleTV2.setText("送乘客至"); mStationTv2.setText(order.endSiteAddr); - } else if (TaxiOrderStatusEnum.ArriveAtStart.getCode() == order.orderStatus) { - CallerLogger.INSTANCE.d(M_TAXI + TAG, "已经达到起点"); + } else if (TaxiOrderStatusEnum.UserArriveAtStart.getCode() == order.orderStatus + || TaxiOrderStatusEnum.ArriveAtStart.getCode() == order.orderStatus){ + + mContentModule2.setVisibility(View.GONE); + mContentModule3.setVisibility(View.VISIBLE); + mArrivedStartTimeTv32.setVisibility(View.VISIBLE); + mContentModule32.setVisibility(View.VISIBLE); + mContentModule31.setVisibility(View.GONE); + mOrderOtherContent3.setVisibility(View.GONE); + + Calendar currentCale = DateTimeUtils.getCurrentDateTime(); + String currentHM = DateTimeUtil.formatCalendarToString(currentCale, DateTimeUtil.TAXI_HH_mm); + String currentDay = DateTimeUtil.formatCalendarToString(currentCale, DateTimeUtil.TAXI_yyyy_MM_dd); + String strHtml11 = "已于
" + + "" + currentHM + "" + + "" + " " + "到达乘客上车地点"; + mArrivedStartTimeTv32.setLineHeight(60); + mArrivedStartTimeTv32.setText(Html.fromHtml(strHtml11)); + + mArrivedStationTitleTv32.setText("送乘客至"); + mStationTv32.setText(order.endSiteAddr); + currentCale.add(Calendar.MINUTE, 10); + String strHtml13 = ""; + if (currentDay.equals(DateTimeUtil.formatCalendarToString(currentCale, DateTimeUtil.TAXI_yyyy_MM_dd))) { + strHtml13 = "免费等待至 " + + "" + DateTimeUtil.formatCalendarToString(currentCale, DateTimeUtil.TAXI_HH_mm) + ""; + + } else { + strHtml13 = "免费等待至" + + "" + DateTimeUtil.formatCalendarToString(currentCale, DateTimeUtil.TAXI_MM_dd_HH_mm) + ""; + } + mDistanceAndTime3.setText(Html.fromHtml(strHtml13)); + + if (TaxiOrderStatusEnum.ArriveAtStart.getCode() == order.orderStatus){ + CallerLogger.INSTANCE.d(M_TAXI + TAG, "车辆已经达到起点"); + mOrderStatus.setText(R.string.module_och_taxi_waiting); + mOrderServerStatus.setText(R.string.module_och_taxi_order_server_start_wait_check); + mOrderServerStatus.setTextColor(Color.parseColor("#4DFFFFFF")); + GradientDrawable background = (GradientDrawable) mOrderServerStatus.getBackground();//GradientDrawable是Drawable的子类 + background.setColor(Color.parseColor("#4D1D5EF3")); + mOrderServerStatus.setClickable(false); + }else if (TaxiOrderStatusEnum.UserArriveAtStart.getCode() == order.orderStatus ){ + CallerLogger.INSTANCE.d(M_TAXI + TAG, "乘客已上车验证成功"); + mOrderStatus.setText(R.string.module_och_taxi_user_check_success); + mOrderServerStatus.setText(R.string.module_och_taxi_order_server_start); + GradientDrawable background = (GradientDrawable) mOrderServerStatus.getBackground();//GradientDrawable是Drawable的子类 + background.setColor(Color.parseColor("#FF1D5EF3")); + mOrderServerStatus.setTextColor(Color.parseColor("#FFFFFF")); + mOrderServerStatus.setClickable(true); + } + + }else if (TaxiOrderStatusEnum.ArriveAtStart.getCode() == order.orderStatus) { + mContentModule2.setVisibility(View.GONE); mContentModule3.setVisibility(View.VISIBLE); mArrivedStartTimeTv32.setVisibility(View.VISIBLE); @@ -397,9 +448,14 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement setOrRemoveMapMaker(false, TaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint,R.raw.end_marker); break; case ArriveAtStart: + case UserArriveAtStart: mTtsLessThan200Tip = 0; mOrderCancel.setVisibility(View.VISIBLE); - showNotice(mActivity.getString(R.string.module_och_taxi_order_status_ph_text)); + if (TaxiOrderStatusEnum.UserArriveAtStart.getCode() == ochStatus.getCode()){ + showNotice(mActivity.getString(R.string.module_och_taxi_order_status_ph_text_check_success)); + }else { + showNotice(mActivity.getString(R.string.module_och_taxi_order_status_ph_text)); + } showOrHideNavi(false); setOrRemoveMapMaker(true, TaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint,R.raw.star_marker); setOrRemoveMapMaker(true, TaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint,R.raw.end_marker); diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java index 0cc096d0d9..ebddcde365 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java @@ -349,9 +349,11 @@ public class TaxiFragment extends BaseTaxiTabFragment { showNotice("自动驾驶已启动，请系好安全带"); -// TaxiModel.getInstance().setOnTheWayToEndStation(); -//// testRouteInfoUpload(); - restartAutopilot(); + if (!isStarting){ + mPresenter.startAutoPilot(); + startOrStopLoadingAnim(true); + } + TaxiModel.getInstance().setOnTheWayToEndStation(); }); } 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 2d0f07a54c..4f499f8f3a 100644 --- a/OCH/mogo-och-taxi/src/main/res/values/strings.xml +++ b/OCH/mogo-och-taxi/src/main/res/values/strings.xml @@ -3,12 +3,14 @@ 确认上车，行程开始 到达站点，乘客已下车 已到达上车站点，等待乘客上车 + 乘客验证成功，请开始行程 预计里程 3.2 km 请携带好随身物品，注意侧后\n方来车，感谢体验蘑菇智行自\n动驾驶车！ 即将到达目的地，请您携带好随身物品，安全下车。 送乘客至目的地 等待乘客上车 + 乘客已上车 前往乘客上车地点 已到达乘客下车点 订单已完成 @@ -17,6 +19,7 @@ 出现异常情况时,可选择原因无责取消订单： 确认 开始服务 + 等待乘客验证 服务完成 车辆已停稳，请携带好随身物品，下车请注意安全 无人驾驶已启动，请您系好安全带 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CircularProgressView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CircularProgressView.kt index 59f51b97d1..93a1707834 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CircularProgressView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/CircularProgressView.kt @@ -2,6 +2,7 @@ package com.mogo.eagle.core.function.hmi.ui.widget import android.animation.ValueAnimator import android.content.Context +import android.content.res.Resources import android.content.res.TypedArray import android.graphics.* import android.util.AttributeSet @@ -87,8 +88,6 @@ class CircularProgressView @JvmOverloads constructor( Log.d(TAG, mRectL.toString() + "," + mRectT.toString()) Log.d(TAG, mRectF.toString() + "," + "width:" + measuredWidth.toString() + "," + "PaddingLeft:" + getPaddingLeft().toString()) - - } override fun onDraw(canvas: Canvas?) { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java index b241f9e9cf..f11ab82e66 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java @@ -46,6 +46,7 @@ public class SteeringWheelView extends ConstraintLayout { private TextView steeringTVR; private TapPositionView tapPositionView; private CircularProgressView steeringCircularV; + private CircularProgressView steeringCircularVAlpha; private RotateAnimation rotateAnimation; private float fromDegrees = 0;//方向盘旋转起始位置 @@ -77,6 +78,13 @@ public class SteeringWheelView extends ConstraintLayout { steeringCircularV.setBackColor(R.color.hmi_light_blue_00); steeringCircularV.setProgColor(R.color.hmi_light_blue, R.color.hmi_dark_blue); steeringCircularV.setProgress((int) (180 * 100) / 360, 1000); + if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)){ + steeringCircularVAlpha = findViewById(R.id.steering_circular_alpha); + steeringCircularVAlpha.setAlpha(0.4f); + steeringCircularVAlpha.setBackColor(R.color.hmi_light_blue_00); + steeringCircularVAlpha.setProgColor(R.color.hmi_light_blue_alpha); + steeringCircularVAlpha.setProgress((int) (180 * 100) / 360, 1000); + } } public SteeringWheelView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml index bf88f0d590..496870eddc 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml @@ -73,10 +73,23 @@ app:progWidth="8px" app:progress="0" /> + + #45D3FF #1B5BFF #0045D3FF + #666C79C4 \ No newline at end of file