From 1187bc7c5a2a8cd7384b38d9195543f58b2239ee Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 27 Dec 2023 19:17:54 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.6]=20[taxi-p]=20[=E5=8A=A8=E7=94=BB?= =?UTF-8?q?=E8=B0=83=E6=95=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChekAndStartAutopilotView.kt | 7 - .../startautopilot/StartAutopilotView.kt | 19 +- .../startautopilot/StartAutopilotViewModel.kt | 3 +- .../taxi_p_front_left_door.9.png | Bin 0 -> 2873 bytes .../taxi_p_front_right_door.9.png | Bin 0 -> 2344 bytes .../taxi_p_rear_left_door.9.png | Bin 0 -> 2995 bytes .../taxi_p_rear_right_door.9.png | Bin 0 -> 2697 bytes .../taxi_p_enable_start_autopilot.xml | 10 + .../taxi_p_unable_start_autopilot.xml | 12 + .../res/layout/taxi_p_arrived_end_panel.xml | 2 +- .../layout/taxi_p_start_autopilot_view.xml | 228 ------------------ .../layout/taxt_p_start_autopilot_view.xml | 22 +- .../passenger/src/main/res/values/colors.xml | 4 +- .../ChekAndStartAutopilotView.kt | 7 - .../startautopilot/StartAutopilotView.kt | 21 +- .../startautopilot/StartAutopilotViewModel.kt | 3 +- .../taxi_u_p_front_left_door.9.png | Bin 0 -> 2873 bytes .../taxi_u_p_front_right_door.9.png | Bin 0 -> 2344 bytes .../taxi_u_p_rear_left_door.9.png | Bin 0 -> 2995 bytes .../taxi_u_p_rear_right_door.9.png | Bin 0 -> 2697 bytes ...png => taxi_u_p_startautopilt_car_top.png} | Bin .../taxi_u_p_enable_start_autopilot.xml | 10 + .../taxi_u_p_unable_start_autopilot.xml | 12 + .../res/layout/taxt_u_p_arrived_end_panel.xml | 2 +- .../layout/taxt_u_p_start_autopilot_view.xml | 24 +- .../src/main/res/values/colors.xml | 4 +- .../src/main/res/values/dimens.xml | 1 + 27 files changed, 103 insertions(+), 288 deletions(-) create mode 100644 OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_front_left_door.9.png create mode 100644 OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_front_right_door.9.png create mode 100644 OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_rear_left_door.9.png create mode 100644 OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_rear_right_door.9.png create mode 100644 OCH/taxi/passenger/src/main/res/drawable/taxi_p_enable_start_autopilot.xml create mode 100644 OCH/taxi/passenger/src/main/res/drawable/taxi_p_unable_start_autopilot.xml delete mode 100644 OCH/taxi/passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml create mode 100644 OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_u_p_front_left_door.9.png create mode 100644 OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_u_p_front_right_door.9.png create mode 100644 OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_u_p_rear_left_door.9.png create mode 100644 OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_u_p_rear_right_door.9.png rename OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/{taxi_p_startautopilt_car_top.png => taxi_u_p_startautopilt_car_top.png} (100%) create mode 100644 OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_u_p_enable_start_autopilot.xml create mode 100644 OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_u_p_unable_start_autopilot.xml diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt index 82f4197228..0c18801782 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt @@ -110,13 +110,6 @@ class ChekAndStartAutopilotView : WindowRelativeLayout, startAutopilotClose.visibility = View.GONE } - fun startAnimation2StartAutopilit() { - checkPhoneNumber.visibility = View.GONE - startAutopilotView.visibility = View.VISIBLE - startAutopilotClose.visibility = View.VISIBLE - aniCheck2StartAutopilotView?.start() - } - fun aniCheckAndStartAutopilot(show:Boolean,status:Int){ val alphaStart: Float val alphaEnd: Float diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotView.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotView.kt index 95a9e97826..66d534ded9 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotView.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotView.kt @@ -49,6 +49,7 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu private var taxiPStartAutopilot: FrameAnimatorContainer? = null private var taxiPStartAutopilotCar: FrameAnimatorContainer? = null + private lateinit var viewModel: StartAutopilotViewModel init { @@ -132,9 +133,11 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu override fun onVisibilityAggregated(isVisible: Boolean) { super.onVisibilityAggregated(isVisible) if(isVisible){ - taxi_p_start_autopilot.background = null + taxi_p_start_autopilot.background = + ContextCompat.getDrawable(context, R.drawable.taxi_p_enable_start_autopilot) taxi_p_start_autopilot.text = resources.getString(R.string.taxi_p_start_autopilot_txt) taxi_p_autopilot_starting.setImageResource(R.drawable.light_00018) + viewModel.setOrderInfo() }else{ unableStartAutopilot() goneAllDoorState() @@ -155,13 +158,12 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu aciv_middle_car.visibility = View.VISIBLE taxi_p_autopilot_btn_bg.visibility = View.VISIBLE taxi_p_start_autopilot.visibility = View.VISIBLE - taxiPStartAutopilot?.reStart() } override fun onAttachedToWindow() { super.onAttachedToWindow() CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "onAttachedToWindow") - val viewModel = ViewModelProvider(this).get(StartAutopilotViewModel::class.java) + viewModel = ViewModelProvider(this).get(StartAutopilotViewModel::class.java) viewModel.setStartAutopilotCallback(this) taxi_p_start_autopilot.onClick { //开启动画和自动驾驶 @@ -176,10 +178,10 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu private fun unableStartAutopilot() { taxiPStartAutopilot?.stop() taxiPStartAutopilotCar?.stop() - taxi_p_autopilot_starting.setImageResource(R.drawable.light_00003) + taxi_p_autopilot_starting.setImageResource(R.drawable.light_00018) taxi_p_autopilot_btn_bg.setImageResource(R.drawable.image_00000_0) taxi_p_start_autopilot.background = - ContextCompat.getDrawable(context, R.drawable.taxi_p_start_autopilot_txt_btn_bg) + ContextCompat.getDrawable(context, R.drawable.taxi_p_unable_start_autopilot) taxi_p_start_autopilot.text = resources.getString(R.string.taxi_p_start_autopilot_txt) } @@ -187,10 +189,11 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu * ②：可以启动自驾 */ private fun ableStartAutopilot() { - taxiPStartAutopilot?.reStart() + taxiPStartAutopilot?.stop() taxiPStartAutopilotCar?.stop() - taxi_p_autopilot_starting.setImageResource(R.drawable.light_00003) - taxi_p_start_autopilot.background = null + taxi_p_autopilot_starting.setImageResource(R.drawable.light_00018) + taxi_p_start_autopilot.background = + ContextCompat.getDrawable(context, R.drawable.taxi_p_enable_start_autopilot) taxi_p_start_autopilot.text = resources.getString(R.string.taxi_p_start_autopilot_txt) } diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotViewModel.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotViewModel.kt index 47163b6997..82be59b6e1 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotViewModel.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotViewModel.kt @@ -39,7 +39,7 @@ class StartAutopilotViewModel : ViewModel(), setOrderInfo() } - private fun setOrderInfo() { + fun setOrderInfo() { val currentOCHOrder = TaxiPassengerModel.currentOCHOrder currentOCHOrder?.let { val phone = it.passengerPhone @@ -82,6 +82,7 @@ class StartAutopilotViewModel : ViewModel(), return } if (AutopilotManager.startAutopilot().isEmpty()) { + RxUtils.disposeSubscribe(startCountDown) startCountDown = RxUtils.createSubscribe(TIMER_START_AUTOPILOT_INTERVAL) { viewCallback?.startAutopilotingTimeout() //未启动成功20s后做处理 diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_front_left_door.9.png b/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_front_left_door.9.png new file mode 100644 index 0000000000000000000000000000000000000000..8187b384fd242e2d71cd5fe4ceae04ac58e2dbe8 GIT binary patch literal 2873 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 I{pk_)e_1{RZU6uP literal 0 HcmV?d00001 diff --git a/OCH/taxi/passenger/src/main/res/drawable/taxi_p_enable_start_autopilot.xml b/OCH/taxi/passenger/src/main/res/drawable/taxi_p_enable_start_autopilot.xml new file mode 100644 index 0000000000..050ca629ef --- /dev/null +++ b/OCH/taxi/passenger/src/main/res/drawable/taxi_p_enable_start_autopilot.xml @@ -0,0 +1,10 @@ + + + + + + diff --git a/OCH/taxi/passenger/src/main/res/drawable/taxi_p_unable_start_autopilot.xml b/OCH/taxi/passenger/src/main/res/drawable/taxi_p_unable_start_autopilot.xml new file mode 100644 index 0000000000..64040b5c44 --- /dev/null +++ b/OCH/taxi/passenger/src/main/res/drawable/taxi_p_unable_start_autopilot.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml index 7926677c6f..173706e096 100644 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml +++ b/OCH/taxi/passenger/src/main/res/layout/taxi_p_arrived_end_panel.xml @@ -44,7 +44,7 @@ android:maxLines="2" android:ellipsize="end" android:maxWidth="@dimen/dp_1200" - android:textSize="@dimen/dp_88" + android:textSize="@dimen/dp_68" android:textStyle="bold" tools:text="环球贸易中心环球贸易中心环球贸易中心环球贸易中心环球贸易中心环球贸易中心环球贸易中心环球贸易中心" android:layout_width="wrap_content" diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml deleted file mode 100644 index 0acc1b75d4..0000000000 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_start_autopilot_view.xml +++ /dev/null @@ -1,228 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/taxi/passenger/src/main/res/layout/taxt_p_start_autopilot_view.xml b/OCH/taxi/passenger/src/main/res/layout/taxt_p_start_autopilot_view.xml index f9a054fc2b..323ce869cc 100644 --- a/OCH/taxi/passenger/src/main/res/layout/taxt_p_start_autopilot_view.xml +++ b/OCH/taxi/passenger/src/main/res/layout/taxt_p_start_autopilot_view.xml @@ -9,8 +9,8 @@ @@ -107,8 +107,8 @@ android:layout_marginStart="@dimen/dp_106" android:text="右前车门未关" android:textSize="@dimen/dp_35" - android:textColor="@color/taxi_p_2B364B" - android:background="@drawable/taxi_p_front_right_door_bg" + android:textColor="@android:color/white" + android:background="@drawable/taxi_p_front_right_door" android:layout_width="wrap_content" android:layout_height="wrap_content"/> @@ -123,8 +123,8 @@ android:layout_marginEnd="@dimen/dp_106" android:text="左前车门未关" android:textSize="@dimen/dp_35" - android:textColor="@color/taxi_p_2B364B" - android:background="@drawable/taxi_p_front_left_door_bg" + android:textColor="@android:color/white" + android:background="@drawable/taxi_p_front_left_door" android:layout_width="wrap_content" android:layout_height="wrap_content"/> @@ -140,8 +140,8 @@ android:layout_marginTop="@dimen/dp_142" android:text="左后车门未关" android:textSize="@dimen/dp_35" - android:textColor="@color/taxi_p_2B364B" - android:background="@drawable/taxi_p_rear_left_door_bg" + android:textColor="@android:color/white" + android:background="@drawable/taxi_p_rear_left_door" android:layout_width="wrap_content" android:layout_height="wrap_content"/> @@ -156,8 +156,8 @@ android:layout_marginTop="@dimen/dp_142" android:text="右后车门未关" android:textSize="@dimen/dp_35" - android:textColor="@color/taxi_p_2B364B" - android:background="@drawable/taxi_p_rear_right_door_bg" + android:textColor="@android:color/white" + android:background="@drawable/taxi_p_rear_right_door" android:layout_width="wrap_content" android:layout_height="wrap_content"/> diff --git a/OCH/taxi/passenger/src/main/res/values/colors.xml b/OCH/taxi/passenger/src/main/res/values/colors.xml index 041a7c892a..da43fd74ed 100644 --- a/OCH/taxi/passenger/src/main/res/values/colors.xml +++ b/OCH/taxi/passenger/src/main/res/values/colors.xml @@ -36,7 +36,7 @@ #76D7FF #255BAA #80F8FF - #2B364B + #A0B3DA #005D6A8C #5D6A8C #995D6A8C @@ -45,6 +45,8 @@ #464646 #191E3C + #58C9FF + #477CFC #378EFB #876E788B diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt index 7ceb8c5bda..8a972f36a9 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt @@ -114,13 +114,6 @@ class ChekAndStartAutopilotView : WindowRelativeLayout, startAutopilotClose.visibility = View.GONE } - fun startAnimation2StartAutopilit() { - checkPhoneNumber.visibility = View.GONE - startAutopilotView.visibility = View.VISIBLE - startAutopilotClose.visibility = View.VISIBLE - aniCheck2StartAutopilotView?.start() - } - fun aniCheckAndStartAutopilot(show:Boolean,status:Int){ val alphaStart: Float val alphaEnd: Float diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotView.kt index 5e49da15a4..ab84b388e4 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotView.kt @@ -49,6 +49,7 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu private var taxiPStartAutopilot: FrameAnimatorContainer? = null private var taxiPStartAutopilotCar: FrameAnimatorContainer? = null + private lateinit var viewModel: StartAutopilotViewModel init { @@ -132,9 +133,11 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu override fun onVisibilityAggregated(isVisible: Boolean) { super.onVisibilityAggregated(isVisible) if(isVisible){ - taxi_p_start_autopilot.background = null + taxi_p_start_autopilot.background = + ContextCompat.getDrawable(context, R.drawable.taxi_u_p_enable_start_autopilot) taxi_p_start_autopilot.text = resources.getString(R.string.taxi_p_start_autopilot_txt) taxi_p_autopilot_starting.setImageResource(R.drawable.light_00018) + viewModel.setOrderInfo() }else{ unableStartAutopilot() goneAllDoorState() @@ -155,13 +158,12 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu aciv_middle_car.visibility = View.VISIBLE taxi_p_autopilot_btn_bg.visibility = View.VISIBLE taxi_p_start_autopilot.visibility = View.VISIBLE - taxiPStartAutopilot?.reStart() } override fun onAttachedToWindow() { super.onAttachedToWindow() CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "onAttachedToWindow") - val viewModel = ViewModelProvider(this).get(StartAutopilotViewModel::class.java) + viewModel = ViewModelProvider(this).get(StartAutopilotViewModel::class.java) viewModel.setStartAutopilotCallback(this) taxi_p_start_autopilot.onClick { //开启动画和自动驾驶 @@ -176,10 +178,10 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu private fun unableStartAutopilot() { taxiPStartAutopilot?.stop() taxiPStartAutopilotCar?.stop() - taxi_p_autopilot_starting.setImageResource(R.drawable.light_00003) + taxi_p_autopilot_starting.setImageResource(R.drawable.light_00018) taxi_p_autopilot_btn_bg.setImageResource(R.drawable.image_00000_0) taxi_p_start_autopilot.background = - ContextCompat.getDrawable(context, R.drawable.taxt_u_p_start_autopilot_txt_btn_bg) + ContextCompat.getDrawable(context, R.drawable.taxi_u_p_unable_start_autopilot) taxi_p_start_autopilot.text = resources.getString(R.string.taxi_p_start_autopilot_txt) } @@ -187,10 +189,11 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu * ②：可以启动自驾 */ private fun ableStartAutopilot() { - taxiPStartAutopilot?.reStart() + taxiPStartAutopilot?.stop() taxiPStartAutopilotCar?.stop() - taxi_p_autopilot_starting.setImageResource(R.drawable.light_00003) - taxi_p_start_autopilot.background = null + taxi_p_autopilot_starting.setImageResource(R.drawable.light_00018) + taxi_p_start_autopilot.background = + ContextCompat.getDrawable(context, R.drawable.taxi_u_p_enable_start_autopilot) taxi_p_start_autopilot.text = resources.getString(R.string.taxi_p_start_autopilot_txt) } @@ -203,7 +206,7 @@ class StartAutopilotView : WindowRelativeLayout, StartAutopilotViewModel.StartAu taxi_p_start_autopilot.background = null taxi_p_start_autopilot?.text = resources.getString(R.string.taxi_p_start_autopilot_loading) taxi_p_start_autopilot?.setTextColor( - ContextCompat.getColor(context, R.color.taxi_p_start_autopilot_txt_color) + ContextCompat.getColor(context, android.R.color.white) ) } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotViewModel.kt index 05f49aa724..c7c6ced017 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotViewModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/startautopilot/StartAutopilotViewModel.kt @@ -39,7 +39,7 @@ class StartAutopilotViewModel : ViewModel(), setOrderInfo() } - private fun setOrderInfo() { + fun setOrderInfo() { val currentOCHOrder = TaxiPassengerModel.currentOCHOrder currentOCHOrder?.let { val phone = it.bookingUserPhone @@ -82,6 +82,7 @@ class StartAutopilotViewModel : ViewModel(), return } if (AutopilotManager.startAutopilot().isEmpty()) { + RxUtils.disposeSubscribe(startCountDown) startCountDown = RxUtils.createSubscribe(TIMER_START_AUTOPILOT_INTERVAL) { viewCallback?.startAutopilotingTimeout() //未启动成功20s后做处理 diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_u_p_front_left_door.9.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_u_p_front_left_door.9.png new file mode 100644 index 0000000000000000000000000000000000000000..8187b384fd242e2d71cd5fe4ceae04ac58e2dbe8 GIT binary patch literal 2873 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 I{pk_)e_1{RZU6uP literal 0 HcmV?d00001 diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_startautopilt_car_top.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_u_p_startautopilt_car_top.png similarity index 100% rename from OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_startautopilt_car_top.png rename to OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_u_p_startautopilt_car_top.png diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_u_p_enable_start_autopilot.xml b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_u_p_enable_start_autopilot.xml new file mode 100644 index 0000000000..050ca629ef --- /dev/null +++ b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_u_p_enable_start_autopilot.xml @@ -0,0 +1,10 @@ + + + + + + diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_u_p_unable_start_autopilot.xml b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_u_p_unable_start_autopilot.xml new file mode 100644 index 0000000000..64040b5c44 --- /dev/null +++ b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_u_p_unable_start_autopilot.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_arrived_end_panel.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_arrived_end_panel.xml index 33cfd5986a..fa8a889dc4 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_arrived_end_panel.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_arrived_end_panel.xml @@ -44,7 +44,7 @@ android:maxLines="2" android:ellipsize="end" android:maxWidth="@dimen/dp_1200" - android:textSize="@dimen/dp_88" + android:textSize="@dimen/dp_68" android:textStyle="bold" tools:text="环球贸易中心环球贸易中心环球贸易中心环球贸易中心环球贸易中心环球贸易中心环球贸易中心环球贸易中心" android:layout_width="wrap_content" diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_start_autopilot_view.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_start_autopilot_view.xml index e1639924a4..2b90cea0bf 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_start_autopilot_view.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_start_autopilot_view.xml @@ -9,8 +9,8 @@ @@ -107,8 +107,8 @@ android:layout_marginStart="@dimen/dp_106" android:text="右前车门未关" android:textSize="@dimen/dp_35" - android:textColor="@color/taxi_p_2B364B" - android:background="@drawable/taxt_u_p_front_right_door_bg" + android:textColor="@android:color/white" + android:background="@drawable/taxi_u_p_front_right_door" android:layout_width="wrap_content" android:layout_height="wrap_content"/> @@ -123,8 +123,8 @@ android:layout_marginEnd="@dimen/dp_106" android:text="左前车门未关" android:textSize="@dimen/dp_35" - android:textColor="@color/taxi_p_2B364B" - android:background="@drawable/taxt_u_p_front_left_door_bg" + android:textColor="@android:color/white" + android:background="@drawable/taxi_u_p_front_left_door" android:layout_width="wrap_content" android:layout_height="wrap_content"/> @@ -140,8 +140,8 @@ android:layout_marginTop="@dimen/dp_142" android:text="左后车门未关" android:textSize="@dimen/dp_35" - android:textColor="@color/taxi_p_2B364B" - android:background="@drawable/taxt_u_p_rear_left_door_bg" + android:textColor="@android:color/white" + android:background="@drawable/taxi_u_p_rear_left_door" android:layout_width="wrap_content" android:layout_height="wrap_content"/> @@ -156,8 +156,8 @@ android:layout_marginTop="@dimen/dp_142" android:text="右后车门未关" android:textSize="@dimen/dp_35" - android:textColor="@color/taxi_p_2B364B" - android:background="@drawable/taxt_u_p_rear_right_door_bg" + android:textColor="@android:color/white" + android:background="@drawable/taxi_u_p_rear_right_door" android:layout_width="wrap_content" android:layout_height="wrap_content"/> diff --git a/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml b/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml index 082beb966c..ac34307278 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml @@ -58,6 +58,8 @@ #876E788B - + #58C9FF + #477CFC + #A0B3DA \ No newline at end of file diff --git a/core/mogo-core-res/src/main/res/values/dimens.xml b/core/mogo-core-res/src/main/res/values/dimens.xml index 4c2241bb52..1cd0ceedec 100644 --- a/core/mogo-core-res/src/main/res/values/dimens.xml +++ b/core/mogo-core-res/src/main/res/values/dimens.xml @@ -1024,6 +1024,7 @@ 999dp 1000dp 1100dp + 1125dp 1200dp 1300dp 1600dp