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

[6.7.0]

Browse Source 
[适配]
[1536x2560]
This commit is contained in:
yangyakun
2024-10-25 09:52:44 +08:00
parent 6286b1693b
commit a72a97ea8c
12 changed files with 66 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_biz.xml
View File

@@ -2,9 +2,20 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="@dimen/dp_962"
android:layout_height="@dimen/dp_1047"
xmlns:tools="http://schemas.android.com/tools"
android:background="@drawable/bus_biz_bg">
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aciv_bg"
android:src="@drawable/bus_biz_bg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="@dimen/dp_167"
android:scaleType="fitXY"
android:layout_width="@dimen/dp_962"
android:layout_height="@dimen/dp_0"/>
<androidx.appcompat.widget.AppCompatImageView
android:src="@drawable/bus_biz_bg_header"
@@ -19,7 +30,8 @@
android:id="@+id/loading_biz"
android:visibility="gone"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toBottomOf="@+id/aciv_bg"
android:layout_marginBottom="@dimen/dp_60"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_width="wrap_content"
@@ -32,8 +44,10 @@
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@+id/aciv_bg"
android:layout_marginBottom="@dimen/dp_60"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:layout_height="0dp"/>
<com.mogo.och.weaknet.ui.switchtask.SwitchTaskView
android:id="@+id/swtichTask"
@@ -42,8 +56,10 @@
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@+id/aciv_bg"
android:layout_marginBottom="@dimen/dp_60"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:layout_height="0dp"/>
<com.mogo.och.weaknet.ui.taskrunning.TaskRunningView
android:id="@+id/taskRunning"
@@ -52,7 +68,9 @@
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@+id/aciv_bg"
android:layout_marginBottom="@dimen/dp_60"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:layout_height="0dp"/>
</androidx.constraintlayout.widget.ConstraintLayout>

3
OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_line.xml
View File

@@ -2,7 +2,8 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="@dimen/dp_880"
android:layout_height="@dimen/dp_966"
android:layout_height="match_parent"
tools:layout_height="@dimen/dp_966"
xmlns:tools="http://schemas.android.com/tools">
<TextView

3
OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_switch_task.xml
View File

@@ -3,7 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="@dimen/dp_880"
android:layout_height="@dimen/dp_966"
android:layout_height="match_parent"
tools:layout_height="@dimen/dp_966"
tools:background="@drawable/bus_switch_line_normal">
<TextView

3
OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_task_running.xml
View File

@@ -2,7 +2,8 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="@dimen/dp_880"
android:layout_height="@dimen/dp_966"
android:layout_height="match_parent"
tools:layout_height="@dimen/dp_966"
tools:background="@drawable/bus_switch_line_normal"
xmlns:tools="http://schemas.android.com/tools">

1
OCH/shuttle/driver_weaknet/src/main/res/values/dimens.xml
View File

@@ -22,7 +22,6 @@
<color name="bus_switch_map_bg">#323C6F</color>
<dimen name="bus_dp_10">10dp</dimen>
<dimen name="bus_dp_20">20dp</dimen>
<dimen name="bus_dp_200">200dp</dimen>
<dimen name="bus_dp_52">52dp</dimen>
<dimen name="bus_dp_65">65dp</dimen>
<dimen name="bus_layout_margin_bottom">20dp</dimen>

4
OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/routing/routingrunning/RoutingRunningView.kt
View File

@@ -34,7 +34,6 @@ import kotlinx.android.synthetic.main.unmanned_routing_running.view.actv_distanc
import kotlinx.android.synthetic.main.unmanned_routing_running.view.actv_end_routing
import kotlinx.android.synthetic.main.unmanned_routing_running.view.actv_routing_name
import kotlinx.android.synthetic.main.unmanned_routing_running.view.actv_submit_task
import kotlinx.android.synthetic.main.unmanned_routing_running.view.actv_time_end
import kotlinx.android.synthetic.main.unmanned_routing_running.view.goutp_show_routing_info
import kotlinx.android.synthetic.main.unmanned_routing_running.view.include_empty
import kotlinx.android.synthetic.main.unmanned_routing_running.view.naviToStart
@@ -196,8 +195,7 @@ class RoutingRunningView: ConstraintLayout, RoutingRunningModel.RoutingRuningCal
)
}"
)
actv_distance_end.text =TaskUtils.getCurrentTaskDistance(meters)
actv_time_end.text =TaskUtils.getCurrentTaskTime(timeInSecond)
actv_distance_end.text = "${TaskUtils.getCurrentTaskDistance(meters)} ${TaskUtils.getCurrentTaskTime(timeInSecond)}"
}
}

22
OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_running.xml
View File

@@ -3,7 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"
android:layout_width="@dimen/dp_880"
android:layout_height="@dimen/dp_966"
android:layout_height="match_parent"
tools:layout_height="@dimen/dp_966"
tools:background="@drawable/shape_itinerary_bg_default"
xmlns:tools="http://schemas.android.com/tools">
@@ -41,7 +42,7 @@
android:layout_marginEnd="@dimen/dp_52"
android:layout_width="match_parent"
android:background="@drawable/shape_itinerary_bg_default"
android:layout_height="@dimen/dp_351"/>
android:layout_height="@dimen/dp_272"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aciv_current_itinerary_start_point"
@@ -61,7 +62,7 @@
android:layout_marginTop="@dimen/dp_8"
android:background="@color/taxi_color_4D000000"
android:layout_width="@dimen/dp_6"
android:layout_height="@dimen/dp_171"/>
android:layout_height="@dimen/dp_92"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aciv_current_itinerary_end_point"
@@ -95,6 +96,7 @@
android:layout_width="@dimen/dp_46"
android:layout_height="@dimen/dp_46"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_distance_end"
android:text="5.2公里"
@@ -102,22 +104,10 @@
android:textColor="@color/taxi_color_CCCCCC"
app:layout_constraintTop_toBottomOf="@+id/actv_current_itinerary_start_name"
app:layout_constraintStart_toStartOf="@+id/actv_current_itinerary_start_name"
app:layout_constraintBottom_toTopOf="@+id/actv_time_end"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_time_end"
android:text="1小时36分钟"
android:textSize="@dimen/dp_32"
android:textColor="@color/taxi_color_CCCCCC"
app:layout_constraintTop_toBottomOf="@+id/actv_distance_end"
app:layout_constraintStart_toStartOf="@+id/actv_current_itinerary_start_name"
app:layout_constraintBottom_toTopOf="@+id/actv_current_itinerary_end_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_current_itinerary_end_name"
app:layout_constraintTop_toTopOf="@+id/aciv_current_itinerary_end_point"
@@ -162,7 +152,7 @@
<androidx.constraintlayout.widget.Group
android:id="@+id/goutp_show_routing_info"
app:constraint_referenced_ids="actv_end_routing,actv_submit_task,actv_current_itinerary_end_name,actv_time_end,actv_distance_end,actv_current_itinerary_start_name,aciv_current_itinerary_end_point,v_line_current_start_end,aciv_current_itinerary_start_point,v_bg_itinerary_info,actv_routing_name,naviToStart"
app:constraint_referenced_ids="actv_end_routing,actv_submit_task,actv_current_itinerary_end_name,actv_distance_end,actv_current_itinerary_start_name,aciv_current_itinerary_end_point,v_line_current_start_end,aciv_current_itinerary_start_point,v_bg_itinerary_info,actv_routing_name,naviToStart"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>

3
OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_select.xml
View File

@@ -3,7 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"
android:layout_width="@dimen/dp_880"
android:layout_height="@dimen/dp_966"
android:layout_height="match_parent"
tools:layout_height="@dimen/dp_966"
tools:background="@drawable/shape_itinerary_bg_default"
xmlns:tools="http://schemas.android.com/tools">

3
OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_routing_switch.xml
View File

@@ -2,7 +2,8 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="@dimen/dp_880"
android:layout_height="@dimen/dp_966"
android:layout_height="match_parent"
tools:layout_height="@dimen/dp_966"
xmlns:tools="http://schemas.android.com/tools"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">

25
OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_biz.xml
View File

@@ -2,9 +2,20 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="@dimen/dp_962"
android:layout_height="@dimen/dp_1047"
xmlns:tools="http://schemas.android.com/tools"
android:background="@drawable/taxi_biz_bg">
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aciv_bg"
android:src="@drawable/taxi_biz_bg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="@dimen/dp_167"
android:scaleType="fitXY"
android:layout_width="@dimen/dp_962"
android:layout_height="@dimen/dp_0"/>
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_h_top"
@@ -41,15 +52,19 @@
app:layout_constraintTop_toTopOf="@+id/guideline_h_top"
app:layout_constraintStart_toStartOf="@+id/guideline_v_left"
app:layout_constraintEnd_toEndOf="@+id/guideline_v_right"
app:layout_constraintBottom_toBottomOf="@+id/aciv_bg"
android:layout_marginBottom="@dimen/dp_60"
android:layout_width="@dimen/dp_880"
android:layout_height="@dimen/dp_966"/>
android:layout_height="0dp"/>
<com.mogo.och.unmanned.taxi.ui.routing.RoutingSwitchView
android:id="@+id/routingSwitchView"
app:layout_constraintTop_toTopOf="@+id/guideline_h_top"
app:layout_constraintStart_toStartOf="@+id/guideline_v_left"
app:layout_constraintEnd_toEndOf="@+id/guideline_v_right"
app:layout_constraintBottom_toBottomOf="@+id/aciv_bg"
android:layout_marginBottom="@dimen/dp_60"
android:layout_width="@dimen/dp_880"
android:layout_height="@dimen/dp_966"/>
android:layout_height="0dp"/>
</androidx.constraintlayout.widget.ConstraintLayout>

3
OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_switch_itinerary.xml
View File

@@ -2,7 +2,8 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="@dimen/dp_880"
android:layout_height="@dimen/dp_966"
android:layout_height="match_parent"
tools:layout_height="@dimen/dp_966"
xmlns:tools="http://schemas.android.com/tools"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">

3
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml
View File

@@ -19,10 +19,11 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/clBoneBiz"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="0dp"
android:layout_marginTop="@dimen/dp_385"
android:layout_marginStart="@dimen/dp_19"
android:elevation="1dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />