diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java index 8158d0d0ec..9e2bd8577a 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java @@ -464,21 +464,22 @@ public class BusPassengerModel { int state = autopilotStatusInfo.getState(); if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { //2022.7.20 自动驾驶更换成带档位的 -// if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning(); + if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning(); } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) { if(state != mPreAutoStatus){ mTwoStationsRouts.clear(); } -// if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotEnable(); + if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotEnable(); } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE) { if(state != mPreAutoStatus){ mTwoStationsRouts.clear(); } -// if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotDisable(); + if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotDisable(); }else if (state == IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING){ if(state != mPreAutoStatus){ mTwoStationsRouts.clear(); } + if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning(); } mPreAutoStatus = state; } diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java index baef2025d1..dd5398ace9 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java @@ -439,9 +439,10 @@ public class BusPassengerRouteFragment extends dis = NumberFormatUtil.formatLong((double)meters / 1000); } } - String strHtml2 = "距离 " + "" + dis + "" + " "+disUnit+"" - + "   剩余 " + "" + (int)Math.ceil((double)timeInSecond/ 60f) + "" + " 分钟"; - mCurrentArriveTip.setText(Html.fromHtml(strHtml2)); +// String strHtml2 = "距离 " + "" + dis + "" + " "+disUnit+"" +// + "   剩余 " + "" + (int)Math.ceil((double)timeInSecond/ 60f) + "" + " 分钟"; + String str = dis+disUnit+" | "+(int)Math.ceil((double)timeInSecond/ 60f)+"分钟"; + mCurrentArriveTip.setText(str); } public void onAutopilotStatusChanged(int status) { @@ -456,11 +457,11 @@ public class BusPassengerRouteFragment extends public void AutopilotStatusChanged(int status) { if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING == status) { - mAutopilotIv.setImageResource(R.drawable.bus_p_auto_nor); + mAutopilotIv.setImageResource(R.drawable.auto_open); } else if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE == status){ - mAutopilotIv.setImageResource(R.drawable.bus_p_un_auto_nor); + mAutopilotIv.setImageResource(R.drawable.auto_close); } else { - mAutopilotIv.setImageResource(R.drawable.bus_p_un_auto_nor); + mAutopilotIv.setImageResource(R.drawable.auto_close); } } } diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt new file mode 100644 index 0000000000..a822623d22 --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt @@ -0,0 +1,16 @@ +package com.mogo.och.bus.passenger.ui.widget + +import android.content.Context +import android.util.AttributeSet +import com.mogo.eagle.core.function.hmi.ui.vehicle.TurnLightViewStatus + +/** + * @author: wangmingjun + * @date: 2023/2/13 + */ +class BusPTurnLightView @JvmOverloads constructor( + context: Context, attrs: AttributeSet? = null +) : TurnLightViewStatus(context, attrs) { + + +} \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_open.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_open.png new file mode 100644 index 0000000000..fb728e515e Binary files /dev/null and b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_open.png differ diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_un_open.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_un_open.png new file mode 100644 index 0000000000..4de98ca6dd Binary files /dev/null and b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_un_open.png differ diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_open.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_open.png new file mode 100644 index 0000000000..5762da6053 Binary files /dev/null and b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_open.png differ diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_un_open.png b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_un_open.png new file mode 100644 index 0000000000..ae29f98f34 Binary files /dev/null and b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_un_open.png differ diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/brakelight_background_daytime.xml b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/brakelight_background_daytime.xml new file mode 100644 index 0000000000..6409baca2f --- /dev/null +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/brakelight_background_daytime.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file 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 a3259e0e51..197c0bc4fb 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 @@ -119,7 +119,7 @@ app:layout_constraintLeft_toLeftOf="@+id/bus_p_speed_tv" app:layout_constraintTop_toBottomOf="@+id/bus_p_speed_tv" /> - + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java index 31fda8ee1e..5ca3230d04 100644 --- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java +++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java @@ -473,21 +473,22 @@ public class BusPassengerModel { int state = autopilotStatusInfo.getState(); if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { //2022.7.20 自动驾驶更换成带档位的 -// if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning(); + if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning(); } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) { if(state != mPreAutoStatus){ mTwoStationsRouts.clear(); } -// if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotEnable(); + if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotEnable(); } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE) { if(state != mPreAutoStatus){ mTwoStationsRouts.clear(); } -// if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotDisable(); + if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotDisable(); }else if (state == IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING){ if(state != mPreAutoStatus){ mTwoStationsRouts.clear(); } + if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning(); } mPreAutoStatus = state; } diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java index b44de31ac4..00834c42d4 100644 --- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java +++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java @@ -390,9 +390,10 @@ public class BusPassengerRouteFragment extends dis = NumberFormatUtil.formatLong((double)meters / 1000); } } - String strHtml2 = "距离 " + "" + dis + "" + " "+disUnit+"" - + "   剩余 " + "" + (int)Math.ceil((double)timeInSecond/ 60f) + "" + " 分钟"; - mCurrentArriveTip.setText(Html.fromHtml(strHtml2)); +// String strHtml2 = "距离 " + "" + dis + "" + " "+disUnit+"" +// + "   剩余 " + "" + (int)Math.ceil((double)timeInSecond/ 60f) + "" + " 分钟"; + String str = dis+disUnit+" | "+(int)Math.ceil((double)timeInSecond/ 60f)+"分钟"; + mCurrentArriveTip.setText(Html.fromHtml(str)); } public void onAutopilotStatusChanged(int status) { @@ -407,11 +408,11 @@ public class BusPassengerRouteFragment extends public void AutopilotStatusChanged(int status) { if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING == status) { - mAutopilotIv.setImageResource(R.drawable.bus_p_auto_nor); + mAutopilotIv.setImageResource(R.drawable.auto_open); } else if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE == status){ - mAutopilotIv.setImageResource(R.drawable.bus_p_un_auto_nor); + mAutopilotIv.setImageResource(R.drawable.auto_close); } else { - mAutopilotIv.setImageResource(R.drawable.bus_p_un_auto_nor); + mAutopilotIv.setImageResource(R.drawable.auto_close); } } } diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt new file mode 100644 index 0000000000..a822623d22 --- /dev/null +++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt @@ -0,0 +1,16 @@ +package com.mogo.och.bus.passenger.ui.widget + +import android.content.Context +import android.util.AttributeSet +import com.mogo.eagle.core.function.hmi.ui.vehicle.TurnLightViewStatus + +/** + * @author: wangmingjun + * @date: 2023/2/13 + */ +class BusPTurnLightView @JvmOverloads constructor( + context: Context, attrs: AttributeSet? = null +) : TurnLightViewStatus(context, attrs) { + + +} \ No newline at end of file diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_open.png b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_open.png new file mode 100644 index 0000000000..fb728e515e Binary files /dev/null and b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_open.png differ diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_un_open.png b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_un_open.png new file mode 100644 index 0000000000..4de98ca6dd Binary files /dev/null and b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_un_open.png differ diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_open.png b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_open.png new file mode 100644 index 0000000000..5762da6053 Binary files /dev/null and b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_open.png differ diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_un_open.png b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_un_open.png new file mode 100644 index 0000000000..ae29f98f34 Binary files /dev/null and b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_un_open.png differ diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/brakelight_background_daytime.xml b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/brakelight_background_daytime.xml new file mode 100644 index 0000000000..6409baca2f --- /dev/null +++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/brakelight_background_daytime.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml index d4070a3de1..ce9bcdbc7e 100644 --- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml +++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml @@ -110,7 +110,7 @@ app:layout_constraintTop_toBottomOf="@+id/bus_p_speed_tv" /> - + + + + + + + + + + + + + \ No newline at end of file