Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListViewModel.kt

@@ -22,6 +22,7 @@ import kotlinx.coroutines.withContext
 import java.util.*
 import javax.inject.Inject
 
+
 @HiltViewModel
 class TaskListViewModel @Inject constructor(
     private val networkService: NetworkService,
@@ -30,6 +31,9 @@ class TaskListViewModel @Inject constructor(
 
     val liveDataTaskList = MutableLiveData<List<TaskBean>>()
 
+    val colors =
+        arrayOf(Color.RED, Color.YELLOW, Color.BLUE, Color.MAGENTA, Color.GREEN, Color.CYAN)
+
     /**
      * 下载任务列表
      */
@@ -43,7 +47,8 @@ class TaskListViewModel @Inject constructor(
                         val realm = Realm.getDefaultInstance()
                         realm.executeTransaction {
                             result.data.obj?.let { list ->
-                                for (task in list) {
+                                for (index in list.indices) {
+                                    val task = list[index]
                                     val item = realm.where(TaskBean::class.java).equalTo(
                                         "id", task.id
                                     ).findFirst()
@@ -54,6 +59,9 @@ class TaskListViewModel @Inject constructor(
                                         task.currentSize = item.currentSize
                                         task.color = item.color
                                     } else {
+                                        if (index < 6)
+                                            task.color = colors[index]
+                                        else {
                                             val random = Random()
                                             task.color = Color.argb(
                                                 255,
@@ -61,7 +69,7 @@ class TaskListViewModel @Inject constructor(
                                                 random.nextInt(256),
                                                 random.nextInt(256)
                                             )
-                                        Log.e("jingo", "任务颜色 ${task.color}")
+                                        }
                                     }
                                     realm.copyToRealmOrUpdate(task)
                                 }
@@ -105,9 +113,6 @@ class TaskListViewModel @Inject constructor(
                     mapController.lineHandler.omdbTaskLinkLayer.addLineList(item.hadLinkDvoList)
                 }
             }
-
         }
-
     }
-
 }

collect-library/src/main/java/com/navinfo/collect/library/map/handler/LineHandler.kt

@@ -70,7 +70,7 @@ class LineHandler(context: AppCompatActivity, mapView: NIMapView) : BaseHandler(
                 .fillColor(context.resources.getColor(R.color.draw_line_red_color, null))
                 .fillAlpha(0.5f)
                 .strokeColor(context.resources.getColor(R.color.draw_line_red_color, null))
-                .strokeWidth(4f)
+                .strokeWidth(8f)
                 .fixed(true).build()
         )
         addLayer(omdbTaskLinkLayer, NIMapView.LAYER_GROUPS.VECTOR)

collect-library/src/main/java/com/navinfo/collect/library/map/layers/OmdbTaskLinkLayer.kt

@@ -31,6 +31,7 @@ class OmdbTaskLinkLayer(map: Map, private var style: Style) : VectorLayer(map) {
         hadLinkDvoBeanList.forEach {
             addLine(it, style)
         }
+        update()
     }
 
     fun removeLine(linkPid: String): Boolean {