yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[3.3.2]

Browse Source 
[开启行程]
This commit is contained in:
yangyakun
2023-07-17 18:59:25 +08:00
parent 5bb9e98739
commit db10fa4bad
7 changed files with 41 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerCheckView.kt
View File

@@ -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
}

BIN
OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_input_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 670 KiB

BIN
OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_panel_bg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 915 KiB

BIN
OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_passenger_check_panel_bg.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 86 KiB

127
OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_passenger_check_panel.xml
View File

@@ -8,15 +8,6 @@
android:background="@drawable/taxi_p_passenger_check_panel_bg"
tools:ignore="MissingDefaultResource">
<ImageView
android:layout_width="@dimen/dp_90"
android:layout_height="@dimen/dp_90"
android:layout_marginStart="@dimen/dp_63"
android:layout_marginTop="@dimen/dp_132"
android:src="@drawable/taxi_p_passenger_check_logo"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_hello"
android:layout_width="wrap_content"
@@ -24,11 +15,11 @@
android:layout_marginStart="@dimen/dp_129"
android:layout_marginTop="@dimen/dp_406"
android:padding="@dimen/dp_40"
android:shadowColor="@color/taxi_p_check_hello_text_color"
android:shadowColor="@android:color/white"
android:shadowDy ="4"
android:shadowRadius="40"
android:text="@string/taxi_p_check_hello_text"
android:textColor="@color/taxi_autopilot_text_color_normal"
android:textColor="@color/taxi_p_242C65"
android:textSize="@dimen/dp_120"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent"
@@ -39,7 +30,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_3"
android:shadowColor="@color/taxi_p_check_hello_small_text_color"
android:shadowColor="@android:color/white"
android:paddingStart="@dimen/dp_40"
android:paddingEnd="@dimen/dp_20"
android:paddingTop="@dimen/dp_20"
@@ -47,7 +38,7 @@
android:shadowDy ="2"
android:shadowRadius="20"
android:text="@string/taxi_p_check_hello_small_text"
android:textColor="@color/taxi_autopilot_text_color_normal"
android:textColor="@color/taxi_p_242C65"
android:textSize="@dimen/dp_46"
app:layout_constraintStart_toStartOf="@+id/tv_hello"
app:layout_constraintTop_toBottomOf="@+id/tv_hello" />
@@ -129,89 +120,34 @@
app:layout_constraintEnd_toStartOf="@+id/och_shadow_layout"
app:layout_constraintTop_toTopOf="@+id/iv_passenger_end_boll" />
<com.mogo.och.common.module.wigets.OCHBorderShadowLayout
android:id="@+id/och_shadow_layout"
android:layout_width="929dp"
android:layout_height="1143dp"
android:layout_marginEnd="155dp"
android:layout_marginBottom="231dp"
android:orientation="vertical"
app:bgColor="@color/color_B3FFFFFF"
app:blurRadius="@dimen/dp_60"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:shadowColor="@color/taxi_p_check_keyboard_bg"
app:shadowRadius="60dp"
app:xOffset="0dp"
app:yOffset="0dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@null">
<com.mogo.och.common.module.wigets.OCHShapeBlurView
android:id="@+id/och_shape_blur"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="false"
app:och_realtime_onece="true"
app:och_realtime_end_color="#BF6AA2D7"
app:och_realtime_radius="@dimen/dp_60"
app:och_realtime_start_color="#BFE0E8FF" />
<ImageView
android:id="@+id/iv_robot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_45"
android:layout_marginTop="@dimen/dp_84"
android:src="@drawable/taxi_p_passenger_check_robot"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_small_mogo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_28"
android:layout_marginTop="@dimen/dp_88"
android:text="@string/taxi_p_check_small_mogo"
android:textColor="@color/taxi_p_check_keyboard_samll_mogo_color"
android:textSize="42dp"
app:layout_constraintStart_toEndOf="@+id/iv_robot"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_taxi_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_14"
tools:text="蘑菇 3291号为您服务"
android:textColor="@color/taxi_p_check_keyboard_samll_mogo_color"
android:textSize="@dimen/dp_24"
app:layout_constraintStart_toStartOf="@+id/tv_small_mogo"
app:layout_constraintTop_toBottomOf="@+id/tv_small_mogo" />
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">
<TextView
android:id="@+id/tv_taxi_passenger_number_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_84"
android:layout_marginTop="308dp"
android:layout_marginTop="@dimen/dp_181"
android:text="@string/taxi_p_check_input_phone_tail_title"
android:textColor="@color/taxi_p_check_keyboard_samll_mogo_color"
android:textSize="@dimen/dp_36"
app:layout_constraintStart_toStartOf="parent"
android:textSize="@dimen/dp_46"
app:layout_constraintStart_toStartOf="@+id/tv_taxi_passenger_number_first"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_taxi_passenger_number_first"
android:layout_width="@dimen/dp_150"
android:layout_height="@dimen/dp_150"
android:layout_marginTop="@dimen/dp_41"
android:layout_marginEnd="@dimen/dp_38"
android:layout_width="@dimen/dp_173"
android:layout_height="@dimen/dp_173"
android:layout_marginTop="@dimen/dp_58"
android:layout_marginEnd="@dimen/dp_44"
style="@style/och_check_number_checked"
android:backgroundTintMode="screen"
android:gravity="center"
@@ -223,7 +159,7 @@
<TextView
android:id="@+id/tv_taxi_passenger_number_second"
android:layout_marginEnd="@dimen/dp_38"
android:layout_marginEnd="@dimen/dp_44"
style="@style/och_check_number"
app:layout_constraintEnd_toStartOf="@+id/tv_taxi_passenger_number_third"
app:layout_constraintStart_toEndOf="@+id/tv_taxi_passenger_number_first"
@@ -231,7 +167,7 @@
<TextView
android:id="@+id/tv_taxi_passenger_number_third"
android:layout_marginEnd="@dimen/dp_38"
android:layout_marginEnd="@dimen/dp_44"
style="@style/och_check_number"
app:layout_constraintEnd_toStartOf="@+id/tv_taxi_passenger_number_fourth"
app:layout_constraintStart_toEndOf="@+id/tv_taxi_passenger_number_second"
@@ -247,11 +183,11 @@
<TextView
android:id="@+id/tv_taxi_passenger_number_back"
android:layout_marginEnd="@dimen/dp_39"
android:layout_marginBottom="@dimen/dp_80"
android:layout_marginEnd="@dimen/dp_45"
android:layout_marginBottom="@dimen/dp_181"
style="@style/och_check_number_keyboard"
android:text="@string/tv_delete"
android:textSize="@dimen/dp_36"
android:textSize="@dimen/dp_42"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/tv_taxi_passenger_number_zero"
app:layout_constraintHorizontal_chainStyle="packed"
@@ -259,7 +195,7 @@
<TextView
android:id="@+id/tv_taxi_passenger_number_zero"
android:layout_marginEnd="@dimen/dp_30"
android:layout_marginEnd="@dimen/dp_45"
android:text="0"
style="@style/och_check_number_keyboard"
app:layout_constraintEnd_toStartOf="@+id/tv_taxi_passenger_number_submit"
@@ -279,7 +215,7 @@
<TextView
android:id="@+id/tv_taxi_passenger_number_seven"
style="@style/och_check_number_keyboard"
android:layout_marginEnd="@dimen/dp_39"
android:layout_marginEnd="@dimen/dp_45"
android:layout_marginBottom="24dp"
android:text="7"
app:layout_constraintBottom_toTopOf="@id/tv_taxi_passenger_number_back"
@@ -290,7 +226,7 @@
<TextView
android:id="@+id/tv_taxi_passenger_number_eight"
style="@style/och_check_number_keyboard"
android:layout_marginEnd="@dimen/dp_39"
android:layout_marginEnd="@dimen/dp_45"
android:text="8"
app:layout_constraintEnd_toStartOf="@+id/tv_taxi_passenger_number_nine"
app:layout_constraintStart_toEndOf="@+id/tv_taxi_passenger_number_seven"
@@ -308,7 +244,7 @@
<TextView
android:id="@+id/tv_taxi_passenger_number_four"
style="@style/och_check_number_keyboard"
android:layout_marginEnd="@dimen/dp_39"
android:layout_marginEnd="@dimen/dp_45"
android:layout_marginBottom="24dp"
android:text="4"
app:layout_constraintBottom_toTopOf="@id/tv_taxi_passenger_number_seven"
@@ -319,7 +255,7 @@
<TextView
android:id="@+id/tv_taxi_passenger_number_five"
style="@style/och_check_number_keyboard"
android:layout_marginEnd="@dimen/dp_39"
android:layout_marginEnd="@dimen/dp_45"
android:text="5"
app:layout_constraintEnd_toStartOf="@+id/tv_taxi_passenger_number_six"
app:layout_constraintStart_toEndOf="@+id/tv_taxi_passenger_number_four"
@@ -336,7 +272,7 @@
<TextView
android:id="@+id/tv_taxi_passenger_number_one"
style="@style/och_check_number_keyboard"
android:layout_marginEnd="@dimen/dp_39"
android:layout_marginEnd="@dimen/dp_45"
android:layout_marginBottom="24dp"
android:text="1"
app:layout_constraintBottom_toTopOf="@id/tv_taxi_passenger_number_four"
@@ -347,7 +283,7 @@
<TextView
android:id="@+id/tv_taxi_passenger_number_two"
style="@style/och_check_number_keyboard"
android:layout_marginEnd="@dimen/dp_39"
android:layout_marginEnd="@dimen/dp_45"
android:text="2"
app:layout_constraintEnd_toStartOf="@+id/tv_taxi_passenger_number_three"
app:layout_constraintStart_toEndOf="@+id/tv_taxi_passenger_number_one"
@@ -366,7 +302,6 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</com.mogo.och.common.module.wigets.OCHBorderShadowLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

3
OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml
View File

@@ -74,6 +74,9 @@
<color name="taxi_p_44C8FF">#44C8FF</color>
<color name="taxi_p_8AE4ED">#8AE4ED</color>
<color name="taxi_p_C8F3F4">#C8F3F4</color>
<color name="taxi_p_282F62">#282F62</color>
<color name="taxi_p_121842">#121842</color>
<color name="taxi_p_242C65">#242C65</color>

14
OCH/mogo-och-taxi-passenger/src/main/res/values/styles.xml
View File

@@ -21,19 +21,19 @@
<item name="android:shadowColor">@color/taxi_p_check_keyboard_input_field_checked_text_shadow</item>
<item name="android:shadowDy">2</item>
<item name="android:shadowRadius">20</item>
<item name="android:textSize">@dimen/dp_76</item>
<item name="android:textSize">@dimen/dp_87</item>
<item name="android:gravity">center</item>
<item name="android:layout_width">@dimen/dp_150</item>
<item name="android:layout_height">@dimen/dp_150</item>
<item name="android:layout_width">@dimen/dp_173</item>
<item name="android:layout_height">@dimen/dp_173</item>
</style>
<style name="och_check_number_keyboard">
<item name="android:layout_width">@dimen/dp_212</item>
<item name="android:layout_height">@dimen/dp_80</item>
<item name="android:layout_width">@dimen/dp_245</item>
<item name="android:layout_height">@dimen/dp_92</item>
<item name="android:background">@drawable/bg_taxi_p_keyboard_background</item>
<item name="android:gravity">center</item>
<item name="android:textColor">@color/taxi_p_check_keyboard_samll_mogo_color</item>
<item name="android:textSize">@dimen/dp_56</item>
<item name="android:textColor">@color/taxi_p_282F62</item>
<item name="android:textSize">@dimen/dp_65</item>
</style>
<style name="och_window_anim_alpha">