From 1ca95fdb43f60511710a6893951d68e4f66bf5d6 Mon Sep 17 00:00:00 2001 From: pangfan Date: Mon, 13 Mar 2023 11:09:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[2.14.2]1.=E5=8E=BB=E9=99=A4=E8=BD=A6?= =?UTF-8?q?=E9=80=9F=E8=A1=A8=E8=B6=85=E9=80=9F=E7=BA=A2=E8=89=B2=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/TaxiPassengerServingOrderFragment.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java index 0ddf08b2b7..b51e6b82aa 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerServingOrderFragment.java @@ -367,19 +367,19 @@ public class TaxiPassengerServingOrderFragment extends private void updateSpeedView(float newSpeed) { int speed = (int) (Math.abs(newSpeed) * 3.6F); // 倒车时工控机反馈定位信息中speed为负值 CallerLogger.INSTANCE.d(M_TAXI_P + TAG,"mLimitingVelocity = "+mLimitingVelocity); - if (mLimitingVelocity > 0 && speed >= mLimitingVelocity) { - mTPSpeedTv.setmColorList(new int[]{getResources().getColor(R.color.taxi_p_speed_warn_color1),getResources().getColor(R.color.taxi_p_speed_warn_color2)}); - mTPSpeedTv.setText(String.valueOf(speed)); - mTPSpeedTvShadowBg.setText(String.valueOf(speed)); - - mSpeedLayoutBg.setImageResource(R.drawable.taxi_p_speed_light_red_bg); - } else { +// if (mLimitingVelocity > 0 && speed >= mLimitingVelocity) { +// mTPSpeedTv.setmColorList(new int[]{getResources().getColor(R.color.taxi_p_speed_warn_color1),getResources().getColor(R.color.taxi_p_speed_warn_color2)}); +// mTPSpeedTv.setText(String.valueOf(speed)); +// mTPSpeedTvShadowBg.setText(String.valueOf(speed)); +// +// mSpeedLayoutBg.setImageResource(R.drawable.taxi_p_speed_light_red_bg); +// } else { mTPSpeedTv.setmColorList(new int[]{getResources().getColor(R.color.taxi_p_speed_normal_color1),getResources().getColor(R.color.taxi_p_speed_normal_color2)}); mTPSpeedTv.setText(String.valueOf(speed)); mTPSpeedTvShadowBg.setText(String.valueOf(speed)); mSpeedLayoutBg.setImageResource(R.drawable.taxi_p_speed_light_green_bg); - } +// } } private void runOnUIThread(Runnable executor) { From 43168d97a7ddf0d94c0528f9c6159b9494683d6d Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 13 Mar 2023 11:13:08 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[sweeper]=20[=E7=94=BB=E7=BA=BF=E8=B7=AF?= =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E5=88=87=E6=8D=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt index bf9b0a4309..cde66434e1 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt @@ -291,7 +291,9 @@ class WeltSmallMapView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { for (i in routeList.indices) { routeCoordinatesLatLngs.add(LatLng(routeList[i].latitude, routeList[i].longitude)) } - drawRouteListPolyline(routeCoordinatesLatLngs) + ThreadUtils.runOnUiThread { + drawRouteListPolyline(routeCoordinatesLatLngs) + } } private fun drawRouteListPolyline(routeList: MutableList) { From 15bb3d3b54f802e1e0fa5dfef91175141af796da Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 13 Mar 2023 11:45:12 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[sweeper]=20[=E9=83=A8=E5=88=86=E8=BD=A8?= =?UTF-8?q?=E8=BF=B9=E4=B8=8D=E5=B1=95=E7=A4=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/sweeper/view/WeltMapOverView.kt | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt index 22e0e73042..38dcd50fb1 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt @@ -36,6 +36,8 @@ class WeltMapOverView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { private var mRoutePolylines: Polyline?=null // private val mLineMarkers: MutableList = mutableListOf() private var mEndStationMarker: Marker? = null + private var mogoDistanceLocationMax: LatLng?=null + private var aPointDistanceMax = 0.0F private var mFirst: Boolean = false //清扫车任务地图 @@ -153,9 +155,27 @@ class WeltMapOverView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { if (mTaskCoordinatesLatLng.size > 0) { //存放经纬度 for (i in mTaskCoordinatesLatLng.indices) { - boundsBuilder.include(mTaskCoordinatesLatLng[i]) + val latLng = mTaskCoordinatesLatLng[i] + boundsBuilder.include(latLng) + try { + val calculateLineDistance = CoordinateUtils.calculateLineDistance( + latLng.longitude, + latLng.latitude, + currentLatLng.latitude, + currentLatLng.longitude + ) + if(calculateLineDistance>aPointDistanceMax){ + aPointDistanceMax = calculateLineDistance + mogoDistanceLocationMax = currentLatLng + } + }catch (e:Exception){ + CallerLogger.e(TAG,e.stackTrace) + } } } + mogoDistanceLocationMax?.let { + boundsBuilder.include(it) + } boundsBuilder.include(currentLatLng) mAMap?.moveCamera(CameraUpdateFactory.newLatLngBoundsRect(boundsBuilder.build(), 100, 100, 100, 100)) From 0b4453e4c663eee6ce485564a8bac80b9ce62d8b Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 13 Mar 2023 13:23:38 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[sweeper]=20[=E5=A4=A7=E5=B0=8F=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E6=90=9E=E9=94=99=E4=BA=86]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt | 6 +++--- .../main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt index 38dcd50fb1..6552a1ff1a 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltMapOverView.kt @@ -131,11 +131,11 @@ class WeltMapOverView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { colorList.add(ContextCompat.getColor(context,R.color.sweeper_236299)) } else if (weltDataBean.weltDistance < 0) { colorList.add(ContextCompat.getColor(context,R.color.sweeper_c22101)) - } else if (weltDataBean.weltDistance >= 0 && weltDataBean.weltDistance < 0.01) { + } else if (weltDataBean.weltDistance >= 0 && weltDataBean.weltDistance < 0.1) { colorList.add(ContextCompat.getColor(context,R.color.sweeper_4dffa4)) - } else if (weltDataBean.weltDistance >= 0.010 && weltDataBean.weltDistance < 0.020) { + } else if (weltDataBean.weltDistance >= 0.1 && weltDataBean.weltDistance < 0.2) { colorList.add(ContextCompat.getColor(context,R.color.sweeper_ffdd4d)) - } else if (weltDataBean.weltDistance >= 0.020) { + } else if (weltDataBean.weltDistance >= 0.2) { colorList.add(ContextCompat.getColor(context,R.color.sweeper_ff912b)) } } diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt index cde66434e1..b69e669558 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/WeltSmallMapView.kt @@ -185,11 +185,11 @@ class WeltSmallMapView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { colorList.add(ContextCompat.getColor(context,R.color.sweeper_236299)) } else if (weltDataBean.weltDistance < 0) { colorList.add(ContextCompat.getColor(context,R.color.sweeper_c22101)) - } else if (weltDataBean.weltDistance >= 0 && weltDataBean.weltDistance < 0.010) { + } else if (weltDataBean.weltDistance >= 0 && weltDataBean.weltDistance < 0.1) { colorList.add(ContextCompat.getColor(context,R.color.sweeper_4dffa4)) - } else if (weltDataBean.weltDistance >= 0.010 && weltDataBean.weltDistance < 0.020) { + } else if (weltDataBean.weltDistance >= 0.1 && weltDataBean.weltDistance < 0.2) { colorList.add(ContextCompat.getColor(context,R.color.sweeper_ffdd4d)) - } else if (weltDataBean.weltDistance >= 0.020) { + } else if (weltDataBean.weltDistance >= 0.2) { colorList.add(ContextCompat.getColor(context,R.color.sweeper_ff912b)) } }