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

Merge branch 'dev_robotaxi-d_250603_8.1.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robotaxi-d_250603_8.1.0

Browse Source
This commit is contained in:
xinfengkun
2025-06-19 11:01:51 +08:00
parent ac89e55d06 05f8368008
commit 732f2fcccb
9 changed files with 112 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/LineView.kt
View File

@@ -10,13 +10,16 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.mogo.eagle.core.utilcode.kotlin.onClick
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.view.SpacesItemDecoration
import com.mogo.och.common.module.manager.loop.BizLoopManager
import com.mogo.och.common.module.wigets.WrapContentLinearLayoutManager
import com.mogo.och.data.bean.BusStationBean
import com.mogo.och.shuttle.weaknet.passenger.R
import com.mogo.och.shuttle.weaknet.passenger.ui.line.lineinfo.item.ItemDecoration
import com.mogo.och.shuttle.weaknet.passenger.ui.line.lineinfo.item.StationAdapter
import kotlinx.android.synthetic.main.m2_line_view.view.autoplit_info
import kotlinx.android.synthetic.main.m2_line_view.view.ll_station_container
import me.jessyan.autosize.utils.AutoSizeUtils
class LineView : ConstraintLayout, LineViewModel.LineViewCallback {
@@ -44,11 +47,7 @@ class LineView : ConstraintLayout, LineViewModel.LineViewCallback {
linearLayoutManager = LinearLayoutManager(context)
ll_station_container.setLayoutManager(linearLayoutManager)
mAdapter = StationAdapter()
// ll_station_container.addItemDecoration(
// SpacesItemDecoration(
// AutoSizeUtils.dp2px(context,20f)
// )
// )
ll_station_container.addItemDecoration(ItemDecoration())
ll_station_container.setAdapter(mAdapter)

34
OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/item/ItemDecoration.kt Normal file
View File

@@ -0,0 +1,34 @@
package com.mogo.och.shuttle.weaknet.passenger.ui.line.lineinfo.item
import android.graphics.Rect
import android.view.View
import androidx.recyclerview.widget.RecyclerView
import me.jessyan.autosize.utils.AutoSizeUtils
/**
* 这是LinearLayoutManager设置Item间距的的一个辅助类
*
* @author donghongyu
*/
class ItemDecoration() : RecyclerView.ItemDecoration() {
override fun getItemOffsets(
outRect: Rect, view: View,
parent: RecyclerView, state: RecyclerView.State
) {
if((parent.adapter?.itemCount ?: 4) < 4){
val height = AutoSizeUtils.dp2px(parent.context,140f)
val layoutParams = view.layoutParams as RecyclerView.LayoutParams
layoutParams.height = height
view.layoutParams = layoutParams
}else{
val height = AutoSizeUtils.dp2px(parent.context,68f)
val layoutParams = view.layoutParams as RecyclerView.LayoutParams
layoutParams.height = height
view.layoutParams = layoutParams
}
super.getItemOffsets(outRect, view, parent, state)
}
}

10
OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_current_end_view.xml
View File

@@ -8,14 +8,22 @@
android:layout_height="@dimen/dp_68"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/gl_horizontal_center"
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<View
android:id="@+id/bg_top_line"
app:layout_constraintStart_toStartOf="@+id/aciv_start_end_station"
app:layout_constraintEnd_toEndOf="@+id/aciv_start_end_station"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/gl_horizontal_center"
android:background="@color/b2_95B1D6"
android:layout_width="@dimen/dp_6"
android:layout_height="@dimen/dp_34"/>
android:layout_height="@dimen/dp_0"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aciv_current_station_bg"

10
OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_current_start_view.xml
View File

@@ -8,14 +8,22 @@
android:layout_height="@dimen/dp_68"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/gl_horizontal_center"
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<View
android:id="@+id/bg_bottom_line"
app:layout_constraintStart_toStartOf="@+id/aciv_start_end_station"
app:layout_constraintEnd_toEndOf="@+id/aciv_start_end_station"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_center"
android:background="@color/b2_1F82FB"
android:layout_width="@dimen/dp_6"
android:layout_height="@dimen/dp_34"/>
android:layout_height="@dimen/dp_0"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aciv_current_station_bg"

17
OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_current_view.xml
View File

@@ -8,23 +8,32 @@
android:layout_height="@dimen/dp_68"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/gl_horizontal_center"
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<View
android:id="@+id/bg_top_line"
app:layout_constraintStart_toStartOf="@+id/aciv_station_current_point"
app:layout_constraintEnd_toEndOf="@+id/aciv_station_current_point"
app:layout_constraintTop_toTopOf="@+id/aciv_current_station_bg"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/gl_horizontal_center"
android:background="@color/b2_95B1D6"
android:layout_width="@dimen/dp_6"
android:layout_height="@dimen/dp_34"/>
android:layout_height="@dimen/dp_0"/>
<View
android:id="@+id/bg_bottom_line"
app:layout_constraintStart_toStartOf="@+id/aciv_station_current_point"
app:layout_constraintEnd_toEndOf="@+id/aciv_station_current_point"
app:layout_constraintBottom_toBottomOf="@+id/aciv_current_station_bg"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_center"
android:background="@color/b2_1F82FB"
android:layout_width="@dimen/dp_6"
android:layout_height="@dimen/dp_34"/>
android:layout_height="@dimen/dp_0"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aciv_current_station_bg"

11
OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_end_view.xml
View File

@@ -7,14 +7,23 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_68">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/gl_horizontal_center"
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<View
android:id="@+id/bg_top_line"
app:layout_constraintStart_toStartOf="@+id/aciv_start_end_station"
app:layout_constraintEnd_toEndOf="@+id/aciv_start_end_station"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/gl_horizontal_center"
android:background="@color/b2_1F82FB"
android:layout_width="@dimen/dp_6"
android:layout_height="@dimen/dp_34"/>
android:layout_height="@dimen/dp_0"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aciv_start_end_station"

16
OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_future_view.xml
View File

@@ -7,30 +7,40 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_68">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/gl_horizontal_center"
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<View
android:id="@+id/bg_top_line"
app:layout_constraintStart_toStartOf="@+id/aciv_middle_station"
app:layout_constraintEnd_toEndOf="@+id/aciv_middle_station"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/gl_horizontal_center"
android:background="@color/b2_1F82FB"
android:layout_width="@dimen/dp_6"
android:layout_height="@dimen/dp_34"/>
android:layout_height="@dimen/dp_0"/>
<View
android:id="@+id/bg_bottom_line"
app:layout_constraintStart_toStartOf="@+id/aciv_middle_station"
app:layout_constraintEnd_toEndOf="@+id/aciv_middle_station"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_center"
android:background="@color/b2_1F82FB"
android:layout_width="@dimen/dp_6"
android:layout_height="@dimen/dp_34"/>
android:layout_height="@dimen/dp_0"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aciv_middle_station"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="@dimen/dp_62"
android:layout_marginStart="@dimen/dp_63"
android:src="@drawable/b2_station_future_point"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"/>

13
OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_pass_view.xml
View File

@@ -7,23 +7,32 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_68">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/gl_horizontal_center"
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<View
android:id="@+id/bg_top_line"
app:layout_constraintStart_toStartOf="@+id/aciv_middle_station"
app:layout_constraintEnd_toEndOf="@+id/aciv_middle_station"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/gl_horizontal_center"
android:background="@color/b2_95B1D6"
android:layout_width="@dimen/dp_6"
android:layout_height="@dimen/dp_34"/>
android:layout_height="@dimen/dp_0"/>
<View
android:id="@+id/bg_bottom_line"
app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_center"
app:layout_constraintStart_toStartOf="@+id/aciv_middle_station"
app:layout_constraintEnd_toEndOf="@+id/aciv_middle_station"
app:layout_constraintBottom_toBottomOf="parent"
android:background="@color/b2_95B1D6"
android:layout_width="@dimen/dp_6"
android:layout_height="@dimen/dp_34"/>
android:layout_height="@dimen/dp_0"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aciv_middle_station"

10
OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_start_view.xml
View File

@@ -7,14 +7,22 @@
android:clickable="false"
android:layout_height="@dimen/dp_68">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/gl_horizontal_center"
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<View
android:id="@+id/bg_bottom_line"
app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_center"
app:layout_constraintStart_toStartOf="@+id/aciv_start_end_station"
app:layout_constraintEnd_toEndOf="@+id/aciv_start_end_station"
app:layout_constraintBottom_toBottomOf="parent"
android:background="@color/b2_95B1D6"
android:layout_width="@dimen/dp_6"
android:layout_height="@dimen/dp_34"/>
android:layout_height="@dimen/dp_0"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aciv_start_end_station"