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 0000000000..8187b384fd Binary files /dev/null and b/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_front_left_door.9.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_front_right_door.9.png b/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_front_right_door.9.png new file mode 100644 index 0000000000..a8e69c82e5 Binary files /dev/null and b/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_front_right_door.9.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_rear_left_door.9.png b/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_rear_left_door.9.png new file mode 100644 index 0000000000..7115749df7 Binary files /dev/null and b/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_rear_left_door.9.png differ diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_rear_right_door.9.png b/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_rear_right_door.9.png new file mode 100644 index 0000000000..f18fb44b2b Binary files /dev/null and b/OCH/taxi/passenger/src/main/res/drawable-nodpi/taxi_p_rear_right_door.9.png differ 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 0000000000..8187b384fd Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_u_p_front_left_door.9.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_u_p_front_right_door.9.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_u_p_front_right_door.9.png new file mode 100644 index 0000000000..a8e69c82e5 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_u_p_front_right_door.9.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_u_p_rear_left_door.9.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_u_p_rear_left_door.9.png new file mode 100644 index 0000000000..7115749df7 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_u_p_rear_left_door.9.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_u_p_rear_right_door.9.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_u_p_rear_right_door.9.png new file mode 100644 index 0000000000..f18fb44b2b Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_u_p_rear_right_door.9.png differ 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