From 4400b3d9efae93d496a87820aecf39a257586708 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 4 Apr 2023 17:11:47 +0800 Subject: [PATCH] =?UTF-8?q?[m2]=20[3.0.0]=20[=E7=AB=99=E7=82=B9=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E5=8F=98=E6=9B=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/ui/PM2DrivingInfoFragment.kt | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt index 2f5665618b..fa8d0ca009 100644 --- a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt +++ b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt @@ -2,17 +2,12 @@ package com.mogo.och.bus.passenger.ui import android.graphics.BitmapFactory import android.os.Bundle -import android.os.Handler -import android.os.Looper -import android.os.Message import android.view.View import androidx.core.content.ContextCompat import com.amap.api.maps.model.LatLng import com.mogo.commons.mvp.MvpFragment import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView -import com.mogo.eagle.core.utilcode.kotlin.onClick -import com.mogo.eagle.core.utilcode.util.DateTimeUtils -import com.mogo.eagle.core.utilcode.util.UiThreadHandler +import com.mogo.eagle.core.function.view.SiteMarkerBean import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.bean.PM2Station @@ -21,7 +16,6 @@ import com.mogo.och.common.module.utils.DateTimeUtil.* import com.mogo.och.common.module.utils.NumberFormatUtil import kotlinx.android.synthetic.m2.p_m2_driving_info_fragment.* import me.jessyan.autosize.utils.AutoSizeUtils -import java.lang.ref.WeakReference import kotlin.math.ceil import kotlin.math.roundToInt @@ -188,10 +182,16 @@ class PM2DrivingInfoFragment : fun updateLineStations(stations: MutableList,stationsPass: MutableList){ overMapView?.let { - it.drawSiteMarkers(stations, - BitmapFactory.decodeResource(resources,R.drawable.m2_map_staton_icon),0.5f,0.5f) - it.drawSiteMarkers(stationsPass, - BitmapFactory.decodeResource(resources,R.drawable.m2_map_staton_arrived_icon),0.5f,0.5f) + val stationsList: MutableList = mutableListOf() + val stationIcon = BitmapFactory.decodeResource(resources, R.drawable.m2_map_staton_icon) + val stationPassIcon = BitmapFactory.decodeResource(resources, R.drawable.m2_map_staton_arrived_icon) + for (stationsPass in stationsPass) { + stationsList.add(SiteMarkerBean(stationsPass,stationPassIcon,0.5f,0.5f)) + } + for (stationsPass in stations) { + stationsList.add(SiteMarkerBean(stationsPass,stationIcon,0.5f,0.5f)) + } + it.drawSiteMarkers(stationsList) } }