diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerCheckView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerCheckView.kt index 68fe7170da..3199899106 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerCheckView.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerCheckView.kt @@ -36,7 +36,6 @@ class TaxiPassengerCheckView :RelativeLayout, View.OnClickListener { private lateinit var tvPassengerCount: TextView private lateinit var tvPassengerStart: TextView private lateinit var tvPassengerEnd: TextView - private lateinit var tvTaxiNumber: TextView private lateinit var tvTaxiPassengerNumberfirst: TextView private lateinit var tvTaxiPassengerNumberSecond: TextView private lateinit var tvTaxiPassengerNumberThird: TextView @@ -53,7 +52,6 @@ class TaxiPassengerCheckView :RelativeLayout, View.OnClickListener { tvPassengerCount = findViewById(R.id.tv_passenger_count) tvPassengerStart = findViewById(R.id.tv_passenger_start) tvPassengerEnd = findViewById(R.id.tv_passenger_end) - tvTaxiNumber = findViewById(R.id.tv_taxi_number) tvTaxiPassengerNumberfirst = findViewById(R.id.tv_taxi_passenger_number_first) tvTaxiPassengerNumberSecond = findViewById(R.id.tv_taxi_passenger_number_second) tvTaxiPassengerNumberThird = findViewById(R.id.tv_taxi_passenger_number_third) @@ -199,7 +197,6 @@ class TaxiPassengerCheckView :RelativeLayout, View.OnClickListener { tvPassengerCount.text = sb tvPassengerStart.text = "起 点 : $startSiteAddr" tvPassengerEnd.text = "终 点 : $endSiteAddr" - tvTaxiNumber.text = "蘑菇 " + carNumber + "为您服务" for(i in numSelect.indices){ numSelect[i] = null } diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_input_bg.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_input_bg.png new file mode 100644 index 0000000000..72c0f0fc40 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_input_bg.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_panel_bg.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_panel_bg.png deleted file mode 100755 index 49567f10c2..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_panel_bg.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_panel_bg.webp b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_panel_bg.webp new file mode 100644 index 0000000000..8736cf5d06 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_panel_bg.webp differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml index 212cf333c6..ad32b49845 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml @@ -8,15 +8,6 @@ android:background="@drawable/taxi_p_passenger_check_panel_bg" tools:ignore="MissingDefaultResource"> - - @@ -129,89 +120,34 @@ app:layout_constraintEnd_toStartOf="@+id/och_shadow_layout" app:layout_constraintTop_toTopOf="@+id/iv_passenger_end_boll" /> - - - - - - - - - - + android:id="@+id/och_shadow_layout" + android:layout_width="1140dp" + android:layout_height="1169dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + android:layout_marginEnd="@dimen/dp_30" + android:layout_marginBottom="@dimen/dp_216" + android:background="@drawable/taxi_p_passenger_check_input_bg"> - \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml index 64122a696f..2299abdad8 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml @@ -74,6 +74,9 @@ #44C8FF #8AE4ED #C8F3F4 + #282F62 + #121842 + #242C65 diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/values/styles.xml b/OCH/mogo-och-taxi-passenger/src/main/res/values/styles.xml index 5109f13eae..3ebb46664d 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/values/styles.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/values/styles.xml @@ -21,19 +21,19 @@ @color/taxi_p_check_keyboard_input_field_checked_text_shadow 2 20 - @dimen/dp_76 + @dimen/dp_87 center - @dimen/dp_150 - @dimen/dp_150 + @dimen/dp_173 + @dimen/dp_173