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

[charter]

Browse Source 
[3.2.0]
[ui调整]
This commit is contained in:
yangyakun
2023-05-18 19:27:19 +08:00
parent 8b66dfee89
commit e16448b681
16 changed files with 34 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
View File

@@ -1055,9 +1055,15 @@ object CharterPassengerModel {
}
private fun invokeStationDistanceListener(meters:Long , timeInSecond:Long){
var tempMeters = meters
var tempTimeInSecond = timeInSecond
if (orderInfo?.arriveStatus == OrderInfoResponse.ARRIVED) {
tempMeters = -1
tempTimeInSecond = -1
}
UiThreadHandler.post({
for (value in stationDistanceListener.values) {
value.setDistancecAndTime(meters,timeInSecond)
value.setDistancecAndTime(tempMeters,tempTimeInSecond)
}
}, UiThreadHandler.MODE.QUEUE)

2
OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/adapter/OrderLineItemAdapter.kt
View File

@@ -57,8 +57,10 @@ class OrderLineItemAdapter(
val lineInfo = dataList[holder.bindingAdapterPosition]
if(lineInfo.isCheck){
holder.lineNameTextView.setBackgroundResource(R.drawable.m1_order_line_checked_shape)
holder.lineNameTextView.setTextColor(context.getColor(R.color.bus_p_m1_1466FB))
}else{
holder.lineNameTextView.setBackgroundResource(android.R.color.transparent)
holder.lineNameTextView.setTextColor(context.getColor(R.color.bus_p_m1_292c39))
}
holder.lineNameTextView.text = lineInfo.name
holder.lineNameTextView.setOnClickListener {

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/bus_p_distance_info_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 34 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_bottom_bar_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 54 KiB

BIN
OCH/mogo-och-charter-passenger/src/main/res/drawable-nodpi/charter_p_guidace_3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 MiB

After

Width:  |  Height:  |  Size: 2.0 MiB

26
OCH/mogo-och-charter-passenger/src/main/res/drawable-v29/taxi_power_size_seekbar_style.xml
View File

@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/background">
<shape>
<corners android:radius="@dimen/dp_7_5"/>
<solid android:color="@color/bus_p_m1_a3bdf2" />
</shape>
</item>
<item android:id="@android:id/secondaryProgress">
<clip>
<shape>
<corners android:radius="5dp"/>
<solid android:color="@android:color/transparent" />
</shape>
</clip>
</item>
<item android:id="@android:id/progress">
<scale android:scaleWidth="100%">
<shape android:shape="rectangle">
<corners android:radius="5dp"/>
<gradient android:startColor="@color/bus_p_m1_56c59c" android:endColor="@color/bus_p_m1_56efa0" android:angle="0"/>
</shape>
</scale>
</item>
</layer-list>

26
OCH/mogo-och-charter-passenger/src/main/res/drawable-v29/taxi_video_seekbar_style.xml
View File

@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/background">
<shape>
<corners android:radius="5dp"/>
<solid android:color="#99D8D8D8" />
</shape>
</item>
<item android:id="@android:id/secondaryProgress">
<clip>
<shape>
<corners android:radius="5dp"/>
<solid android:color="#66FFFFFF" />
</shape>
</clip>
</item>
<item android:id="@android:id/progress">
<scale android:scaleWidth="100%">
<shape android:shape="rectangle">
<corners android:radius="5dp"/>
<gradient android:startColor="#303CFF" android:centerColor="#216CFF" android:endColor="#25C1F9" android:angle="0"/>
</shape>
</scale>
</item>
</layer-list>

6
OCH/mogo-och-charter-passenger/src/main/res/drawable/bus_p_distance_info_bg.xml
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/dp_18"/>
<solid android:color="@color/bus_p_m1_CCFFFFFF"/>
</shape>

2
OCH/mogo-och-charter-passenger/src/main/res/drawable/charter_p_shape_end_order.xml
View File

@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/dp_39"/>
<gradient android:startColor="@color/bus_p_m1_1466FB" android:endColor="@color/bus_p_m1_43CEFE"/>
<gradient android:startColor="@color/bus_p_m1_1466FB" android:endColor="@color/bus_p_m1_43CEFE" android:angle="@integer/keyCode_0"/>
</shape>

6
OCH/mogo-och-charter-passenger/src/main/res/drawable/taxi_power_size_seekbar_style.xml
View File

@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/background">
<shape>
<corners android:radius="@dimen/dp_7_5"/>
<corners android:radius="5dp"/>
<solid android:color="@color/bus_p_m1_a3bdf2" />
</shape>
</item>
@@ -11,7 +11,7 @@
<clip>
<shape>
<corners android:radius="5dp"/>
<solid android:color="@android:color/transparent" />
<solid android:color="@color/bus_p_m1_a3bdf2" />
</shape>
</clip>
</item>
@@ -19,7 +19,7 @@
<scale android:scaleWidth="100%">
<shape android:shape="rectangle">
<corners android:radius="5dp"/>
<gradient android:startColor="@color/bus_p_m1_56c59c" android:endColor="@color/bus_p_m1_56efa0"/>
<gradient android:startColor="@color/bus_p_m1_6edbdc" android:endColor="@color/bus_p_m1_56efa0" android:angle="0"/>
</shape>
</scale>
</item>

BIN
OCH/mogo-och-charter-passenger/src/main/res/font/din.ttf Normal file
View File

Binary file not shown.

2
OCH/mogo-och-charter-passenger/src/main/res/layout/m1_bottom_stop_site.xml
View File

@@ -20,7 +20,7 @@
app:layout_constraintStart_toStartOf="@+id/aciv_center_image"
app:layout_constraintEnd_toEndOf="@+id/aciv_center_image"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="@dimen/dp_9_5"
android:layout_marginBottom="@dimen/dp_4_5"
android:textSize="@dimen/dp_20"
android:text="靠边停车"
android:textColor="@color/bus_p_m1_090f28"

16
OCH/mogo-och-charter-passenger/src/main/res/layout/m1_devices_fragment.xml
View File

@@ -31,8 +31,8 @@
android:id="@+id/actv_order_times"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="@dimen/dp_31"
app:layout_constraintTop_toBottomOf="@+id/actv_order_phone"
app:layout_constraintBottom_toTopOf="@+id/actv_order_times_title"
android:layout_marginBottom="8dp"
android:text="--:-----:--"
android:textSize="@dimen/dp_36"
android:textColor="@color/bus_p_m1_0050E1"
@@ -43,8 +43,8 @@
android:id="@+id/actv_order_times_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="@dimen/dp_8"
app:layout_constraintTop_toBottomOf="@+id/actv_order_times"
app:layout_constraintBottom_toTopOf="@+id/actv_end_order"
android:layout_marginBottom="@dimen/dp_25"
android:text="用车时间"
android:textSize="@dimen/dp_18"
android:textColor="@color/bus_p_m1_112b57"
@@ -56,8 +56,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/actv_order_times_title"
android:layout_marginTop="@dimen/dp_25"
android:layout_marginBottom="@dimen/dp_27"
android:background="@drawable/charter_p_shape_end_order"
android:gravity="center"
@@ -124,7 +122,8 @@
android:text="结束用车"
android:textSize="@dimen/dp_24"
android:textColor="@android:color/white"
app:layout_constraintTop_toBottomOf="@+id/actv_end_order_content"
android:layout_marginBottom="@dimen/dp_27"
app:layout_constraintBottom_toBottomOf="parent"
android:background="@drawable/charter_p_shape_end_order_left"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="@dimen/dp_30"
@@ -142,7 +141,8 @@
android:textSize="@dimen/dp_24"
android:textColor="@android:color/white"
android:background="@drawable/charter_p_shape_end_order"
app:layout_constraintTop_toBottomOf="@+id/actv_end_order_content"
android:layout_marginBottom="@dimen/dp_27"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_17"

15
OCH/mogo-och-charter-passenger/src/main/res/layout/m1_main_fragment.xml
View File

@@ -98,7 +98,7 @@
app:layout_constraintStart_toStartOf="@+id/ll_car_speed"
app:layout_constraintEnd_toEndOf="@+id/ll_car_speed"
android:background="@drawable/bus_p_distance_info_bg"
android:layout_width="@dimen/dp_112"
android:layout_width="@dimen/dp_115"
android:layout_height="@dimen/dp_346">
<TextView
@@ -108,7 +108,8 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@+id/tv_distance_unit"
app:layout_constraintVertical_chainStyle="packed"
android:text="--"
android:fontFamily="@font/din"
android:text="80"
android:textSize="@dimen/dp_37"
android:textColor="@color/bus_p_m1_203555"
android:layout_width="wrap_content"
@@ -128,7 +129,7 @@
<View
android:id="@+id/v_line_01"
android:background="@drawable/bus_p_function_distance_split_bg"
android:background="@android:color/transparent"
app:layout_constraintVertical_bias="0.33"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
@@ -143,7 +144,8 @@
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintBottom_toTopOf="@+id/tv_distance_surplus_time_unit"
app:layout_constraintHorizontal_chainStyle="packed"
android:text="--"
android:text="80"
android:fontFamily="@font/din"
android:textSize="@dimen/dp_37"
android:textColor="@color/bus_p_m1_203555"
android:layout_width="wrap_content"
@@ -163,7 +165,7 @@
<View
android:id="@+id/v_line_02"
android:background="@drawable/bus_p_function_distance_split_bg"
android:background="@android:color/transparent"
app:layout_constraintVertical_bias="0.66"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
@@ -177,7 +179,8 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintVertical_chainStyle="packed"
android:text="--"
android:text="80"
android:fontFamily="@font/din"
android:textSize="@dimen/dp_37"
android:textColor="@color/bus_p_m1_203555"
android:layout_width="wrap_content"

3
OCH/mogo-och-charter-passenger/src/main/res/layout/m1_statusview_datetime.xml
View File

@@ -76,12 +76,13 @@
android:maxHeight="@dimen/dp_10"
android:minHeight="@dimen/dp_10"
android:background="@null"
android:progressDrawable="@drawable/taxi_video_seekbar_style" />
android:progressDrawable="@drawable/taxi_power_size_seekbar_style" />
<TextView
android:id="@+id/tv_power_cos"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginStart="@dimen/dp_7"
app:layout_constraintStart_toEndOf="@+id/progress"
android:textSize="@dimen/dp_22"
android:textColor="@color/bus_p_m1_1b2546"

1
OCH/mogo-och-charter-passenger/src/main/res/values/color.xml
View File

@@ -15,6 +15,7 @@
<color name="bus_p_m1_a3bdf2">#A3BDF2</color>
<color name="bus_p_m1_56c59c">#56C59C</color>
<color name="bus_p_m1_56efa0">#56EFA0</color>
<color name="bus_p_m1_6edbdc">#6EDBDC</color>
<color name="bus_p_m1_4a5375">#4A5375</color>
<color name="bus_p_m1_0f1e57">#0F1E57</color>
<color name="bus_p_m1_225eff">#225EFF</color>