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 9f68431cb2..c981c53244 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
@@ -8,6 +8,7 @@ import android.view.LayoutInflater
import android.view.View
import android.widget.ImageView
import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.ContextCompat
import com.amap.api.maps.AMap
import com.amap.api.maps.CameraUpdateFactory
import com.amap.api.maps.model.*
@@ -122,17 +123,17 @@ class WeltMapOverView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener {
}
}
if (weltDataBean.weltDistance == -9999.0) {//未经过
- colorList.add(Color.parseColor("#3BA1CC"))
+ colorList.add(ContextCompat.getColor(context,R.color.sweeper_3ba1cc))
} else if (weltDataBean.weltDistance == -10000.0) {//非贴边
- colorList.add(Color.parseColor("#236299"))
+ colorList.add(ContextCompat.getColor(context,R.color.sweeper_236299))
} else if (weltDataBean.weltDistance < 0) {
- colorList.add(Color.parseColor("#C22101"))
- } else if (weltDataBean.weltDistance >= 0 && weltDataBean.weltDistance < 10) {
- colorList.add(Color.parseColor("#4DFFA4"))
- } else if (weltDataBean.weltDistance >= 10 && weltDataBean.weltDistance < 20) {
- colorList.add(Color.parseColor("#FFDD4D"))
- } else if (weltDataBean.weltDistance >= 20) {
- colorList.add(Color.parseColor("#FF912B"))
+ colorList.add(ContextCompat.getColor(context,R.color.sweeper_c22101))
+ } else if (weltDataBean.weltDistance >= 0 && weltDataBean.weltDistance < 0.01) {
+ colorList.add(ContextCompat.getColor(context,R.color.sweeper_4dffa4))
+ } else if (weltDataBean.weltDistance >= 0.010 && weltDataBean.weltDistance < 0.020) {
+ colorList.add(ContextCompat.getColor(context,R.color.sweeper_ffdd4d))
+ } else if (weltDataBean.weltDistance >= 0.020) {
+ colorList.add(ContextCompat.getColor(context,R.color.sweeper_ff912b))
}
}
return colorList
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 ff1b71a91c..21a7c955a5 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
@@ -8,6 +8,7 @@ import android.view.LayoutInflater
import android.view.View
import android.widget.ImageView
import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.ContextCompat
import com.amap.api.maps.AMap
import com.amap.api.maps.CameraUpdateFactory
import com.amap.api.maps.model.*
@@ -145,7 +146,7 @@ class WeltSmallMapView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener {
mWeltPolylines?.remove()
val polylineOptions = PolylineOptions()
polylineOptions.addAll(coordinatesLatLngs)
- polylineOptions.width(30f) //线段宽度
+ polylineOptions.width(14f) //线段宽度
polylineOptions.isUseTexture = false
polylineOptions.lineCapType(PolylineOptions.LineCapType.LineCapSquare)
polylineOptions.colorValues(colorList)
@@ -178,17 +179,17 @@ class WeltSmallMapView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener {
}
if (weltDataBean.weltDistance == -9999.0) {//未经过
- colorList.add(Color.parseColor("#3BA1CC"))
+ colorList.add(ContextCompat.getColor(context,R.color.sweeper_3ba1cc))
} else if (weltDataBean.weltDistance == -10000.0) {//非贴边
- colorList.add(Color.parseColor("#236299"))
+ colorList.add(ContextCompat.getColor(context,R.color.sweeper_236299))
} else if (weltDataBean.weltDistance < 0) {
- colorList.add(Color.parseColor("#C22101"))
- } else if (weltDataBean.weltDistance >= 0 && weltDataBean.weltDistance < 10) {
- colorList.add(Color.parseColor("#4DFFA4"))
- } else if (weltDataBean.weltDistance >= 10 && weltDataBean.weltDistance < 20) {
- colorList.add(Color.parseColor("#FFDD4D"))
- } else if (weltDataBean.weltDistance >= 20) {
- colorList.add(Color.parseColor("#FF912B"))
+ colorList.add(ContextCompat.getColor(context,R.color.sweeper_c22101))
+ } else if (weltDataBean.weltDistance >= 0 && weltDataBean.weltDistance < 0.010) {
+ colorList.add(ContextCompat.getColor(context,R.color.sweeper_4dffa4))
+ } else if (weltDataBean.weltDistance >= 0.010 && weltDataBean.weltDistance < 0.020) {
+ colorList.add(ContextCompat.getColor(context,R.color.sweeper_ffdd4d))
+ } else if (weltDataBean.weltDistance >= 0.020) {
+ colorList.add(ContextCompat.getColor(context,R.color.sweeper_ff912b))
}
}
return colorList
diff --git a/OCH/mogo-och-sweeper/src/main/res/values/colors.xml b/OCH/mogo-och-sweeper/src/main/res/values/colors.xml
index da862b9270..996be7663a 100644
--- a/OCH/mogo-och-sweeper/src/main/res/values/colors.xml
+++ b/OCH/mogo-och-sweeper/src/main/res/values/colors.xml
@@ -50,4 +50,16 @@
#3769B5
#BF30334C
+
+ #C22101
+
+ #4DFFA4
+
+ #FFDD4D
+
+ #FF912B
+
+ #3BA1CC
+
+ #236299
\ No newline at end of file