From 39a308dfbc1aad425210e55520cb8f55afff8ee4 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 17 May 2023 17:07:20 +0800 Subject: [PATCH] =?UTF-8?q?[3.2.0]=201=E3=80=81UI=E8=B5=B0=E6=9F=A5?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/model/BusPassengerModel.java | 7 ++- .../ui/BusPassengerRouteFragment.java | 13 +++-- .../passenger/ui/widget/BusPTurnLightView.kt | 16 ++++++ .../drawable-nodpi/bus_p_youzhuan_open.png | Bin 0 -> 4772 bytes .../drawable-nodpi/bus_p_youzhuan_un_open.png | Bin 0 -> 844 bytes .../drawable-nodpi/bus_p_zuozhuan_open.png | Bin 0 -> 4788 bytes .../drawable-nodpi/bus_p_zuozhuan_un_open.png | Bin 0 -> 855 bytes .../brakelight_background_daytime.xml | 5 ++ .../res/layout/bus_p_route_fragment.xml | 2 +- .../layout/view_turn_light_status_daytime.xml | 53 ++++++++++++++++++ .../passenger/model/BusPassengerModel.java | 7 ++- .../ui/BusPassengerRouteFragment.java | 13 +++-- .../passenger/ui/widget/BusPTurnLightView.kt | 16 ++++++ .../drawable-nodpi/bus_p_youzhuan_open.png | Bin 0 -> 4772 bytes .../drawable-nodpi/bus_p_youzhuan_un_open.png | Bin 0 -> 844 bytes .../drawable-nodpi/bus_p_zuozhuan_open.png | Bin 0 -> 4788 bytes .../drawable-nodpi/bus_p_zuozhuan_un_open.png | Bin 0 -> 855 bytes .../brakelight_background_daytime.xml | 5 ++ .../res/layout/bus_p_route_fragment.xml | 2 +- .../layout/view_turn_light_status_daytime.xml | 53 ++++++++++++++++++ 20 files changed, 172 insertions(+), 20 deletions(-) create mode 100644 OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt create mode 100644 OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_open.png create mode 100644 OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_un_open.png create mode 100644 OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_open.png create mode 100644 OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_un_open.png create mode 100644 OCH/mogo-och-bus-passenger/src/jinlvvan/res/drawable/brakelight_background_daytime.xml create mode 100644 OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/view_turn_light_status_daytime.xml create mode 100644 OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/widget/BusPTurnLightView.kt create mode 100644 OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_open.png create mode 100644 OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_youzhuan_un_open.png create mode 100644 OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_open.png create mode 100644 OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable-nodpi/bus_p_zuozhuan_un_open.png create mode 100644 OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/brakelight_background_daytime.xml create mode 100644 OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/view_turn_light_status_daytime.xml 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 0000000000000000000000000000000000000000..fb728e515eb04820f505575e36ab7aa1a046fe70 GIT binary patch literal 4772 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 U|F=inAy7*8boFyt=akR{0HSSSVgLXD literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5762da60534f388471657b1e3b45e346c043d405 GIT binary patch literal 4788 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 + + + + \ 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 0000000000000000000000000000000000000000..fb728e515eb04820f505575e36ab7aa1a046fe70 GIT binary patch literal 4772 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 U|F=inAy7*8boFyt=akR{0HSSSVgLXD literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5762da60534f388471657b1e3b45e346c043d405 GIT binary patch literal 4788 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 + + + + \ 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