diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/LineView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/LineView.kt index 87ac341704..55272e3a7b 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/LineView.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/LineView.kt @@ -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) diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/item/ItemDecoration.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/item/ItemDecoration.kt new file mode 100644 index 0000000000..e25580bec3 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/item/ItemDecoration.kt @@ -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) + } +} diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_current_end_view.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_current_end_view.xml index 001279fa79..de8ab340f4 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_current_end_view.xml +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_current_end_view.xml @@ -8,14 +8,22 @@ android:layout_height="@dimen/dp_68" tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"> + + + android:layout_height="@dimen/dp_0"/> + + + android:layout_height="@dimen/dp_0"/> + + + android:layout_height="@dimen/dp_0"/> + android:layout_height="@dimen/dp_0"/> + + + + android:layout_height="@dimen/dp_0"/> + + + + android:layout_height="@dimen/dp_0"/> + android:layout_height="@dimen/dp_0"/> diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_pass_view.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_pass_view.xml index f99893ab25..dd7561b91e 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_pass_view.xml +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_pass_view.xml @@ -7,23 +7,32 @@ android:layout_width="match_parent" android:layout_height="@dimen/dp_68"> + + + android:layout_height="@dimen/dp_0"/> + android:layout_height="@dimen/dp_0"/> + + + android:layout_height="@dimen/dp_0"/>